From 7e7a7454f40e4cbb137f77ca149809766c3cb747 Mon Sep 17 00:00:00 2001 From: Peter Fischer Date: Sat, 18 Apr 2020 12:19:29 +0200 Subject: [PATCH] =?UTF-8?q?Neuer=20Cookie-Hinweis=20und=20Pr=C3=A4sentatio?= =?UTF-8?q?nssteuerung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 7 ++-- routes/firmung.js | 4 +- routes/index.js | 2 + routes/nt/ev/lk.js | 4 +- routes/nt/ev/mk-kurz.js | 4 +- routes/nt/ev/mk.js | 4 +- routes/nt/ev/mk_old.js | 4 +- routes/sbr_ue.js | 4 +- views/eko/layout.pug | 9 ++--- views/firmung/layout.pug | 15 ++++--- views/layout.pug | 7 ++++ views/mixins_cookies.pug | 71 ++++++++++++++++++++++++++++++++++ views/nt/ev/lk/layout.pug | 16 +++++--- views/nt/ev/mk-kurz/layout.pug | 9 ++--- views/nt/ev/mk/layout.pug | 15 ++++--- views/nt/ev/mk/mixins.pug | 42 +++++++++++++++++++- views/nt/ev/mk_old/layout.pug | 17 +++++--- views/sbr_ue/layout.pug | 9 ++--- 18 files changed, 189 insertions(+), 54 deletions(-) create mode 100644 views/mixins_cookies.pug diff --git a/app.js b/app.js index 30de153..5563c74 100644 --- a/app.js +++ b/app.js @@ -9,7 +9,7 @@ var parseurl = require('parseurl') var index = require('./routes/index'); -const session = require('express-session') +/*const session = require('express-session');*/ const os = require('os'); var app = express(); @@ -21,7 +21,7 @@ app.set('view engine', 'pug'); // uncomment after placing your favicon in /public //app.use(favicon(path.join(__dirname, 'public', 'favicon.ico'))); -app.use(session({ +/*app.use(session({ secret: 'keyboard cat', resave: false, saveUninitialized: false, @@ -47,8 +47,7 @@ app.use(function restrict(req, res, next) else res.redirect('/login'); } -}); - +});*/ app.use(logger('dev')); app.use(bodyParser.json()); diff --git a/routes/firmung.js b/routes/firmung.js index a507188..ca691ef 100644 --- a/routes/firmung.js +++ b/routes/firmung.js @@ -9,9 +9,9 @@ var _locals = { pathoffset : "/firmung" }; function get_locals(req) { var locals = _locals; - locals.as_presentation = req.session.as_presentation; + /*locals.as_presentation = req.session.as_presentation; - console.log(locals); + console.log(locals);*/ return locals; } diff --git a/routes/index.js b/routes/index.js index 87974a7..86769c2 100644 --- a/routes/index.js +++ b/routes/index.js @@ -17,6 +17,7 @@ router.use("/firmung", firmung); router.use("/eko", eko); router.use("/sbr_ue", sbr_ue); +/* var svgCaptcha = require('svg-captcha'); router.get('/login', function(req, res) { @@ -64,5 +65,6 @@ router.get('/logout', function(req, res){ res.redirect('/login'); }); }); +*/ module.exports = router; diff --git a/routes/nt/ev/lk.js b/routes/nt/ev/lk.js index 8f2a44f..be3d5d2 100644 --- a/routes/nt/ev/lk.js +++ b/routes/nt/ev/lk.js @@ -9,9 +9,9 @@ var _locals = { pathoffset : "/nt/ev/lk" }; function get_locals(req) { var locals = _locals; - locals.as_presentation = req.session.as_presentation; + /*locals.as_presentation = req.session.as_presentation; - console.log(locals); + console.log(locals);*/ return locals; } diff --git a/routes/nt/ev/mk-kurz.js b/routes/nt/ev/mk-kurz.js index d2513a3..63af944 100644 --- a/routes/nt/ev/mk-kurz.js +++ b/routes/nt/ev/mk-kurz.js @@ -9,9 +9,9 @@ var _locals = { pathoffset : "/nt/ev/mk-kurz" }; function get_locals(req) { var locals = _locals; - locals.as_presentation = req.session.as_presentation; + /*locals.as_presentation = req.session.as_presentation; - console.log(locals); + console.log(locals);*/ return locals; } diff --git a/routes/nt/ev/mk.js b/routes/nt/ev/mk.js index 6cf9ca8..b35eaff 100644 --- a/routes/nt/ev/mk.js +++ b/routes/nt/ev/mk.js @@ -100,9 +100,9 @@ var _gliederung = function get_locals(req) { var locals = _locals; - locals.as_presentation = req.session.as_presentation; + /*locals.as_presentation = req.session.as_presentation; - console.log(locals); + console.log(locals);*/ return locals; } diff --git a/routes/nt/ev/mk_old.js b/routes/nt/ev/mk_old.js index 2c9375e..83ae5cd 100644 --- a/routes/nt/ev/mk_old.js +++ b/routes/nt/ev/mk_old.js @@ -9,9 +9,9 @@ var _locals = { pathoffset : "/nt/ev/mk_old" }; function get_locals(req) { var locals = _locals; - locals.as_presentation = req.session.as_presentation; + /*locals.as_presentation = req.session.as_presentation; - console.log(locals); + console.log(locals);*/ return locals; } diff --git a/routes/sbr_ue.js b/routes/sbr_ue.js index 2f7eff5..aee2db8 100644 --- a/routes/sbr_ue.js +++ b/routes/sbr_ue.js @@ -9,9 +9,9 @@ var _locals = { pathoffset : "/sbr_ue" }; function get_locals(req) { var locals = _locals; - locals.as_presentation = req.session.as_presentation; + /*locals.as_presentation = req.session.as_presentation; - console.log(locals); + console.log(locals);*/ return locals; } diff --git a/views/eko/layout.pug b/views/eko/layout.pug index 93f7373..21f4a16 100644 --- a/views/eko/layout.pug +++ b/views/eko/layout.pug @@ -23,10 +23,9 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); + else + show_all_slides(); diff --git a/views/firmung/layout.pug b/views/firmung/layout.pug index 78e99b9..23980b7 100644 --- a/views/firmung/layout.pug +++ b/views/firmung/layout.pug @@ -1,3 +1,5 @@ +include ../mixins_cookies + doctype html html(lang='de') head @@ -11,6 +13,8 @@ html(lang='de') script(src='/javascripts/jquery.min.js') script(src='/javascripts/slide-utils.js') script(src='/javascripts/popper.min.js') + + +cookies_css body block headline @@ -23,10 +27,11 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); + else + show_all_slides(); + +cookies_html + +cookies_script diff --git a/views/layout.pug b/views/layout.pug index cb707ac..aae6ec4 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -1,3 +1,5 @@ +include mixins_cookies + doctype html html(lang='de') head @@ -14,9 +16,14 @@ html(lang='de') style. h3 { font-style: italic; font-size: 1.5rem; } + + +cookies_css body .container-fluid(style="margin-top: 1rem;") block content script(src='/javascripts/bootstrap.min.js') + + +cookies_html + +cookies_script diff --git a/views/mixins_cookies.pug b/views/mixins_cookies.pug new file mode 100644 index 0000000..41bb3a7 --- /dev/null +++ b/views/mixins_cookies.pug @@ -0,0 +1,71 @@ +mixin cookies_html + #cookiedingsbums + #cookiedingsbums_vintage + #cookieinhalt + span + b + | Diese Website verwendet Cookies + br + | sowie den Session-Store + br + | (aber ohne Tracking oder dergleichen). + br + a(href="http://www.halieus.de/impressum_datenschutz.html") Datenschutzhinweise + span#cookiedingsbumsCloser(onclick="document.cookie = 'hidecookiedingsbums=1;path=/';$('#cookiedingsbums').slideUp()") ✖ + +mixin cookies_script + script. + if(document.cookie.indexOf('hidecookiedingsbums=1') != -1){ + jQuery('#cookiedingsbums').hide(); + } + else{ + jQuery('#cookiedingsbums').prependTo('body'); + jQuery('#cookiedingsbumsCloser').show(); + } + +mixin cookies_css + style. + #cookiedingsbums_vintage { + background-image: url(data:image/png;base64,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); + padding-top:42px; + background-repeat:repeat-x; + background-position:top;} + + #cookiedingsbums a {color:#007bff; text-decoration:none;} + #cookiedingsbums a:hover {text-decoration:underline;} + #cookiedingsbums #cookieinhalt { + padding:10px; + padding-top:5px; + padding-right:40px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAbCAIAAACGMIQsAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAApXSURBVHjahFmJbhzHEZ2ee0VGlCVGpkAljMEARuz//wsHiP4gh2jR8K5ISivu7lydV/W6a3qWRDKQiDm6q6rreHWs+3z7Kcsyn2UuO77w0k8T751z+j9c4zQNh0OzWmX/75qmaRyGsq7dkrKLN0PXFWWZ53n6NdMFPr55VjaQLYoCQnm9jALFxoU3Di/1K27ckrjcez95Xxzx9io0Lnzmy+5wADP8FUJPxOLiIwpZsozqy8vySC/dbmd0oIJsVq/s7bsDte+WKkjpY8HQ9yYnyRpNMMXX/nDgfW4q8H7E++6QxUesgUVFCwPOudsddrtJSePMcmxdJWYfx1R6MgPdqmm4Ejqj5kx6kB6GICKUKI9d5xNxfRQau4TIfj9rE9TGadYI6MdPII6VpAM5qWMeJkhiK9VmrsjlRDhd19l7HAcegr+mQbDIeXIYpG4a9a6pLEs8ypGUFq6yqkSdalWxAFWe53BICtfzJOPEoMGHoR/IJlenNVXyDaiRjhPiC0/BwcDu2eACnaquaW3YIIt2squHrtUkuK9Xq6pu8EYYjSNfQua6bfV0nWkNZMt/fPhQ5MUPP/zl5cuXeIWdm8+fob/d4y5TP4Imy7JyuVuvfy+KEst4+PuHh7OzM/A4PT29uLiYxvHu7m7XdVQcPvEGB/7yFdf20ENRe4pbleX19bUeyBVlBefYbDaHrrv4/nvYANw/3d5WVfX+8hKnBaPNev11u8XyVdvu9vs/np+fnJ42ZbndbiEtVh7E3fqqFdVAEqjZq0EQ93DuL1++gAiU++7i4q/X1//5+BHKe7i/B6+ff/oJzuo+/P2XkxcvXn/3HUTcHyBqB4lB63H3uF6vcdO2KzjHmzdvDvv99vGRKgAJEGqa5vz8HLTg2e/eXQzjiH9O34ua7u9vf/vtyJ5Y/OrVq/7Q1U19eXl5c3Pzu3JJr+3Xr1iDcz5++9a2LZSy1Qu6FoeFEqsKqj85OcGn9WbzbbuFryH04OV/+/FHvCFN8IJaP97cUNo/nJ5eXV29ef3a6XX38HB/d/en9+/hGm7z6Ve6Lr9J8CNONOxdAjl4w0+QA94EfdUIE+fwiE/mXXycNEb++a9/IzLfvn376uzMR6BGoMGhJDhhrmkqo4djC9Eeh9GA6uG69KbPd3f4BCKTYpvEIeSOEDP0XdW0XmWznAX/BYsY4x4axF6hoMtwtELTQpAKEUFo4QGoBcaPIozjJzFvZNArM5gI3+EdxCfQ9THG+Bd6vbr6M8IYNmIqYb4Edkwj5G4Ek4piUhvivQjHxSOw01MFzAUv2jZoVkFuToGBncvmjLaXD2VJGKIKOjUYZNbs01FHg8R+DV2DmlgOi+A54AormeUh2aTQiBUIJ1cUXt2BtEIRAbDEe/LTr0RQsqdTgCswVJSrxhd4I6op4k6igV6wMDojAAjCMEcwQdAMsiZmUxe17CMjMyRQQEoPfUmjmjCGqVIcOPUCkiXN9a83FgvcNqlbIvb4uCgzVAXPVyDLe7dcLExj0TUqI8hKRfNImfcupr0plkBecypVzGDB1cBNnIMbwph54tgWuc/mF39Ud9hh1bOCAWlqqgMxAwbUC4qIbr/zScaGKIGQJqX+cJiT+W5HaRillMlFKY0IMjiNT36UyU4iC5UFDy/pXuqczqnrSabULeJK05gi2rMqYOKEysiddYpJIu4PXxZcUP/HP8MFDeJR2UwqV0ZQZClJg3qNUmZ+Vhx5IZ5GbEsruSlqRKCnbTOtW+C35i8qykS3LxQp5uJHK0sNnAFsRq2U8IR0TqBhuFnhFDw/KtfF9wZYcvK+g7NJmLRtWQkeZTiIlaLUq9R5ihmd3pRaTVWqII1beXaEzywzPFe/gkaKQU1nHkH2Raygyctg3IfcWUXnHFnquQQCxFdVrSwic8G+KksanPQKVW88SFjP0CZGSJatg6asJ4LJDdZhWwkEsJxGqRKriviUqVgCQlpr43++Wjk1LIKFiQcF7aiXJU6TDMdmXmTqFWurikWwxFO4Ubx6tQJTAgo4IiTxqdUMFcpcnEpxzpqR1N2Yy7wSlO2IhaTRYtTUrP3Rxal+RdEZ0bKuBXV0NfwNKgA/g3TCBFYSe40iVmYB2HLiRaRQG0SDcorwoYyFf9UNwahWtMuSPq2Key1/20aqMlv2bHRSLoYw8LJe+6DQqqmapCFYCjBpK4GkhK8lW67cHEbLGJYAIc+w9sgCOpheCUeUMpdCprS+w+CKy8qIAnOqS42jIZr2zhLPUZ505VF/neZCxzZHF4sXR0mKojiCTB/J2naJ5WBwpqsI9YM1YQReXY5tfdIaCvDsdxRC+lMtHGacX3bo1pXzJehMse1Jv9pG6x1Tm/u43SBjhmE39/2WAlkX5vFyyyY1VDe6oAze4lW1TL+REEcgxBj6iFd/48iEeBrcXiNIyt5YtFq0UxRme4Q03hdlAUY4ZzAAK2sUb5qVCMlVnMqw4OM0xfzcgoiMGsUpCGMaSbkLR7iqyt/rcQDDVBbrUXFw1Zk4LZXH8AYKCj4lPTlVA6HnLJ2YguAn0rCwjU03NnIAIQT9REdFy2VeOqIDH3pzHKzhLrOzmA65U2N4HrGYi6ljyzb1RM6EyEUUl0yfUvcBTzY+VIdYkQYksEtW0vzsZ/yry5hEJedBf0X5NDKPgtYpKBZqWNhNQEeMWYrQqxXDDWAsGpdpQpkJSlWaE7ViwEmSUQpEqtRNrPR2WqQQfXgvBYV6OP0010xBzKCPB5iIoz30YLK4quErsmpz+8k9mfYxUWV2/mRitZjwJY8+Ge/Ze7+sqbNlBf100JhW0CaJhTcrJRiG4Y34KmIIZ/9zQumjyo44jloECIK6iEkzSkV/m+Iky8qqgTNI9hpa5IVHqTbF+UOhqhutepNd+z2RlQc4mhcCmAC0NoPr03IDARMzH4jnWm6IVavKcM7FeVc6mzTi0gREjpLpZMq0B1HaikhRhgY5C+iYQqja1kEuTntDsWhgq44t/ak289LbFAWhiNWe4eIQKt+xiG1IGCgE5+zJUT6VZa+BOdcO0oyPMiBDO+NDCkCUWRZbaFPNUOlBpqX9A2DpuVDiOT+CNETlbDkP08HYFCPqWBoRrhCqPqm68JVga/4CpXLEjBtClMVer9mOtVraFzgNLzpO7Hadae2oxPJxrFAAP7QRfrZxYp0uwbScQVJldVJr8RSgNmiHxsMKYjWGJQl1is4u6ylva9qDBrUmRaLJY5XS6BjmyFxsIlEQL2oeMRTK9oFz2nI5tmflQ83SrZhHYAwfA4cJT8vQlbXMrMT4yUrBLM5BrJcP53KU48nMn6vDRCx6io8WDkN+87c4es6X6dPFrCZz7fgLymQ/mWipZve210qj+PuIDKQYg1pKzCMTmzgxnWeE6thQBh/ROB1j8z7FmYX9JiCihoogLkJo9XEPf4BgEp4Dj72wJicAimCnhNZ+ru3o7dERiJSSydTI9ttB2giySacq+YMItw+co0ttFkpjllX2m40dtdJgkRGZCkk5LVrYYnJCa6wJjTzXfwUYADXxqwy5SM9KAAAAAElFTkSuQmCC); + padding-bottom:25px; + } + + #cookiedingsbums { + text-align:center; + position:fixed; + bottom:0px; + z-index:10000; + max-width:300px; + font-size:12px; + line-height:28px; + } + + #cookiedingsbumsCloser { + color: #777; + font: 14px/100% arial, sans-serif; + position: absolute; + right: 5px; + text-decoration: none; + text-shadow: 0 1px 0 #fff; + top: 50px; + cursor:pointer; + padding:4px; + } + + #cookiedingsbumsCloser:hover { + font: 18px/100% arial, sans-serif; + right:3px; + top:48px; + position: absolute; + } diff --git a/views/nt/ev/lk/layout.pug b/views/nt/ev/lk/layout.pug index 1ae70cb..8bf5b90 100644 --- a/views/nt/ev/lk/layout.pug +++ b/views/nt/ev/lk/layout.pug @@ -1,3 +1,5 @@ +include ../../../mixins_cookies + doctype html html(lang='de') head @@ -11,6 +13,9 @@ html(lang='de') script(src='/javascripts/jquery.min.js') script(src='/javascripts/slide-utils.js') script(src='/javascripts/popper.min.js') + + +cookies_css + body block headline @@ -23,10 +28,11 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); + else + show_all_slides(); + +cookies_html + +cookies_script diff --git a/views/nt/ev/mk-kurz/layout.pug b/views/nt/ev/mk-kurz/layout.pug index 1c92b63..e843c18 100644 --- a/views/nt/ev/mk-kurz/layout.pug +++ b/views/nt/ev/mk-kurz/layout.pug @@ -18,10 +18,9 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); + else + show_all_slides(); diff --git a/views/nt/ev/mk/layout.pug b/views/nt/ev/mk/layout.pug index d2bd874..d81a910 100644 --- a/views/nt/ev/mk/layout.pug +++ b/views/nt/ev/mk/layout.pug @@ -1,3 +1,5 @@ +include ../../../mixins_cookies + doctype html html(lang='de') head @@ -12,6 +14,8 @@ html(lang='de') script(src='/javascripts/jquery.min.js') script(src='/javascripts/slide-utils.js') script(src='/javascripts/popper.min.js') + + +cookies_css body block headline @@ -24,10 +28,11 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); + else + show_all_slides(); + +cookies_html + +cookies_script diff --git a/views/nt/ev/mk/mixins.pug b/views/nt/ev/mk/mixins.pug index 77e940c..91b8e9f 100644 --- a/views/nt/ev/mk/mixins.pug +++ b/views/nt/ev/mk/mixins.pug @@ -14,8 +14,46 @@ mixin headline a(href="/") BibelWissen.Halieus.DE td(style="padding: 0px; text-align: right;") a(href="http://www.halieus.de/impressum_datenschutz.html" target="_blank") Impressum & Datenschutzerklärung - p(style="font-size: 130%; font-variant: small-caps; margin-bottom: 0px;") - b Einführung in das Evangelium nach Markus + //- p(style="font-size: 130%; font-variant: small-caps; margin-bottom: 0px;") + //- b Einführung in das Evangelium nach Markus + table(style="font-size: 130%; font-variant: small-caps; margin-bottom: 0px; width: 100%;") + tr + td(style="padding: 0px;") + b Einführung in das Evangelium nach Markus + td(style="padding: 0px; text-align: right;") + .dropdown + .dropdown-toggle(data-toggle="dropdown", style="display: block; background: #555; width: 40px; height: 30px; position: relative; margin-left: auto; margin-right: 0px; border-radius: 4px; ") + //- margin-right: auto; (normalerweise) + span(style="top: 5px; position: absolute; left:5px; height: 4px; width: 30px; background: #fff; border-radius: 2px; display: block; ") + span(style="top: 13px; position: absolute; left:5px; height: 4px; width: 30px; background: #fff; border-radius: 2px; display: block; ") + span(style="top: 21px; position: absolute; left:5px; height: 4px; width: 30px; background: #fff; border-radius: 2px; display: block; ") + .dropdown-menu + .dropdown-item + input.form-check-input#check_as_presentation(type="checkbox") + label.form-check-label(for="check_as_presentation") Als Präsentation + //- , onclick="event.stopPropagation();" + + script. + var check_as_presentation = sessionStorage.getItem('show_as_presentation'); + if(check_as_presentation === null) { + console.log('no "show_as_presentation" in sessionStorage; set to false') + check_as_presentation = false; + sessionStorage.setItem('show_as_presentation', false); + } + else + check_as_presentation = JSON.parse(check_as_presentation); + + console.log("show_as_presentation: ", check_as_presentation); + + $('#check_as_presentation').prop('checked', check_as_presentation); + console.log($('#check_as_presentation').prop('checked')) + + $('#check_as_presentation').change(function() { + console.log('change'); + console.log($('#check_as_presentation').prop('checked')); + sessionStorage.setItem('show_as_presentation', $('#check_as_presentation').prop('checked')); + location.reload(); + }); mixin navigation_auto(gliederung, current) ol.breadcrumb(onclick="show_all_slides();", style="margin-top: .5rem; border-radius: 0;") diff --git a/views/nt/ev/mk_old/layout.pug b/views/nt/ev/mk_old/layout.pug index 8795780..199460a 100644 --- a/views/nt/ev/mk_old/layout.pug +++ b/views/nt/ev/mk_old/layout.pug @@ -1,3 +1,5 @@ +include ../../../mixins_cookies + doctype html html(lang='de') head @@ -11,6 +13,8 @@ html(lang='de') script(src='/javascripts/jquery.min.js') script(src='/javascripts/slide-utils.js') script(src='/javascripts/popper.min.js') + + +cookies_css body block headline @@ -23,10 +27,11 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); - + else + show_all_slides(); + + +cookies_html + +cookies_script diff --git a/views/sbr_ue/layout.pug b/views/sbr_ue/layout.pug index ac9649f..70e14ae 100644 --- a/views/sbr_ue/layout.pug +++ b/views/sbr_ue/layout.pug @@ -24,10 +24,9 @@ html(lang='de') script(src='/javascripts/bootstrap.min.js') - if(as_presentation === false) - script. - show_all_slides(); - else - script. + script. + if(JSON.parse(sessionStorage.getItem('show_as_presentation'))) register_presentationkeys(); + else + show_all_slides();