added .pyc to gitignore

.gitignore

@@ -9,6 +9,8 @@
 !/user/plugins/python-script
 !/user/themes/church
 
+# compiled python scripts
+*.pyc
 
 # old entries for reference:
 /piwikCR

.htaccess

@@ -94,11 +94,14 @@ DirectoryIndex index.php index.html index.htm
 #add CSP (report only)
 <IfModule mod_headers.c>
 #Header set Content-Security-Policy-Report-Only  "default-src 'none'; form-action 'none'; frame-ancestors 'none'; report-uri https://csrichter.report-uri.com/r/d/csp/wizard"
-Header set Content-Security-Policy "form-action 'self'; img-src 'self' data: www.gravatar.com https://baptisten-hohenacker.de/piwikCR/piwik.php; frame-src 'self' www.openstreetmap.org; style-src 'self' 'unsafe-inline'; connect-src 'self' getgrav.org; media-src 'self'; font-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://baptisten-hohenacker.de 'report-sample';upgrade-insecure-requests; report-uri https://csrichter.report-uri.com/r/d/csp/enforce"
+Header set Content-Security-Policy "form-action 'self'; img-src 'self' data: www.gravatar.com https://baptisten-hohenacker.de/piwikCR/piwik.php; frame-src 'self' www.openstreetmap.org; style-src 'self' 'unsafe-inline'; connect-src 'self' getgrav.org; media-src 'self'; font-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://baptisten-hohenacker.de 'report-sample';upgrade-insecure-requests; report-uri https://csrichter.report-uri.com/r/d/csp/enforce" env=HTTPS
 #TODO: move img-src data: and unsave-eval to separate file in /piwikCR
+
+#set HSTS, but only for TLS connections
+Header set Strict-Transport-Security "max-age=31536000;includeSubDomains;preload" env=HTTPS
+
 Header set X-XSS-Protection "1; report=https://csrichter.report-uri.com/r/d/xss/enforce"
 Header set Referrer-Policy "strict-origin-when-cross-origin"
-Header set Strict-Transport-Security "max-age=31536000;includeSubDomains;preload"
 
 Header set X-Frame-Options "SAMEORIGIN"
 Header set X-Content-Type-Options "nosniff"
@@ -115,7 +118,7 @@ Header set Expect-CT "max-age=0, report-uri=https://csrichter.report-uri.com/r/d
 #problem: dynamic on-click handler on predigtaufnahmen page
 
 #cache static file for 1 month
-<filesMatch "\.(css|jpe?g|png|gif|js|ico)$">
+<filesMatch "\.(css|jpe?g|png|gif|js|ico|mp3)$">
 Header set Cache-Control "max-age=2628000, public"
 </filesMatch>
 Header set Pragma "cache"

user/pages/08.predigtaufnahmen/default.de.md

