Merge branch 'master' of svs.ankaa.uberspace.de:sterzy/sterzycom

This commit is contained in:
Shannon Sterz 2017-08-04 18:58:02 +02:00
commit 6195b1faac
16 changed files with 313 additions and 46 deletions

4
.gitignore vendored
View file

@ -2,10 +2,12 @@
site/accounts site/accounts
site/config site/config
pad pad
owncloud cloud
h-projects h-projects
.well-known .well-known
old old
content content
thumbs thumbs
assets/avatars assets/avatars
wiki

View file

@ -2,41 +2,46 @@
# rewrite rules # rewrite rules
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav # enable awesome urls. i.e.:
Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav # http://yourdomain.com/about-us/team
RewriteEngine on
# enable awesome urls. i.e.: RewriteCond %{HTTPS} !=on
# http://yourdomain.com/about-us/team
RewriteEngine on
# make sure to set the RewriteBase correctly # redirect all trafic to https
# if you are running the site in a subfolder. RewriteCond %{ENV:HTTPS} !=on
# Otherwise links or the entire site will break. RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
#
# If your homepage is http://yourdomain.com/mysite
# Set the RewriteBase to:
#
# RewriteBase /mysite
# block text files in the content folder from being accessed directly Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
RewriteRule ^content/(.*)\.(txt|md|mdown)$ index.php [L] Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
# block all files in the site folder from being accessed directly # make sure to set the RewriteBase correctly
RewriteRule ^site/(.*) index.php [L] # 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 # block text files in the content folder from being accessed directly
RewriteRule ^kirby/(.*) index.php [L] RewriteRule ^content/(.*)\.(txt|md|mdown)$ index.php [L]
# make panel links work # block all files in the site folder from being accessed directly
RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^site/(.*) index.php [L]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^panel/(.*) panel/index.php [L]
# make site links work # block all files in the kirby folder from being accessed directly
RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^kirby/(.*) index.php [L]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*) index.php [L]
# make panel links work
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^panel/(.*) panel/index.php [L]
# make site links work
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*) index.php [L]
</IfModule> </IfModule>
# Additional recommended values # Additional recommended values
@ -45,3 +50,6 @@ RewriteRule ^(.*) index.php [L]
# AddDefaultCharset UTF-8 # AddDefaultCharset UTF-8
# #
# php_flag short_open_tag on # php_flag short_open_tag on
RequestHeader set X-Forwarded-Proto https
RequestHeader set X-Forwarded-Ssl on

View file

