From 0d52a5175c4e20e6ba906c793041857a9e4cb463 Mon Sep 17 00:00:00 2001 From: trendschau <trendschau@gmail.com> Date: Sun, 5 Apr 2020 19:15:33 +0200 Subject: [PATCH] Version 1.3.4: Media Library --- .gitignore | 38 +++++++-------- .htaccess | 80 +++++++++++++++---------------- media/markdown.png | Bin 1073 -> 0 bytes settings/languages/en.yaml | 4 ++ settings/languages/vuejs-en.yaml | 2 +- 5 files changed, 64 insertions(+), 60 deletions(-) delete mode 100644 media/markdown.png diff --git a/.gitignore b/.gitignore index 377c36b..86b8388 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,20 @@ -cache/lastCache.txt -cache/lastSitemap.txt -cache/metatabs.yaml -cache/navigation.txt -cache/sitemap.xml -cache/structure-draft.txt -cache/structure-extended.yaml -cache/structure.txt -content/index.yaml -content/00-Welcome/index.yaml -content/00-Welcome/00-Setup.yaml -content/00-Welcome/01-Write-Content.yaml -content/00-Welcome/02-Get-Help.yaml -content/00-Welcome/03-Markdown-Test.yaml -settings/settings.yaml -settings/users -system/vendor -plugins/demo -zips +cache/lastCache.txt +cache/lastSitemap.txt +cache/metatabs.yaml +cache/navigation.txt +cache/sitemap.xml +cache/structure-draft.txt +cache/structure-extended.yaml +cache/structure.txt +content/index.yaml +content/00-welcome/index.yaml +content/00-welcome/00-setup.yaml +content/00-welcome/01-write-content.yaml +content/00-welcome/02-get-help.yaml +content/00-welcome/03-markdown-test.yaml +settings/settings.yaml +settings/users +system/vendor +plugins/demo +zips build.php \ No newline at end of file diff --git a/.htaccess b/.htaccess index 586f7af..92e92fa 100644 --- a/.htaccess +++ b/.htaccess @@ -1,41 +1,41 @@ -RewriteEngine On - -# If your homepage is http://yourdomain.com/yoursite -# Set the RewriteBase to: -# RewriteBase /yoursite - -# In some environements, an empty RewriteBase is required: -# RewriteBase / - -# Protect your system files from prying eyes -RewriteRule ^(system\/author\/) - [L] -RewriteRule ^(system) - [F,L] -RewriteRule ^(content) - [F,L] -RewriteRule ^(settings) - [F,L] -RewriteRule ^(.*)?\.yml$ - [F,L] -Rewriterule ^(.*)?\.yaml$ - [F,L] -RewriteRule ^(.*)?\.txt$ - [F,L] -RewriteRule ^(.*)?\.example$ - [F,L] -RewriteRule ^(.*/)?\.git+ - [F,L] - -# Use this to redirect HTTP to HTTPS on apache servers -# RewriteCond %{HTTPS} off -# RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] - -# Use this to redirect www to non-wwww on apache servers -# RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] -# RewriteRule ^(.*)$ http://%1/$1 [R=301,L] - -# Use this to redirect slash/ to no slash urls on apache servers -# RewriteCond %{REQUEST_FILENAME} !-d -# RewriteRule ^(.*)/$ /$1 [R=301,L] - -# Removes index.php -RewriteCond %{THE_REQUEST} ^GET.*index\.php [NC] -RewriteRule (.*?)index\.php/*(.*) /$1$2 [R=301,NE,L] - -# Directs all web requests through the site index file -RewriteCond %{REQUEST_URI} !^/index\.php -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d +RewriteEngine On + +# If your homepage is http://yourdomain.com/yoursite +# Set the RewriteBase to: +# RewriteBase /yoursite + +# In some environements, an empty RewriteBase is required: +# RewriteBase / + +# Protect your system files from prying eyes +RewriteRule ^(system\/author\/) - [L] +RewriteRule ^(system) - [F,L] +RewriteRule ^(content) - [F,L] +RewriteRule ^(settings) - [F,L] +RewriteRule ^(.*)?\.yml$ - [F,L] +Rewriterule ^(.*)?\.yaml$ - [F,L] +RewriteRule ^(.*)?\.txt$ - [F,L] +RewriteRule ^(.*)?\.example$ - [F,L] +RewriteRule ^(.*/)?\.git+ - [F,L] + +# Use this to redirect HTTP to HTTPS on apache servers +# RewriteCond %{HTTPS} off +# RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + +# Use this to redirect www to non-wwww on apache servers +# RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] +# RewriteRule ^(.*)$ http://%1/$1 [R=301,L] + +# Use this to redirect slash/ to no slash urls on apache servers +# RewriteCond %{REQUEST_FILENAME} !-d +# RewriteRule ^(.*)/$ /$1 [R=301,L] + +# Removes index.php +RewriteCond %{THE_REQUEST} ^GET.*index\.php [NC] +RewriteRule (.*?)index\.php/*(.*) /$1$2 [R=301,NE,L] + +# Directs all web requests through the site index file +RewriteCond %{REQUEST_URI} !^/index\.php +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^ index.php [QSA,L] \ No newline at end of file diff --git a/media/markdown.png b/media/markdown.png deleted file mode 100644 index 9470f0878f45a9a2cff72ff6fcbfd550daac338f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1073 zcmeAS@N?(olHy`uVBq!ia0vp^7l62dgBeKrei7dYq`CrpLR^9LAOXTm9Qr_~=#~We z1v9Yyd~!_M(vP`aV%n=e&u8XrO#7C6X^sIu&jEYRlioIG4zDN;Y<W1jNVg&+{JnGk z8wLhuO-~ockP61PcSG~mSW2`!%t}j3llbv%|DK00Pg!nE`M&;}Yvj7u7lbPgo9*z; zE`KxgPSx?)?B@L2cDvQ~yesaOzqVuck9WKc*^x}y7mK&4lpU+z9jUbY;rv+LnX!xu zLOj_+G#Ph9IPGRQo9DG4kF)ymwO*+wVcBbXZ$Ey>vGZ1xiA})M+sipGn)>Uzi2f0< zawwCo6Iht@KcDlaZhVK)8&i({E)z$|DM(0V1CP=1WgNGz$TXKfi%1FB+1GIOw2{K< zEe~UNCs`@1p7tQ}Wr~-A^nuNdnT<KG_?yH|$g;6H@;%{WZeGA%)ZXZLf%)bEc^2IX zzJDDrFzq~iK;cBA1Y5bl7l%HBDXW(8BuPlH<O%?VGnyrU8pVzn7;yYjXankFGvs0R zW=;uabCd@Oeo}b7T@s>Hg>lot1CyA3PIru9OTBQX$!t1ftLm<(NsJ4xeXssydZNK; z-x*E$1uTbduuC~}v-nFqOVp1#&b9t?qQKz?d`=Q8EVW)qn%V>HzT?QjoM@{3Y^Lr< zkQ|Sb2FF$}LI0&~{y^7+3mkHc@VWQhN34S(NkYbvgMHz}>g$)Y6_`2_3)mE8S|09R zps3UU^39(Ghd#bj;5#APRwVmS;n?rL3C9@|-|#tEbbRFFFY^(2_D-RtS>pYNgySrR zJUmVo8aDTM%2GhyZfQRB_-w*)W{_~AK-<HEeLRO|IBM{5b(OP!bmU=f{$SVf@f(Y^ zT}NVqKv$zgzW;{D%@^JobG&b^`IrV|14C^g&>D~uj>m>}3`u)z5BBjNYL_d2!M{z6 zL$-dyR)?PL);Ee2j@_2cu@!jymT#LJ$9|tX2dA+b-s9P3)&VqTtK*9u&1<=n_DJTW z3Ou%r1_pVB@r_Fg$7UZ4V*{!xllmWGA>$<XB$BODx7kPofhJj8D){O&<+62&(avN? z>rB}@w|>6NxNG+0+CLx_l+`Z(`1%xw{maT4ewZCqz9($evVZC;Q_hz$DF^?SO@Dvz u{g1@k-QQ9Trt4aK*d^zBrvLiaKb#L%vFaWBxB4$A<9oXLxvX<aXaWGf8Ij5W diff --git a/settings/languages/en.yaml b/settings/languages/en.yaml index 7001473..be63f0f 100644 --- a/settings/languages/en.yaml +++ b/settings/languages/en.yaml @@ -58,8 +58,10 @@ QUOTES: Quote TABLE_OF_CONTENTS: Table of Contents TABLE: Table TEXT_FILE: text-file +UPLOAD: upload VIDEO: Video +# others ACCOUNT: Account ACTIVE: Active ACTUAL_PASSWORD: Actual Password @@ -70,7 +72,9 @@ ADD_ITEM: add item ALL_USERS: All users AUTHOR: Author BACK_TO_STARTPAGE: back to startpage +BROWSE: BROWSE BY: by +CHOOSE_FILE: Choose file CODE: code CONTENT: Content COPYRIGHT: Copyright diff --git a/settings/languages/vuejs-en.yaml b/settings/languages/vuejs-en.yaml index fd6176b..4ca8d44 100644 --- a/settings/languages/vuejs-en.yaml +++ b/settings/languages/vuejs-en.yaml @@ -22,7 +22,7 @@ en: delete content-block: delete content-block delete row: delete row description: description - drag a picture or click to select: drag a picture or click to select + drag a picture or click to select: upload an image Head: Head Headline: Headline Horizontal Line: Horizontal Line