@@ -67,4 +67,4 @@ function searchFunction() {
 {# ## file:
 {{ 'table.html'|filecontent }}
 {{ pythonscript('/aufnahmen/gen_md.py','~/razor/grav/user/pages/08.predigtaufnahmen/') }} #}
-{{url('jquery')}}
+{#url('jquery')#}

user/themes/church/build.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+yui-compressor css/bootstrap-critical-trim.css >css/bootstrap-critical-trim.min.css
+yui-compressor css/css-only-lightbox.css > css/css-only-lightbox.min.css
+yui-compressor css/css-only-navigation.css > css/css-only-navigation.min.css
+yui-compressor css/css-only-navigation-inline.css > css/css-only-navigation-inline.min.css
+yui-compressor css/css-only-navigation-lazy.css > css/css-only-navigation-lazy.min.css
+yui-compressor css/css-only-lightbox-inline.css > css/css-only-lightbox-inline.min.css
+yui-compressor css/css-only-lightbox-lazy.css > css/css-only-lightbox-lazy.min.css
+yui-compressor css/footer-lazy.css > css/footer-lazy.min.css
+#yui-compressor js/deobfuscate-href.js -o js/deobfuscate-href.min.js
+#yui-compressor js/navbar-keyboard-interaction.js -o js/navbar-keyboard-interaction.min.js
+
+
+rm css/all-lazy.min.css
+cat css/*-lazy.min.css > css/all-lazy.min.css
+rm js/all.min.js
+cat js/*.js > js/all.min.js #compressor not working
+#cat js/*.min.js > js/all.min.js

user/themes/church/css/bootstrap-critical-trim.css

@@ -1,8 +1,9 @@
-/*!                                                                                                                                                                                                                                                                            
+/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)                                                                                                                                                                                                                                  
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.                                                                                                                                                                                                                                           
+ * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)                                                                                                                                                                                                  
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css 
+ */
+ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css
 critical rules extracted with https://jonassebastianohlsson.com/criticalpathcssgenerator/
 */
 html {
@@ -380,19 +381,17 @@ ul ul {
 
 
 /*override bootstraps default column ordering -> sidebar on left moves down on small screen*/                                                                                                                                                                                  
-@media (min-width: 768px){                                                                                                                                                                                                                                                     
+@media (min-width: 768px){
-  .blog-main {                                                                                                                                                                                                                                                                 
+  .blog-main {
-    float: right;                                                                                                                                                                                                                                                              
+    float: right !important;
-  }                                                                                                                                                                                                                                                                            
+  }
 }                                                                                                                                                                                                                                                                              
-/*custom content style*/                                                                                                                                                                                                                                                       
+/*spam protection in mailto links*/
-//for spam protection in mailto links                                                                                                                                                                                                                                          
+span.displaynone { display:none; }
-span.displaynone { display:none; }                                                                                                                                                                                                                                             
+/*for list in links page*/
-                                                                                                                                                                                                                                                                               
+ul{list-style: none;}
-//for list in links page                                                                                                                                                                                                                                                       
+
-ul{list-style: none;}                                                                                                                                                                                                                                                          
+.shiftRight
-                                                                                                                                                                                                                                                                               
+{
-.shiftRight                                                                                                                                                                                                                                                                    
+margin-left: 40px;
-{                                                                                                                                                                                                                                                                              
-margin-left: 40px;                                                                                                                                                                                                                                                             
 }

user/themes/church/css/bootstrap-critical-trim.min.css

@@ -1,7 +0,0 @@
-/*!                                                                                                                                                                                                                                                                            
- * Bootstrap v3.3.7 (http://getbootstrap.com)                                                                                                                                                                                                                                  
- * Copyright 2011-2016 Twitter, Inc.                                                                                                                                                                                                                                           
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)                                                                                                                                                                                                  
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css 
-critical rules extracted with https://jonassebastianohlsson.com/criticalpathcssgenerator/
-*/html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;line-height:1.42857143;color:#333;background-color:#fff}nav{display:block}a{background-color:transparent;color:#337ab7;text-decoration:none}b{font-weight:bold}img{border:0 vertical-align:middle}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}h2{font-family:inherit;font-weight:500;line-height:1.1;color:inherit;margin-top:20px;margin-bottom:10px;font-size:30px}p{margin:0 0 10px}ul{margin-top:0;margin-bottom:10px}ul ul{margin-bottom:0}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media(min-width:768px){.container{width:750px}}@media(min-width:992px){.container{width:970px}}@media(min-width:1200px){.container{width:1170px}}.row{margin-right:-15px;margin-left:-15px}.col-sm-4,.col-sm-8{position:relative;min-height:1px;padding-right:15px;padding-left:15px}@media(min-width:768px){.col-sm-4,.col-sm-8{float:left}.col-sm-8{width:66.66666667%}.col-sm-4{width:33.33333333%}}.collapse{display:none}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid \9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-nav>li>.dropdown-menu{display:none;margin-top:0;border-top-left-radius:0;border-top-right-radius:0}@media(min-width:768px){.navbar-right{float:right!important;margin-right:-15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>.active>a{color:#555;background-color:#e7e7e7}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse{border-color:#e7e7e7}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.container:before,.container:after,.row:before,.row:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.container:after,.row:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after{clear:both}@-ms-viewport{width:device-width}@media(min-width:768px){.blog-main{float:right}}//for spam protection in mailto links span.displaynone{display:none}//for list in links page ul{list-style:none}.shiftRight{margin-left:40px}

user/themes/church/css/css-only-lightbox-inline.css

@@ -0,0 +1,4 @@
+.lightbox {
+	/** Default lightbox to hidden */
+	display: none;
+}

user/themes/church/css/css-only-lightbox-lazy.css

@@ -0,0 +1,29 @@
+.lightbox {
+	/** Default lightbox to hidden */
+	display: none;
+
+	/** Position and style */
+	position: fixed;
+	z-index: 1001;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+	top: 0;
+	left: 0;
+	background: rgba(0,0,0,0.8);
+}
+
+.lightbox img {
+	/** Pad the lightbox image */
+	max-width: 90%;
+	max-height: 80%;
+	margin-top: 2%;
+}
+
+.lightbox:target {
+	/** Remove default browser outline */
+	outline: none;
+
+	/** Unhide lightbox **/
+	display: block;
+}

user/themes/church/css/css-only-lightbox.min.css

@@ -1 +0,0 @@
-.italic{font-style:italic}.small{font-size:.8em}.lightbox{display:none;position:fixed;z-index:999;width:100%;height:100%;text-align:center;top:0;left:0;background:rgba(0,0,0,0.8)}.lightbox img{max-width:90%;max-height:80%;margin-top:2%}.lightbox:target{outline:0;display:block}

user/themes/church/css/css-only-navigation-inline.css

@@ -0,0 +1,21 @@
+#navbar-toggle-cbox {
+  display:none
+}
+.dropdown-toggle-cbox {
+display:none
+}
+
+.dropdown-toggle {
+    line-height: 20px;
+    padding: 10px 15px;
+    margin-bottom: 0;
+    font-weight: normal;
+    color: #777;
+    display: block;
+}
+@media (min-width: 768px){ 
+  .dropdown-toggle{
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+}

user/themes/church/css/css-only-navigation-lazy.css

@@ -0,0 +1,46 @@
+#navbar-toggle-cbox:checked ~ .collapse {
+    display: block;
+}
+
+#navbar-toggle-cbox {
+  display:none
+}
+.dropdown-toggle-cbox:checked ~ .dropdown-menu{
+    display: block;
+}
+
+@media (max-width: 767px){
+.dropdown-toggle-cbox:checked ~ .dropdown-menu {
+    position: static;
+    float: none;
+    width: auto;
+    margin-top: 0;
+    background-color: transparent;
+    border: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}}
+.dropdown-toggle-cbox {
+display:none
+}
+
+.navbar-default .navbar-nav>.active>.dropdown-toggle {
+    color: #555;
+    background-color: #e7e7e7;
+}
+.dropdown-toggle:focus, .dropdown-toggle:hover{
+    color: #333;
+    background-color: transparent;
+}
+.dropdown-toggle-cbox:checked + .dropdown-toggle{
+color: #555;
+background-color: #e7e7e7;
+}
+
+a:focus,label:focus{    
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-color: -webkit-focus-ring-color;
+    outline-style: auto;
+    outline-width: 5px;
+    outline-offset: -2px;
+}

user/themes/church/css/css-only-navigation.min.css

@@ -1 +0,0 @@
-#navbar-toggle-cbox:checked ~ .collapse{display:block}#navbar-toggle-cbox{display:none}.dropdown-toggle-cbox:checked ~ .dropdown-menu{display:block}@media(max-width:767px){.dropdown-toggle-cbox:checked ~ .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}}.dropdown-toggle-cbox{display:none}.dropdown-toggle{padding-top:10px;padding-bottom:10px;line-height:20px;padding:10px 15px;margin-bottom:0;font-weight:normal;color:#777;display:block}.navbar-default .navbar-nav>.active>.dropdown-toggle{color:#555;background-color:#e7e7e7}.dropdown-toggle:focus,.dropdown-toggle:hover{color:#333;background-color:transparent}.dropdown-toggle-cbox:checked+.dropdown-toggle{color:#555;background-color:#e7e7e7}@media(min-width:768px){.dropdown-toggle{padding-top:15px;padding-bottom:15px}}

user/themes/church/css/footer-lazy.css

@@ -1,20 +1,3 @@
-/*override bootstraps default column ordering -> sidebar on left moves down on small screen*/
-@media (min-width: 768px){
-  .blog-main {
-    float: right;
-  }
-}
-/*custom content style*/
-//for spam protection in mailto links // doesn't work for some reason
-span.displaynone { display:none; }
-
-//for list in links page
-ul{list-style: none;}
-
-.shiftRight
-{
-margin-left: 40px;
-}
 /*footer stuff*/
 #footer
 {

user/themes/church/minify.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-yui-compressor css/bootstrap-critical-trim.css >css/bootstrap-critical-trim.min.css
-yui-compressor css/css-only-lightbox.css > css/css-only-lightbox.min.css
-yui-compressor css/css-only-navigation.css > css/css-only-navigation.min.css 

user/themes/church/templates/partials/base.html.twig

@@ -15,8 +15,8 @@
 <style>
 
 @media (min-width: 768px){.navbar-header{float:left;}}
-{{ source('css/css-only-navigation.min.css')}}
+{{ source('css/css-only-navigation-inline.min.css')}}
-{{ source('css/css-only-lightbox.min.css')}}
+{{ source('css/css-only-lightbox-inline.min.css')}}
 {{ source('css/bootstrap-critical-trim.min.css')}}
 
         </style>
@@ -52,24 +52,14 @@
         {% block bottom %}{% endblock %}
 
         {% block javascripts %}
-            {# do assets.add('jquery', 101) #}
+            {% do assets.add('theme://js/all.min.js', 99) %}
-            {# do assets.add('theme://js/modernizr.custom.71422.js', 100) #}
-            {% do assets.add('theme://js/custom.js', 99) %}
-            {% do assets.add('theme://js/navbar-keyboard-interaction.js', 99) %}
-            {# do assets.add('theme://js/bootstrap.min.js', 100) #}
-            {% if browser.getBrowser == 'msie' and browser.getVersion >= 8 and browser.getVersion <= 9 %}
-                {% do assets.add('https://oss.maxcdn.com/respond/1.4.2/respond.min.js') %}
-                {% do assets.add('theme://js/html5shiv-printshiv.min.js') %}
-            {% endif %}
-
         {% endblock %}
         {{ assets.js() }}
 
     <noscript id="deferred-styles">
         {% block stylesheets %}
             {% do assets.addCss('theme://css/bootstrap_16px.min.css', 100) %}
-            {% do assets.addCss('theme://css/bapho.css', 99) %}
+            {% do assets.addCss('theme://css/all-lazy.min.css', 101) %}
-            {# do assets.add('theme://css/font-awesome.min.css',99) #}
         {% endblock %}
         {{ assets.css() }}
     </noscript>