diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index bab3562..d8d6220
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ thumbs
assets/avatars
wiki
piwik
-
+media
+site/sessions
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
old mode 100644
new mode 100755
index e84275b..ce79cfb
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "site/fields/markdown"]
- path = site/fields/markdown
- url = https://github.com/JonasDoebertin/kirby-visual-markdown.git
[submodule "kirby"]
path = kirby
url = https://github.com/getkirby/kirby.git
-[submodule "panel"]
- path = panel
- url = https://github.com/getkirby/panel.git
diff --git a/.htaccess b/.htaccess
old mode 100644
new mode 100755
index 22e251e..b9a738c
--- a/.htaccess
+++ b/.htaccess
@@ -2,49 +2,53 @@
# rewrite rules
- # enable awesome urls. i.e.:
- # http://yourdomain.com/about-us/team
- RewriteEngine on
-
- RewriteCond %{HTTP_HOST} !^sterzy\.com$
- RewriteRule (.*) https://sterzy.com/$1 [L,R=301]
- RewriteCond %{HTTPS} !=on
+ # enable awesome urls. i.e.:
+ # http://yourdomain.com/about-us/team
+ RewriteEngine on
+
+ RewriteCond %{HTTP_HOST} !^sterzy\.com$
+ RewriteRule (.*) https://sterzy.com/$1 [L,R=301]
- # redirect all trafic to https
- RewriteCond %{ENV:HTTPS} !=on
- RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
+ RewriteCond %{HTTPS} !=on
- Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
- Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
+ # redirect all trafic to https
+ RewriteCond %{ENV:HTTPS} !=on
+ RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
- # make sure to set the RewriteBase correctly
- # if you are running the site in a subfolder.
- # Otherwise links or the entire site will break.
- #
- # If your homepage is http://yourdomain.com/mysite
- # Set the RewriteBase to:
- #
- # RewriteBase /mysite
+ Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+ Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
- # block text files in the content folder from being accessed directly
- RewriteRule ^content/(.*)\.(txt|md|mdown)$ index.php [L]
+ # block files and folders beginning with a dot, such as .git
+ # except for the .well-known folder, which is used for Let's Encrypt and security.txt
+ RewriteRule (^|/)\.(?!well-known\/) index.php [L]
- # block all files in the site folder from being accessed directly
- RewriteRule ^site/(.*) index.php [L]
+ # make sure to set the RewriteBase correctly
+ # if you are running the site in a subfolder.
+ # Otherwise links or the entire site will break.
+ #
+ # If your homepage is http://yourdomain.com/mysite
+ # Set the RewriteBase to:
+ #
+ # RewriteBase /mysite
- # block all files in the kirby folder from being accessed directly
- RewriteRule ^kirby/(.*) index.php [L]
+ # block text files in the content folder from being accessed directly
+ RewriteRule ^content/(.*)\.(txt|md|mdown)$ index.php [L]
- # make panel links work
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^panel/(.*) panel/index.php [L]
+ # block all files in the site folder from being accessed directly
+ RewriteRule ^site/(.*) index.php [L]
+
+ # Enable authentication header
+ SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+
+ # block all files in the kirby folder from being accessed directly
+ RewriteRule ^kirby/(.*) index.php [L]
+
+ # make site links work
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule ^(.*) index.php [L]
- # make site links work
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule ^(.*) index.php [L]
# Additional recommended values
@@ -63,3 +67,16 @@ ExpiresActive On
ExpiresByType application/x-javascript M604800
ExpiresByType text/css M604800
ExpiresByType text/x-javascript M604800
+
+# compress text file responses
+
+
+ AddOutputFilterByType DEFLATE text/plain
+ AddOutputFilterByType DEFLATE text/html
+ AddOutputFilterByType DEFLATE text/css
+ AddOutputFilterByType DEFLATE text/javascript
+ AddOutputFilterByType DEFLATE application/json
+ AddOutputFilterByType DEFLATE application/javascript
+ AddOutputFilterByType DEFLATE application/x-javascript
+
+
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 9f15ed4..b489b45
--- a/README.md
+++ b/README.md
@@ -6,6 +6,6 @@ The rest of the code is under this license: [License](https://svs.ankaa.uberspac
# Installing
```
$ git clone --recursive https://svs.ankaa.uberspace.de/sterzy/sterzycom.git
-$ mkdir site/config site/accounts thumbs content assets/avatars
+$ mkdir site/config media content
```
-Then [add your license](http://getkirby.com/docs/installation/license-code) and visit yoursite.com/panel.
+Then visit yoursite.com/panel.
diff --git a/assets/avatars/sterzy.png b/assets/avatars/sterzy.png
deleted file mode 100644
index f36d6b8..0000000
Binary files a/assets/avatars/sterzy.png and /dev/null differ
diff --git a/assets/css/main.css b/assets/css/main.css
old mode 100644
new mode 100755
diff --git a/assets/css/mobile.css b/assets/css/mobile.css
old mode 100644
new mode 100755
diff --git a/assets/css/prism.css b/assets/css/prism.css
old mode 100644
new mode 100755
diff --git a/assets/fonts/Montserrat-Regular.ttf b/assets/fonts/Montserrat-Regular.ttf
old mode 100644
new mode 100755
diff --git a/assets/img/bg.jpg b/assets/img/bg.jpg
old mode 100644
new mode 100755
diff --git a/assets/img/icons/LogoPerfektdursichtigPNG.png b/assets/img/icons/LogoPerfektdursichtigPNG.png
old mode 100644
new mode 100755
diff --git a/assets/img/icons/apple-touch-icon-114x114-precomposed.png b/assets/img/icons/apple-touch-icon-114x114-precomposed.png
old mode 100644
new mode 100755
diff --git a/assets/img/icons/favicon.ico b/assets/img/icons/favicon.ico
old mode 100644
new mode 100755
diff --git a/assets/img/icons/favicon.png b/assets/img/icons/favicon.png
old mode 100644
new mode 100755
diff --git a/assets/img/icons/logo.svg b/assets/img/icons/logo.svg
old mode 100644
new mode 100755
diff --git a/assets/img/icons/logo100.png b/assets/img/icons/logo100.png
old mode 100644
new mode 100755
diff --git a/assets/img/icons/logo200.png b/assets/img/icons/logo200.png
old mode 100644
new mode 100755
diff --git a/assets/img/notes.jpg b/assets/img/notes.jpg
old mode 100644
new mode 100755
diff --git a/assets/img/projects.png b/assets/img/projects.png
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-abap.js b/assets/js/components/prism-abap.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-abap.min.js b/assets/js/components/prism-abap.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-actionscript.js b/assets/js/components/prism-actionscript.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-actionscript.min.js b/assets/js/components/prism-actionscript.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ada.js b/assets/js/components/prism-ada.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ada.min.js b/assets/js/components/prism-ada.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-apacheconf.js b/assets/js/components/prism-apacheconf.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-apacheconf.min.js b/assets/js/components/prism-apacheconf.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-apl.js b/assets/js/components/prism-apl.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-apl.min.js b/assets/js/components/prism-apl.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-applescript.js b/assets/js/components/prism-applescript.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-applescript.min.js b/assets/js/components/prism-applescript.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-asciidoc.js b/assets/js/components/prism-asciidoc.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-asciidoc.min.js b/assets/js/components/prism-asciidoc.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-aspnet.js b/assets/js/components/prism-aspnet.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-aspnet.min.js b/assets/js/components/prism-aspnet.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-autohotkey.js b/assets/js/components/prism-autohotkey.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-autohotkey.min.js b/assets/js/components/prism-autohotkey.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-autoit.js b/assets/js/components/prism-autoit.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-autoit.min.js b/assets/js/components/prism-autoit.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-bash.js b/assets/js/components/prism-bash.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-bash.min.js b/assets/js/components/prism-bash.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-basic.js b/assets/js/components/prism-basic.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-basic.min.js b/assets/js/components/prism-basic.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-batch.js b/assets/js/components/prism-batch.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-batch.min.js b/assets/js/components/prism-batch.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-bison.js b/assets/js/components/prism-bison.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-bison.min.js b/assets/js/components/prism-bison.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-brainfuck.js b/assets/js/components/prism-brainfuck.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-brainfuck.min.js b/assets/js/components/prism-brainfuck.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-bro.js b/assets/js/components/prism-bro.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-bro.min.js b/assets/js/components/prism-bro.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-c.js b/assets/js/components/prism-c.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-c.min.js b/assets/js/components/prism-c.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-clike.js b/assets/js/components/prism-clike.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-clike.min.js b/assets/js/components/prism-clike.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-coffeescript.js b/assets/js/components/prism-coffeescript.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-coffeescript.min.js b/assets/js/components/prism-coffeescript.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-cpp.js b/assets/js/components/prism-cpp.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-cpp.min.js b/assets/js/components/prism-cpp.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-crystal.js b/assets/js/components/prism-crystal.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-crystal.min.js b/assets/js/components/prism-crystal.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-csharp.js b/assets/js/components/prism-csharp.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-csharp.min.js b/assets/js/components/prism-csharp.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-css-extras.js b/assets/js/components/prism-css-extras.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-css-extras.min.js b/assets/js/components/prism-css-extras.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-css.js b/assets/js/components/prism-css.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-css.min.js b/assets/js/components/prism-css.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-d.js b/assets/js/components/prism-d.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-d.min.js b/assets/js/components/prism-d.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-dart.js b/assets/js/components/prism-dart.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-dart.min.js b/assets/js/components/prism-dart.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-diff.js b/assets/js/components/prism-diff.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-diff.min.js b/assets/js/components/prism-diff.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-django.js b/assets/js/components/prism-django.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-django.min.js b/assets/js/components/prism-django.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-docker.js b/assets/js/components/prism-docker.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-docker.min.js b/assets/js/components/prism-docker.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-eiffel.js b/assets/js/components/prism-eiffel.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-eiffel.min.js b/assets/js/components/prism-eiffel.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-elixir.js b/assets/js/components/prism-elixir.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-elixir.min.js b/assets/js/components/prism-elixir.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-erlang.js b/assets/js/components/prism-erlang.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-erlang.min.js b/assets/js/components/prism-erlang.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-fortran.js b/assets/js/components/prism-fortran.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-fortran.min.js b/assets/js/components/prism-fortran.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-fsharp.js b/assets/js/components/prism-fsharp.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-fsharp.min.js b/assets/js/components/prism-fsharp.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-gherkin.js b/assets/js/components/prism-gherkin.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-gherkin.min.js b/assets/js/components/prism-gherkin.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-git.js b/assets/js/components/prism-git.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-git.min.js b/assets/js/components/prism-git.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-glsl.js b/assets/js/components/prism-glsl.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-glsl.min.js b/assets/js/components/prism-glsl.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-go.js b/assets/js/components/prism-go.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-go.min.js b/assets/js/components/prism-go.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-graphql.js b/assets/js/components/prism-graphql.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-graphql.min.js b/assets/js/components/prism-graphql.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-groovy.js b/assets/js/components/prism-groovy.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-groovy.min.js b/assets/js/components/prism-groovy.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-haml.js b/assets/js/components/prism-haml.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-haml.min.js b/assets/js/components/prism-haml.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-handlebars.js b/assets/js/components/prism-handlebars.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-handlebars.min.js b/assets/js/components/prism-handlebars.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-haskell.js b/assets/js/components/prism-haskell.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-haskell.min.js b/assets/js/components/prism-haskell.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-haxe.js b/assets/js/components/prism-haxe.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-haxe.min.js b/assets/js/components/prism-haxe.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-http.js b/assets/js/components/prism-http.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-http.min.js b/assets/js/components/prism-http.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-icon.js b/assets/js/components/prism-icon.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-icon.min.js b/assets/js/components/prism-icon.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-inform7.js b/assets/js/components/prism-inform7.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-inform7.min.js b/assets/js/components/prism-inform7.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ini.js b/assets/js/components/prism-ini.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ini.min.js b/assets/js/components/prism-ini.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-j.js b/assets/js/components/prism-j.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-j.min.js b/assets/js/components/prism-j.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-jade.js b/assets/js/components/prism-jade.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-jade.min.js b/assets/js/components/prism-jade.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-java.js b/assets/js/components/prism-java.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-java.min.js b/assets/js/components/prism-java.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-javascript.js b/assets/js/components/prism-javascript.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-javascript.min.js b/assets/js/components/prism-javascript.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-jolie.js b/assets/js/components/prism-jolie.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-jolie.min.js b/assets/js/components/prism-jolie.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-json.js b/assets/js/components/prism-json.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-json.min.js b/assets/js/components/prism-json.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-jsx.js b/assets/js/components/prism-jsx.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-jsx.min.js b/assets/js/components/prism-jsx.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-julia.js b/assets/js/components/prism-julia.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-julia.min.js b/assets/js/components/prism-julia.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-keyman.js b/assets/js/components/prism-keyman.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-keyman.min.js b/assets/js/components/prism-keyman.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-kotlin.js b/assets/js/components/prism-kotlin.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-kotlin.min.js b/assets/js/components/prism-kotlin.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-latex.js b/assets/js/components/prism-latex.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-latex.min.js b/assets/js/components/prism-latex.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-less.js b/assets/js/components/prism-less.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-less.min.js b/assets/js/components/prism-less.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-livescript.js b/assets/js/components/prism-livescript.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-livescript.min.js b/assets/js/components/prism-livescript.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-lolcode.js b/assets/js/components/prism-lolcode.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-lolcode.min.js b/assets/js/components/prism-lolcode.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-lua.js b/assets/js/components/prism-lua.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-lua.min.js b/assets/js/components/prism-lua.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-makefile.js b/assets/js/components/prism-makefile.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-makefile.min.js b/assets/js/components/prism-makefile.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-markdown.js b/assets/js/components/prism-markdown.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-markdown.min.js b/assets/js/components/prism-markdown.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-markup.js b/assets/js/components/prism-markup.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-markup.min.js b/assets/js/components/prism-markup.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-matlab.js b/assets/js/components/prism-matlab.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-matlab.min.js b/assets/js/components/prism-matlab.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-mel.js b/assets/js/components/prism-mel.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-mel.min.js b/assets/js/components/prism-mel.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-mizar.js b/assets/js/components/prism-mizar.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-mizar.min.js b/assets/js/components/prism-mizar.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-monkey.js b/assets/js/components/prism-monkey.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-monkey.min.js b/assets/js/components/prism-monkey.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nasm.js b/assets/js/components/prism-nasm.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nasm.min.js b/assets/js/components/prism-nasm.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nginx.js b/assets/js/components/prism-nginx.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nginx.min.js b/assets/js/components/prism-nginx.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nim.js b/assets/js/components/prism-nim.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nim.min.js b/assets/js/components/prism-nim.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nix.js b/assets/js/components/prism-nix.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nix.min.js b/assets/js/components/prism-nix.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nsis.js b/assets/js/components/prism-nsis.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-nsis.min.js b/assets/js/components/prism-nsis.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-objectivec.js b/assets/js/components/prism-objectivec.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-objectivec.min.js b/assets/js/components/prism-objectivec.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ocaml.js b/assets/js/components/prism-ocaml.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ocaml.min.js b/assets/js/components/prism-ocaml.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-oz.js b/assets/js/components/prism-oz.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-oz.min.js b/assets/js/components/prism-oz.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-parigp.js b/assets/js/components/prism-parigp.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-parigp.min.js b/assets/js/components/prism-parigp.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-parser.js b/assets/js/components/prism-parser.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-parser.min.js b/assets/js/components/prism-parser.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-pascal.js b/assets/js/components/prism-pascal.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-pascal.min.js b/assets/js/components/prism-pascal.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-perl.js b/assets/js/components/prism-perl.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-perl.min.js b/assets/js/components/prism-perl.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-php-extras.js b/assets/js/components/prism-php-extras.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-php-extras.min.js b/assets/js/components/prism-php-extras.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-php.js b/assets/js/components/prism-php.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-php.min.js b/assets/js/components/prism-php.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-powershell.js b/assets/js/components/prism-powershell.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-powershell.min.js b/assets/js/components/prism-powershell.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-processing.js b/assets/js/components/prism-processing.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-processing.min.js b/assets/js/components/prism-processing.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-prolog.js b/assets/js/components/prism-prolog.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-prolog.min.js b/assets/js/components/prism-prolog.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-properties.js b/assets/js/components/prism-properties.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-properties.min.js b/assets/js/components/prism-properties.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-protobuf.js b/assets/js/components/prism-protobuf.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-protobuf.min.js b/assets/js/components/prism-protobuf.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-puppet.js b/assets/js/components/prism-puppet.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-puppet.min.js b/assets/js/components/prism-puppet.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-pure.js b/assets/js/components/prism-pure.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-pure.min.js b/assets/js/components/prism-pure.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-python.js b/assets/js/components/prism-python.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-python.min.js b/assets/js/components/prism-python.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-q.js b/assets/js/components/prism-q.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-q.min.js b/assets/js/components/prism-q.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-qore.js b/assets/js/components/prism-qore.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-qore.min.js b/assets/js/components/prism-qore.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-r.js b/assets/js/components/prism-r.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-r.min.js b/assets/js/components/prism-r.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-reason.js b/assets/js/components/prism-reason.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-reason.min.js b/assets/js/components/prism-reason.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-rest.js b/assets/js/components/prism-rest.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-rest.min.js b/assets/js/components/prism-rest.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-rip.js b/assets/js/components/prism-rip.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-rip.min.js b/assets/js/components/prism-rip.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-roboconf.js b/assets/js/components/prism-roboconf.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-roboconf.min.js b/assets/js/components/prism-roboconf.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ruby.js b/assets/js/components/prism-ruby.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-ruby.min.js b/assets/js/components/prism-ruby.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-rust.js b/assets/js/components/prism-rust.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-rust.min.js b/assets/js/components/prism-rust.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-sas.js b/assets/js/components/prism-sas.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-sas.min.js b/assets/js/components/prism-sas.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-sass.js b/assets/js/components/prism-sass.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-sass.min.js b/assets/js/components/prism-sass.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-scala.js b/assets/js/components/prism-scala.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-scala.min.js b/assets/js/components/prism-scala.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-scheme.js b/assets/js/components/prism-scheme.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-scheme.min.js b/assets/js/components/prism-scheme.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-scss.js b/assets/js/components/prism-scss.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-scss.min.js b/assets/js/components/prism-scss.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-smalltalk.js b/assets/js/components/prism-smalltalk.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-smalltalk.min.js b/assets/js/components/prism-smalltalk.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-smarty.js b/assets/js/components/prism-smarty.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-smarty.min.js b/assets/js/components/prism-smarty.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-sql.js b/assets/js/components/prism-sql.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-sql.min.js b/assets/js/components/prism-sql.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-stylus.js b/assets/js/components/prism-stylus.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-stylus.min.js b/assets/js/components/prism-stylus.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-swift.js b/assets/js/components/prism-swift.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-swift.min.js b/assets/js/components/prism-swift.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-tcl.js b/assets/js/components/prism-tcl.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-tcl.min.js b/assets/js/components/prism-tcl.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-textile.js b/assets/js/components/prism-textile.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-textile.min.js b/assets/js/components/prism-textile.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-twig.js b/assets/js/components/prism-twig.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-twig.min.js b/assets/js/components/prism-twig.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-typescript.js b/assets/js/components/prism-typescript.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-typescript.min.js b/assets/js/components/prism-typescript.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-vbnet.js b/assets/js/components/prism-vbnet.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-vbnet.min.js b/assets/js/components/prism-vbnet.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-verilog.js b/assets/js/components/prism-verilog.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-verilog.min.js b/assets/js/components/prism-verilog.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-vhdl.js b/assets/js/components/prism-vhdl.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-vhdl.min.js b/assets/js/components/prism-vhdl.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-vim.js b/assets/js/components/prism-vim.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-vim.min.js b/assets/js/components/prism-vim.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-wiki.js b/assets/js/components/prism-wiki.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-wiki.min.js b/assets/js/components/prism-wiki.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-xojo.js b/assets/js/components/prism-xojo.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-xojo.min.js b/assets/js/components/prism-xojo.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-yaml.js b/assets/js/components/prism-yaml.js
old mode 100644
new mode 100755
diff --git a/assets/js/components/prism-yaml.min.js b/assets/js/components/prism-yaml.min.js
old mode 100644
new mode 100755
diff --git a/assets/js/prism.js b/assets/js/prism.js
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
index 77ab730..9b08443
--- a/index.php
+++ b/index.php
@@ -1,16 +1,5 @@
launch();
\ No newline at end of file
+echo (new Kirby)->render();
diff --git a/kirby b/kirby
index a2678c4..72f01ea 160000
--- a/kirby
+++ b/kirby
@@ -1 +1 @@
-Subproject commit a2678c41c7f57ef176651e257840861d6c21b653
+Subproject commit 72f01eac0a7db59360894e0cfb44680276260174
diff --git a/panel b/panel
deleted file mode 160000
index f3010a2..0000000
--- a/panel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f3010a2676874464016f47a0eec70009bae1f0a5
diff --git a/site/blueprints/default.yml b/site/blueprints/default.yml
deleted file mode 100644
index e8f0fa8..0000000
--- a/site/blueprints/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-title: Page
-pages: true
-files: true
-fields:
- title:
- label: Title
- type: text
- text:
- label: Text
- type: markdown
diff --git a/site/blueprints/files/default.yml b/site/blueprints/files/default.yml
new file mode 100644
index 0000000..78ab773
--- /dev/null
+++ b/site/blueprints/files/default.yml
@@ -0,0 +1,6 @@
+title: File
+
+fields:
+ alt:
+ label: Alt Text
+ type: text
\ No newline at end of file
diff --git a/site/blueprints/note.yml b/site/blueprints/note.yml
deleted file mode 100644
index 153a493..0000000
--- a/site/blueprints/note.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-icon: file-text
-
-title: Note
-pages: false
-files: true
-fields:
- title:
- label: Title
- type: text
- tags:
- label: Tags
- type: tags
- date:
- label: Date
- type: date
- text:
- label: Text
- type: markdown
diff --git a/site/blueprints/notes.yml b/site/blueprints/notes.yml
deleted file mode 100644
index 57a653e..0000000
--- a/site/blueprints/notes.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-icon: pencil
-
-title: Page
-pages: true
-files: true
-fields:
- title:
- label: Title
- type: text
- text:
- label: Text
- type: markdown
diff --git a/site/blueprints/pages/default.yml b/site/blueprints/pages/default.yml
new file mode 100755
index 0000000..762be85
--- /dev/null
+++ b/site/blueprints/pages/default.yml
@@ -0,0 +1,18 @@
+title: Page
+drafts:
+ headline: Sub-Pages
+ type: pages
+ status: all
+ templates: note
+sections:
+ files:
+ headline: Files
+ type: files
+files: true
+fields:
+ title:
+ label: Title
+ type: text
+ text:
+ label: Text
+ type: textarea
diff --git a/site/blueprints/error.yml b/site/blueprints/pages/error.yml
old mode 100644
new mode 100755
similarity index 69%
rename from site/blueprints/error.yml
rename to site/blueprints/pages/error.yml
index 3ceff5c..ceadc86
--- a/site/blueprints/error.yml
+++ b/site/blueprints/pages/error.yml
@@ -1,11 +1,11 @@
+icon: alert
+
title: Error
-pages: false
-files: false
fields:
title:
label: Title
type: text
text:
label: Text
- type: markdown
+ type: textarea
size: large
diff --git a/site/blueprints/home.yml b/site/blueprints/pages/home.yml
old mode 100644
new mode 100755
similarity index 75%
rename from site/blueprints/home.yml
rename to site/blueprints/pages/home.yml
index 65f8376..4ef0eac
--- a/site/blueprints/home.yml
+++ b/site/blueprints/pages/home.yml
@@ -1,10 +1,9 @@
title: Home
-pages: false
fields:
title:
label: Title
type: text
text:
label: Text
- type: markdown
+ type: textarea
size: large
diff --git a/site/blueprints/pages/note.yml b/site/blueprints/pages/note.yml
new file mode 100755
index 0000000..b69e3b5
--- /dev/null
+++ b/site/blueprints/pages/note.yml
@@ -0,0 +1,39 @@
+title: Note
+num: date
+icon: draft
+
+status:
+ draft:
+ label: Draft
+ text: Drafts can only be seen by logged in users.
+ unlisted:
+ label: In Review
+ text: The article is online and can be visited with the direct URL.
+ listed:
+ label: Published
+ text: The article is online and listed on the page.
+
+columns:
+ - width: 2/3
+ fields:
+ title:
+ label: Title
+ type: text
+ tags:
+ label: Tags
+ type: tags
+ date:
+ label: Date
+ type: date
+ text:
+ label: Text
+ type: textarea
+ - width: 1/3
+ sections:
+ files:
+ headline: Files
+ type: files
+ layout: list
+ info: "{{ file.dimensions }}"
+ image:
+ back: black
diff --git a/site/blueprints/pages/notes.yml b/site/blueprints/pages/notes.yml
new file mode 100755
index 0000000..eda894a
--- /dev/null
+++ b/site/blueprints/pages/notes.yml
@@ -0,0 +1,34 @@
+icon: edit
+
+title: Notes
+columns:
+ - width: 1
+ fields:
+ title:
+ label: Title
+ type: text
+ text:
+ label: Text
+ type: textarea
+ size: medium
+
+ - width: 1/3
+ sections:
+ drafts:
+ extends: sections/notes
+ headline: Drafts
+ status: draft
+
+ - width: 1/3
+ sections:
+ unlisted:
+ extends: sections/notes
+ headline: In Review
+ status: unlisted
+
+ - width: 1/3
+ sections:
+ listed:
+ extends: sections/notes
+ headline: Published
+ status: listed
diff --git a/site/blueprints/pages/projects.yml b/site/blueprints/pages/projects.yml
new file mode 100755
index 0000000..80473fd
--- /dev/null
+++ b/site/blueprints/pages/projects.yml
@@ -0,0 +1,21 @@
+icon: document
+columns:
+ - width: 2/3
+ fields:
+ title:
+ label: Title
+ type: text
+ intro:
+ label: Intro
+ type: textarea
+ size: small
+ text:
+ label: Text
+ type: textarea
+ size: large
+ - width: 1/3
+ sections:
+ files:
+ headline: Files
+ type: files
+ layout: cards
diff --git a/site/blueprints/projects.yml b/site/blueprints/projects.yml
deleted file mode 100644
index 12c2e9e..0000000
--- a/site/blueprints/projects.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-icon: file
-
-title: Projects
-pages: false
-files: true
-fields:
- title:
- label: Title
- type: text
- intro:
- label: Intro
- type: textarea
- size: small
- text:
- label: Text
- type: markdown
- size: large
\ No newline at end of file
diff --git a/site/blueprints/sections/notes.yml b/site/blueprints/sections/notes.yml
new file mode 100644
index 0000000..bc9fcad
--- /dev/null
+++ b/site/blueprints/sections/notes.yml
@@ -0,0 +1,8 @@
+type: pages
+headline: Notes
+info: "{{ page.date.toDate('d.m.Y') }}"
+template: note
+empty: No Notes
+sortBy: date desc
+image:
+ back: black
\ No newline at end of file
diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml
index 97fd9e0..9eaffa2 100644
--- a/site/blueprints/site.yml
+++ b/site/blueprints/site.yml
@@ -1,26 +1,41 @@
title: Site
-files: false
-pages: default
-fields:
- title:
- label: Title
- type: text
- width: 2/3
- author:
- label: Author
- type: text
- width: 1/3
- keywords:
- label: Keywords
- type: tags
- description:
- label: Description
- type: markdown
- copyright:
- label: Copyright
- type: markdown
- width: 1/2
- footerinfo:
- label: Footer
- type: markdown
- width: 1/2
+
+columns:
+ - width: 2/3
+ fields:
+ title:
+ label: Title
+ type: text
+ author:
+ label: Author
+ type: text
+ width: 1/2
+ keywords:
+ label: Keywords
+ type: tags
+ width: 1/2
+ description:
+ label: Description
+ type: textarea
+ size: large
+ copyright:
+ label: Copyright
+ type: textarea
+ width: 1/2
+ size: medium
+ footerinfo:
+ label: Footer
+ type: textarea
+ width: 1/2
+ size: medium
+ - width: 1/3
+ sections:
+ pages:
+ type: pages
+ create: default
+ template:
+ - notes
+ - error
+ - projects
+ - default
+ - imprint
diff --git a/site/cache/index.html b/site/cache/index.html
deleted file mode 100644
index e69de29..0000000
diff --git a/site/fields/markdown b/site/fields/markdown
deleted file mode 160000
index 785fb4f..0000000
--- a/site/fields/markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 785fb4f37b98ebabb2e95ea717b47ca3e814c0fb
diff --git a/site/plugins/feed/feed.php b/site/plugins/feed/feed.php
deleted file mode 100644
index 5a1117b..0000000
--- a/site/plugins/feed/feed.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- * @version 2.0.0
- */
-Pages::$methods['feed'] = function($pages, $params = array()) {
-
- // set all default values
- $defaults = array(
- 'url' => url(),
- 'title' => 'Feed',
- 'description' => '',
- 'link' => url(),
- 'datefield' => 'date',
- 'textfield' => 'text',
- 'modified' => time(),
- 'excerpt' => false,
- 'generator' => kirby()->option('feed.generator', 'Kirby'),
- 'header' => true,
- 'snippet' => false,
- );
-
- // merge them with the user input
- $options = array_merge($defaults, $params);
-
- // sort by date
- $items = $pages->sortBy($options['datefield'], 'desc');
-
- // add the items
- $options['items'] = $items;
- $options['link'] = url($options['link']);
-
- // fetch the modification date
- if($options['datefield'] == 'modified') {
- $options['modified'] = $items->first()->modified();
- } else {
- $options['modified'] = $items->first()->date(false, $options['datefield']);
- }
-
- // send the xml header
- if($options['header']) header::type('text/xml');
-
- // echo the doctype
- $html = '' . PHP_EOL;
-
- // custom snippet
- if($options['snippet']) {
- $html .= snippet($options['snippet'], $options, true);
- } else {
- $html .= tpl::load(__DIR__ . DS . 'template.php', $options);
- }
-
- return $html;
-
-};
\ No newline at end of file
diff --git a/site/plugins/feed/readme.md b/site/plugins/feed/readme.md
deleted file mode 100644
index 96f8ad0..0000000
--- a/site/plugins/feed/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# RSS Feed Plugin
-
-This is a plugin for [Kirby](http://getkirby.com/) that generates RSS feeds for any set of pages.
-
-## Installation
-
-Put the `feed` folder in `/site/plugins`.
-
-## How to use it
-
-You can use this in a template for a dedicated feed page or in a template controller.
-
-## Example usage
-
-```php
-children()->visible()->flip()->limit(10)->feed(array(
- 'title' => 'Latest articles',
- 'description' => 'Read the latest news about our company',
- 'link' => 'blog'
-));
-```
-
-Check out the $defaults array in feed.php for more options.
-
-## Author
-
-Bastian Allgeier
diff --git a/site/plugins/feed/template.php b/site/plugins/feed/template.php
deleted file mode 100644
index d126425..0000000
--- a/site/plugins/feed/template.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- title()) ?>
- url()) ?>
- id()) ?>
- modified('r') : $item->date('r', $datefield) ?>
- {$textfield}()->kirbytext() ?>]]>
-
-
-
-
-
\ No newline at end of file
diff --git a/site/snippets/header.php b/site/snippets/header.php
index 6524c6d..dfa5893 100644
--- a/site/snippets/header.php
+++ b/site/snippets/header.php
@@ -10,7 +10,6 @@
-
diff --git a/site/templates/feed.php b/site/templates/feed.php
deleted file mode 100644
index a7f1eed..0000000
--- a/site/templates/feed.php
+++ /dev/null
@@ -1,9 +0,0 @@
-children()->visible()->flip()->limit(10)->feed(array(
- 'title' => $page->title(),
- 'description' => $page->description(),
- 'link' => 'notes',
-));
-
-?>
\ No newline at end of file
diff --git a/site/templates/notes.php b/site/templates/notes.php
index 867bff3..6077d2d 100644
--- a/site/templates/notes.php
+++ b/site/templates/notes.php
@@ -9,7 +9,6 @@