@ -5,6 +5,6 @@ The rest of the code is under this license: [License](https://svs.ankaa.uberspac
# Installing # Installing
``` ```
$ git clone --recursive https://svs.ankaa.uberspace.de/sterzy/sterzycom.git $ git clone --recursive https://svs.ankaa.uberspace.de/sterzy/sterzycom.git
$ mkdir site/config site/accounts thumbs content assests/avatars $ mkdir site/config site/accounts thumbs content assets/avatars
``` ```
Then [add your license](http://getkirby.com/docs/installation/license-code) and visit yoursite.com/panel. Then [add your license](http://getkirby.com/docs/installation/license-code) and visit yoursite.com/panel.

123
assets/css/prism.css Normal file
View file

@ -0,0 +1,123 @@
/* http://prismjs.com/download.html?themes=prism-okaidia&languages=markup+css+clike+javascript+abap+actionscript+ada+apacheconf+apl+applescript+asciidoc+aspnet+autoit+autohotkey+bash+basic+batch+c+brainfuck+bro+bison+csharp+cpp+coffeescript+ruby+css-extras+d+dart+django+diff+docker+eiffel+elixir+erlang+fsharp+fortran+gherkin+git+glsl+go+graphql+groovy+haml+handlebars+haskell+haxe+http+icon+inform7+ini+j+jade+java+jolie+json+julia+keyman+kotlin+latex+less+livescript+lolcode+lua+makefile+markdown+matlab+mel+mizar+monkey+nasm+nginx+nim+nix+nsis+objectivec+ocaml+oz+parigp+parser+pascal+perl+php+php-extras+powershell+processing+prolog+properties+protobuf+puppet+pure+python+q+qore+r+jsx+reason+rest+rip+roboconf+crystal+rust+sas+sass+scss+scala+scheme+smalltalk+smarty+sql+stylus+swift+tcl+textile+twig+typescript+vbnet+verilog+vhdl+vim+wiki+xojo+yaml */
/**
* okaidia theme for JavaScript, CSS and HTML
* Loosely based on Monokai textmate theme by http://www.monokai.nl/
* @author ocodia
*/
code[class*="language-"],
pre[class*="language-"] {
color: #f8f8f2;
background: none;
text-shadow: 0 1px rgba(0, 0, 0, 0.3);
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
border-radius: 0.3em;
}
:not(pre) > code[class*="language-"],
pre[class*="language-"] {
background: #272822;
}
/* Inline code */
:not(pre) > code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}
.token.punctuation {
color: #f8f8f2;
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.constant,
.token.symbol,
.token.deleted {
color: #f92672;
}
.token.boolean,
.token.number {
color: #ae81ff;
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #a6e22e;
}
.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string,
.token.variable {
color: #f8f8f2;
}
.token.atrule,
.token.attr-value,
.token.function {
color: #e6db74;
}
.token.keyword {
color: #66d9ef;
}
.token.regex,
.token.important {
color: #fd971f;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}

124
assets/js/prism.js Normal file

File diff suppressed because one or more lines are too long

2
kirby

@ -1 +1 @@
Subproject commit 1d93437c3dd73432567f8d080723e3b574754781 Subproject commit c490d6564a5bc74ddb78afa02ceecd2998513aa7

2
panel

@ -1 +1 @@
Subproject commit 595b7c7a18e61c1d6b4138e4a75613cd774989a1 Subproject commit 73db1d731efb50c0edd768a1254228c56d7564dd

View file

@ -0,0 +1,10 @@
title: Page
pages: true
files: true
fields:
title:
label: Title
type: text
text:
label: Text
type: markdown

View file

@ -1,5 +1,3 @@
<?php if(!defined('KIRBY')) exit ?>
title: Error title: Error
pages: false pages: false
files: false files: false

View file

@ -1,5 +1,3 @@
<?php if(!defined('KIRBY')) exit ?>
title: Home title: Home
pages: false pages: false
fields: fields:

View file

@ -1,4 +1,4 @@
<?php if(!defined('KIRBY')) exit ?> icon: file-text
title: Note title: Note
pages: false pages: false

View file

@ -1,4 +1,4 @@
<?php if(!defined('KIRBY')) exit ?> icon: pencil
title: Page title: Page
pages: true pages: true

View file

@ -1,4 +1,4 @@
<?php if(!defined('KIRBY')) exit ?> icon: file
title: Projects title: Projects
pages: false pages: false

View file

@ -1,23 +1,26 @@
<?php if(!defined('KIRBY')) exit ?>
title: Site title: Site
files: false
pages: default pages: default
fields: fields:
title: title:
label: Title label: Title
type: text type: text
width: 2/3
author: author:
label: Author label: Author
type: text type: text
description: width: 1/3
label: Description
type: markdown
keywords: keywords:
label: Keywords label: Keywords
type: tags type: tags
description:
label: Description
type: markdown
copyright: copyright:
label: Copyright label: Copyright
type: markdown type: markdown
width: 1/2
footerinfo: footerinfo:
label: Footer label: Footer
type: markdown type: markdown
width: 1/2

View file

@ -11,6 +11,6 @@
</div> </div>
</footer> </footer>
<?php echo js('assets/js/prism.js')?>
</body> </body>
</html> </html>

View file

@ -17,7 +17,8 @@
<?php echo css(array( <?php echo css(array(
'assets/css/main.css', 'assets/css/main.css',
'assets/css/mobile.css' 'assets/css/mobile.css',
'assets/css/prism.css'
)) ?> )) ?>
<script type="text/javascript"></script> <script type="text/javascript"></script>