diff --git a/.gitignore b/.gitignore index e5ae5a4..8a102ed 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,14 @@ !.gitignore !.htaccess -!/user/pages -!/user/plugins/losung -!/user/plugins/python-script -!/user/themes/church +!user/pages +!user/pages/** +!user/plugins/losung +!user/plugins/losung/** +!user/plugins/python-script +!user/plugins/python-script/** +!user/themes/church +!user/themes/church/** # old entries for reference: diff --git a/user/config/system.yaml b/user/config/system.yaml index ad5620b..2b98db0 100644 --- a/user/config/system.yaml +++ b/user/config/system.yaml @@ -111,7 +111,7 @@ assets: collections: jquery: 'system://assets/jquery/jquery-2.x.min.js' errors: - display: '0' + display: 0 log: true debugger: enabled: false @@ -130,7 +130,7 @@ media: upload_limit: 67108864 session: enabled: true - initialize: true + initialize: false timeout: 1800 name: baptisten-hohenacker secure: true @@ -141,3 +141,6 @@ gpm: method: auto verify_peer: true official_gpm_only: true +strict_mode: + yaml_compat: true + twig_compat: true diff --git a/user/pages/03.termine/sidebarpage.de.md b/user/pages/03.termine/sidebarpage.de.md index c271c01..16d30dd 100644 --- a/user/pages/03.termine/sidebarpage.de.md +++ b/user/pages/03.termine/sidebarpage.de.md @@ -175,6 +175,54 @@ date (iso);time-string;category;param 2018-06-24;10.00 Uhr;godi;Willy Kuhn (Open Doors) 2018-06-26;15.00 Uhr;bibge; 2018-06-27;20.00 Uhr;hauskr;bei Christine +2018-07-01;10.00 Uhr;text_fett;Brunchgottesdienst mit Viktor Petkau +2018-07-02;20.00 Uhr;text;Treffen der Kigo-Mitarbeiter bei Fam. Homering +2018-07-03;15.00 Uhr;bibge; +2018-07-08;10.00 Uhr;text_fett;Hohenacker-Sommer Gottesdienst mit Viktor Petkau in der Ortsmitte +2018-07-10;15.00 Uhr;bibge; +2018-07-11;20.00 Uhr;hauskr;bei Christine +2018-07-15;10.00 Uhr;godi;Uwe Köhler +2018-07-17;15.00 Uhr;bibge; +2018-07-21; 9.00 Uhr;mägfit; +2018-07-22;10.00 Uhr;godi;Jürgen Vollmer +2018-07-24;15.00 Uhr;bibge; +2018-07-25;20.00 Uhr;hauskr;bei Christine +2018-07-29;10.00 Uhr;godi;Andreas Mende +2018-07-31;15.00 Uhr;bibge; +2018-08-05;10.00 Uhr;godi;Thomas Rissmann +2018-08-05;;text;in den Räumen der Gemeinde Waiblingen in der Heerstraße +2018-08-07;15.00 Uhr;bibge; +2018-08-12;10.00 Uhr;godi;Viktor Petkau +2018-08-19;10.00 Uhr;godi;Josias Richter +2018-08-26;10.00 Uhr;godi; +2018-09-02;10.00 Uhr;godi;Manfred Draheim +2018-09-06;15.00 Uhr;bibge; in der Friedenskirche in Backnang (Eugen-Bolz-Str. 24) +2018-09-09;10.00 Uhr;godi;Viktor Petkau +2018-09-14;17.00 Uhr;text;„Jesus auf der Spur“ +2018-09-16;10.00 Uhr;godi;Martin Heißwolf +2018-09-19;20.00 Uhr;hauskr;bei Christine +2018-09-21;17.00 Uhr;text;„Jesus auf der Spur“ +2018-09-23;10.00 Uhr;godi; +2018-09-28;17.00 Uhr;text;„Jesus auf der Spur“ +2018-09-29; 9.00 Uhr;mägfit; +2018-09-30;10.00 Uhr;godi; +2018-10-02;15.00 Uhr;bibge; +2018-10-02;19.45 Uhr;text;Gemeindeleitungssitzung +2018-10-05;17.00 Uhr;text;„Jesus auf der Spur“ +2018-10-07;10.00 Uhr;text_fett;Erntedank-Gottesdienst mit Martin Heißwolf +2018-10-07;;text;in den Räumen der Gemeinde Waiblingen in der Heerstraße 109 +2018-10-09;15.00 Uhr;bibge; +2018-10-13; 9.30 Uhr;text;Gemeindefrühstück +2018-10-14;10.00 Uhr;godi;Viktor Petkau +2018-10-16;15.00 Uhr;bibge; +2018-10-17;16.00 Uhr;gu; +2018-10-17;20.00 Uhr;hauskr;bei Christine +2018-10-19;17.00 Uhr;text;„Jesus auf der Spur“ +2018-10-21;10.00 Uhr;godi;Martin Heißwolf +2018-10-23;15.00 Uhr;bibge; +2018-10-26;17.00 Uhr;text;„Jesus auf der Spur“ +2018-10-28;10.00 Uhr;godi;Thomas Oberdorf +2018-10-30;15.00 Uhr;bibge; {%endset%} {% filter pythonscript('termine-web.py') %} diff --git a/user/pages/03.termine/templates.py b/user/pages/03.termine/templates.py index 6232c79..0b53b84 100644 --- a/user/pages/03.termine/templates.py +++ b/user/pages/03.termine/templates.py @@ -7,7 +7,7 @@ weekday_names_short=["Mo","Di","Mi","Do","Fr","Sa","So"] monthnames=['','Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'] #text,other,sonder,... web_templates={"godi":"Gottesdienst mit {param}" -,"bibge":"Bibelgespräch" +,"bibge":"Bibelgespräch{param}" ,"gu":"Gemeindeunterricht" ,"hauskr":"Hauskreis {param}" ,"text":"{param}" diff --git a/user/pages/03.termine/templates.pyc b/user/pages/03.termine/templates.pyc index 576df58..4a3c0b1 100644 Binary files a/user/pages/03.termine/templates.pyc and b/user/pages/03.termine/templates.pyc differ diff --git a/user/pages/03.termine/termine-web.py b/user/pages/03.termine/termine-web.py index b96131b..b422bbc 100644 --- a/user/pages/03.termine/termine-web.py +++ b/user/pages/03.termine/termine-web.py @@ -25,6 +25,8 @@ html_escape_table = { u"Ö": "Ö", u"Ü": "Ü", u"ß": "ß", + u"„":"“", + u"“":"”", } def html_escape(text): """Produce entities within text.""" @@ -53,7 +55,7 @@ reader.next()#skip header #lines=[] table_content="" lastdate=datetime.date(2000,1,1)#date in past -> add heading to first month -logmessage+="lastdate is {}".format(lastdate) +logmessage+="lastdate is {}\n".format(lastdate) for row in reader: try: if not row:#ignore empty lines @@ -115,12 +117,13 @@ for row in reader: table_content+=line+"\n" lastdate=date except: - print "error at row:" - print row + logmessage+="error at row:" + logmessage+=str(row)+"\n" +# logmessage+=str(e.message)+"\n" pass logmessage+="generated sucessfully on %s"%str(datetime.datetime.now()) table_html=html_template.format(table_content=table_content) -table_html+="""""".format(logmessage) +table_html+="""""".format(logmessage) #f = open("table.html",'w') #f.writelines(table_html) #f.close() diff --git a/user/pages/08.predigtaufnahmen/default.de.md b/user/pages/08.predigtaufnahmen/default.de.md index 4d3b4e8..b58da6e 100644 --- a/user/pages/08.predigtaufnahmen/default.de.md +++ b/user/pages/08.predigtaufnahmen/default.de.md @@ -67,4 +67,6 @@ function searchFunction() { {# ## file: {{ 'table.html'|filecontent }} {{ pythonscript('/aufnahmen/gen_md.py','~/razor/grav/user/pages/08.predigtaufnahmen/') }} #} -{{url('jquery')}} \ No newline at end of file + + +{#url('jquery')#} \ No newline at end of file diff --git a/user/themes/church/css/css-only-lightbox.css b/user/themes/church/css/css-only-lightbox.css index a2e816f..2a1bf08 100644 --- a/user/themes/church/css/css-only-lightbox.css +++ b/user/themes/church/css/css-only-lightbox.css @@ -25,7 +25,7 @@ .lightbox img { /** Pad the lightbox image */ max-width: 90%; - max-height: 80%; + max-height: 90%; margin-top: 2%; } diff --git a/user/themes/church/css/css-only-lightbox.min.css b/user/themes/church/css/css-only-lightbox.min.css index e164784..e742f62 100644 --- a/user/themes/church/css/css-only-lightbox.min.css +++ b/user/themes/church/css/css-only-lightbox.min.css @@ -1 +1 @@ -.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} \ No newline at end of file +.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:90%;margin-top:2%}.lightbox:target{outline:0;display:block} \ No newline at end of file diff --git a/user/themes/church/js/polyfill_Array.from.js b/user/themes/church/js/polyfill_Array.from.js new file mode 100644 index 0000000..97e78f0 --- /dev/null +++ b/user/themes/church/js/polyfill_Array.from.js @@ -0,0 +1,78 @@ +// Production steps of ECMA-262, Edition 6, 22.1.2.1 +if (!Array.from) { + Array.from = (function () { + var toStr = Object.prototype.toString; + var isCallable = function (fn) { + return typeof fn === 'function' || toStr.call(fn) === '[object Function]'; + }; + var toInteger = function (value) { + var number = Number(value); + if (isNaN(number)) { return 0; } + if (number === 0 || !isFinite(number)) { return number; } + return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number)); + }; + var maxSafeInteger = Math.pow(2, 53) - 1; + var toLength = function (value) { + var len = toInteger(value); + return Math.min(Math.max(len, 0), maxSafeInteger); + }; + + // The length property of the from method is 1. + return function from(arrayLike/*, mapFn, thisArg */) { + // 1. Let C be the this value. + var C = this; + + // 2. Let items be ToObject(arrayLike). + var items = Object(arrayLike); + + // 3. ReturnIfAbrupt(items). + if (arrayLike == null) { + throw new TypeError('Array.from requires an array-like object - not null or undefined'); + } + + // 4. If mapfn is undefined, then let mapping be false. + var mapFn = arguments.length > 1 ? arguments[1] : void undefined; + var T; + if (typeof mapFn !== 'undefined') { + // 5. else + // 5. a If IsCallable(mapfn) is false, throw a TypeError exception. + if (!isCallable(mapFn)) { + throw new TypeError('Array.from: when provided, the second argument must be a function'); + } + + // 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined. + if (arguments.length > 2) { + T = arguments[2]; + } + } + + // 10. Let lenValue be Get(items, "length"). + // 11. Let len be ToLength(lenValue). + var len = toLength(items.length); + + // 13. If IsConstructor(C) is true, then + // 13. a. Let A be the result of calling the [[Construct]] internal method + // of C with an argument list containing the single item len. + // 14. a. Else, Let A be ArrayCreate(len). + var A = isCallable(C) ? Object(new C(len)) : new Array(len); + + // 16. Let k be 0. + var k = 0; + // 17. Repeat, while k < len… (also steps a - h) + var kValue; + while (k < len) { + kValue = items[k]; + if (mapFn) { + A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k); + } else { + A[k] = kValue; + } + k += 1; + } + // 18. Let putStatus be Put(A, "length", len, true). + A.length = len; + // 20. Return A. + return A; + }; + }()); +} \ No newline at end of file diff --git a/user/themes/church/js/polyfill_Array.from.min.js b/user/themes/church/js/polyfill_Array.from.min.js new file mode 100644 index 0000000..0f1a6a0 --- /dev/null +++ b/user/themes/church/js/polyfill_Array.from.min.js @@ -0,0 +1 @@ +Array.from||(Array.from=function(){var r=Object.prototype.toString,t=function(t){return"function"==typeof t||"[object Function]"===r.call(t)},n=Math.pow(2,53)-1,e=function(r){var t,e=(t=Number(r),isNaN(t)?0:0!==t&&isFinite(t)?(t>0?1:-1)*Math.floor(Math.abs(t)):t);return Math.min(Math.max(e,0),n)};return function(r){var n=Object(r);if(null==r)throw new TypeError("Array.from requires an array-like object - not null or undefined");var o,a=arguments.length>1?arguments[1]:void 0;if(void 0!==a){if(!t(a))throw new TypeError("Array.from: when provided, the second argument must be a function");arguments.length>2&&(o=arguments[2])}for(var i,u=e(n.length),f=t(this)?Object(new this(u)):new Array(u),c=0;c