From c9477ac959a03eff6c0f8b0ff9f1fe7fb829a089 Mon Sep 17 00:00:00 2001 From: Peter Fischer Date: Sun, 19 Apr 2020 11:35:46 +0200 Subject: [PATCH] =?UTF-8?q?Auto-Gliederung;=20Vereinfachungen;=20Lk-Umstel?= =?UTF-8?q?lung=20Die=20Mixins=20f=C3=BCr=20die=20Auto-Gliederung=20wurden?= =?UTF-8?q?=20teils=20korrigiert,=20ferner=20gab=20es=20Vereinfachungen=20?= =?UTF-8?q?(so=20dass=20alles=20in=20layout.pug=20kann,=20was=20headline?= =?UTF-8?q?=20und=20bottom=20anbelangt);=20ferner=20das=20Lukas-Evangelium?= =?UTF-8?q?=20entsprechend=20umgestellt=20(auch=20als=20Testfall).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/nt/ev/lk.js | 147 +++++++++++++++++- routes/nt/ev/mk.js | 1 + views/mixins_headline_nav.pug | 116 ++++++++------ views/nt/ev/lk/adv_weihn_jkr3-7/antritt.pug | 17 -- views/nt/ev/lk/adv_weihn_jkr3-7/feldrede.pug | 16 -- views/nt/ev/lk/adv_weihn_jkr3-7/fischfang.pug | 16 -- .../nt/ev/lk/adv_weihn_jkr3-7/gliederung.pug | 16 -- views/nt/ev/lk/adv_weihn_jkr3-7/index.pug | 16 -- views/nt/ev/lk/adv_weihn_jkr3-7/johdt.pug | 16 -- .../nt/ev/lk/adv_weihn_jkr3-7/weihnachten.pug | 19 --- views/nt/ev/lk/einfuehrung/aufbau.pug | 18 --- views/nt/ev/lk/einfuehrung/prolog.pug | 17 +- views/nt/ev/lk/einfuehrung/quellen.pug | 16 -- views/nt/ev/lk/einfuehrung/verfasser.pug | 17 +- views/nt/ev/lk/fz_oz_jkr12-17/gliederung.pug | 17 -- views/nt/ev/lk/fz_oz_jkr12-17/index.pug | 17 -- views/nt/ev/lk/index.pug | 8 - views/nt/ev/lk/jkr18-34/index.pug | 17 -- views/nt/ev/lk/layout.pug | 11 ++ views/nt/ev/lk/mixins.pug | 101 +----------- 20 files changed, 236 insertions(+), 383 deletions(-) diff --git a/routes/nt/ev/lk.js b/routes/nt/ev/lk.js index be3d5d2..3b5d93a 100644 --- a/routes/nt/ev/lk.js +++ b/routes/nt/ev/lk.js @@ -3,6 +3,110 @@ var router = express.Router(); var pathoffset = 'nt/ev/lk/'; + +var _gliederung = + [ + { + id : "einfuehrung", + name: "Einführung", + subs: [ + { + id : "verfasser", + name: "Verfasser", + subs: [] + }, + { + id : "quellen", + name: "Quellen", + subs: [] + }, + { + id : "prolog", + name: "Der Verfasser über sein Werk", + subs: [] + }, + { + id : "aufbau", + name: "Aufbau", + subs: [] + } + ] + }, + { + id : "adv_weihn_jkr3-7", + name: "Advent, Weihnachten, Jahreskreis 3 – 7", + subs: [ + { + id : "index", + name: "Überblick", + subs: [] + }, + { + id : "gliederung", + name: "Gliederung", + subs: [] + }, + { + id : "johdt", + name: "Johannes der Täufer", + subs: [] + }, + { + id : "weihnachten", + name: "Weihnachten", + subs: [] + }, + { + id : "antritt", + name: "Die Antrittspredigt Jesu", + subs: [] + }, + { + id : "fischfang", + name: "Reicher Fischfang/Berufung des Petrus", + subs: [] + }, + { + id : "feldrede", + name: "Die Rede am Fuß des Berges (Feldrede)", + subs: [] + } + ] + }, + { + id : "fz_oz_jkr12-17", + name: "Fastenzeit, Osterzeit, Jahreskreis 12 – 17", + subs: [ + { + id : "index", + name: "Überblick", + subs: [] + }, + { + id : "gliederung", + name: "Gliederung", + subs: [] + } + ] + }, + { + id : "jkr18-34", + name: "Jahreskreis 18 – 34", + subs: [ + { + id : "index", + name: "Überblick", + subs: [] + }/*, + { + id : "literatur", + name: "Ausgewählte Literatur", + subs: [] + }*/ + ] + } + ]; + /* GET home page. */ var _locals = { pathoffset : "/nt/ev/lk" }; @@ -17,6 +121,47 @@ function get_locals(req) { } router.get('/', function(req, res, next) { + var params = get_locals(req); + params.gliederung = _gliederung; + params.current = []; + res.render(pathoffset+'index', get_locals(req)); +}); + +router.get('/:layer1', function(req, res, next) { + var layer1 = _gliederung.find(elem => elem.id === req.params.layer1); + console.log(layer1); + + if(layer1.subs.length === 0) + console.log('ERROR layer1.subs.length === 0'); + var index = layer1.subs[0]; + + var params = get_locals(req); + params.gliederung = _gliederung; + params.current = []; + params.current.push(layer1); + params.current.push(index); + console.log(params); + res.render(pathoffset + req.params.layer1+"/"+index.id, params); +}); + +router.get('/:layer1/:layer2', function(req, res, next) { + var layer1 = _gliederung.find(elem => elem.id === req.params.layer1); + console.log(layer1); + + var layer2 = layer1.subs.find(elem => elem.id === req.params.layer2); + console.log(layer2); + + var params = get_locals(req); + params.gliederung = _gliederung; + params.current = []; + params.current.push(layer1); + params.current.push(layer2); + console.log(params); + res.render(pathoffset + req.params.layer1+"/"+layer2.id, params); +}); + + +/*router.get('/', function(req, res, next) { res.render(pathoffset+'index', get_locals(req)); }); @@ -47,7 +192,7 @@ router.get('/jkr18-34', function(req,res,next) { router.get('/fz_oz_jkr12-17/:target', function(req,res,next) { res.render(pathoffset+'jkr18-34/' + req.params.target, get_locals(req)); }); - +*/ module.exports = router; diff --git a/routes/nt/ev/mk.js b/routes/nt/ev/mk.js index b35eaff..e192973 100644 --- a/routes/nt/ev/mk.js +++ b/routes/nt/ev/mk.js @@ -110,6 +110,7 @@ function get_locals(req) { router.get('/', function(req, res, next) { var params = get_locals(req); params.gliederung = _gliederung; + params.current = []; res.render(pathoffset+'index', get_locals(req)); }); diff --git a/views/mixins_headline_nav.pug b/views/mixins_headline_nav.pug index 4698800..b50f00d 100644 --- a/views/mixins_headline_nav.pug +++ b/views/mixins_headline_nav.pug @@ -63,58 +63,84 @@ mixin headline_template(title) mixin navigation_auto_template(gliederung, current, bgcolor) ol.breadcrumb(onclick="show_all_slides();", style="margin-top: .5rem; border-radius: 0;") - li.breadcrumb-item - a(href=pathoffset+"/") Start - - var nr_items = current.length; - - var cnt = 0; - - var subs = gliederung; - - var fullpath = pathoffset; - - var old_fullpath; - each item in current - - cnt = cnt+1; - - old_fullpath = fullpath; - - fullpath = fullpath + "/" + item.id; - if(cnt != nr_items) - li.breadcrumb-item - a(href=fullpath) !{item.name} - if(subs.length > 1) - each sub in subs - if(sub.id != item.id) - div #{sub.name} - else - li.breadcrumb-item - .h3(style="margin-bottom: 0px; color: "+bgcolor+"; width: 100%;") !{item.name}  - if(subs.length > 1) - span.small.dropdown - a.dropdown-toggle(data-toggle="dropdown", href="#", style="margin-bottom: 0px; color: "+bgcolor+"; width: 100%;") - .dropdown-menu - each sub in subs - a.dropdown-item(href=old_fullpath + "/" + sub.id) - if(sub.id === item.id) - b !{sub.name} - else - span !{sub.name} - - - subs = item.subs; + if(current.length === 0) + .h3(style="margin-bottom: 0px; color: #0e4f88; width: 100%;") Start  + span.small.dropdown + a.dropdown-toggle(data-toggle="dropdown", href="#", style="margin-bottom: 0px; color: #0e4f88; width: 100%;") + .dropdown-menu + a.dropdown-item(href="#") + b Start + each sub in gliederung + a.dropdown-item(href=pathoffset + "/" + sub.id) !{sub.name} + else + li.breadcrumb-item + a(href=pathoffset+"/") Start + - var nr_items = current.length; + - var cnt = 0; + - var subs = gliederung; + - var fullpath = pathoffset; + - var old_fullpath; + each item in current + - cnt = cnt+1; + - old_fullpath = fullpath; + - fullpath = fullpath + "/" + item.id; + if(cnt != nr_items) + li.breadcrumb-item + a(href=fullpath) !{item.name}  + if(subs.length > 1) + span.small.dropdown + a.dropdown-toggle(data-toggle="dropdown", href="#", style="margin-bottom: 0px; color: "+bgcolor+"; width: 100%;") + .dropdown-menu + each sub in subs + a.dropdown-item(href=old_fullpath + "/" + sub.id) + if(sub.id === item.id) + b !{sub.name} + else + span !{sub.name} + + else + li.breadcrumb-item + .h3(style="margin-bottom: 0px; color: "+bgcolor+"; width: 100%;") !{item.name}  + if(subs.length > 1) + span.small.dropdown + a.dropdown-toggle(data-toggle="dropdown", href="#", style="margin-bottom: 0px; color: "+bgcolor+"; width: 100%;") + .dropdown-menu + each sub in subs + a.dropdown-item(href=old_fullpath + "/" + sub.id) + if(sub.id === item.id) + b !{sub.name} + else + span !{sub.name} + + - subs = item.subs; mixin bottom_autonav_template(gliederung, current, hrcolor) hr(style="margin-top: 2rem; border-top-width: 7px; border-top-color: "+hrcolor+";") ul.nav.nav-fill.nav-pills(style="padding-left: 1rem; padding-right: 1rem;") - li.nav-item - a.nav-link(href=pathoffset+"/") Start - var nr_items = current.length; - - var fullpath = pathoffset; - - each item in gliederung - - var my_fullpath = fullpath + "/" + item.id; - - if(item.id === current[0].id) - li.nav-item - a.nav-link.active !{item.name} - else + if(nr_items === 0) + li.nav-item + a.nav-link.active(href="#") Start + each item in gliederung + - var my_fullpath = pathoffset + "/" + item.id; + li.nav-item a.nav-link(href=my_fullpath) !{item.name} - + + else + li.nav-item + a.nav-link(href=pathoffset+"/") Start + - var fullpath = pathoffset; + each item in gliederung + - var my_fullpath = fullpath + "/" + item.id; + + if(item.id === current[0].id) + li.nav-item + a.nav-link.active !{item.name} + else + li.nav-item + a.nav-link(href=my_fullpath) !{item.name} + if(nr_items > 1) hr(style="border-top-width: 5px; border-top-color: "+hrcolor+";") .small(style="margin-top: 3px;") diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/antritt.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/antritt.pug index bb87687..78247f1 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/antritt.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/antritt.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span Die Antrittspredigt Jesu - block content .card.slide.mb-3 @@ -484,13 +477,3 @@ block content | Jesu Botschaft und er selbst werden (trotzdem) von den meisten Juden auch nach Ostern abgelehnt; br | dafür stoßen Heiden in relativ großer Zahl zur Gemeinschaft der Glaubenden dazu. - -block bottomnav - +bottom_adv_weihn_jkr3-7("antritt") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/feldrede.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/feldrede.pug index 06cdb8d..58494de 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/feldrede.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/feldrede.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span Die Rede am Fuß des Berges (Feldrede) - block content .slide @@ -1029,12 +1022,3 @@ block content | aber auch die Sorge für und um Menschen, die selber gar nichts oder wenig geben können: Menschen mit körperlichen und | geistigen Einschränkungen, alte Menschen, Arme etc. -block bottomnav - +bottom_adv_weihn_jkr3-7("feldrede") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/fischfang.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/fischfang.pug index e8f9abe..35a3159 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/fischfang.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/fischfang.pug @@ -1,12 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span Reicher Fischfang/Berufung des Petrus block content @@ -408,13 +402,3 @@ block content p.mb-0 | Grundlegend bleibt aber, dass Jesus nicht einzelne unverbunden berufen hat, sondern von Anfang an | auf eine Gemeinschaft abgezielt hat, die durch die Verkündigung des Wortes Gottes und seine gläubige Aufnahme entsteht. - -block bottomnav - +bottom_adv_weihn_jkr3-7("fischfang") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/gliederung.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/gliederung.pug index 211015e..0b5d117 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/gliederung.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/gliederung.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span Gliederung - block content .card.slide.bg-light.border-warning(style="border-width: .25rem") @@ -344,12 +337,3 @@ block content | ... -block bottomnav - +bottom_adv_weihn_jkr3-7("gliederung") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/index.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/index.pug index 3888664..e83ff1d 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/index.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/index.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span Überblick - block content blockquote.blockquote.mb-5 p.mb-0 @@ -51,12 +44,3 @@ block content +ueberblick_tag("6. Sonntag im Jahreskreis", "17.02.19", "Lk 6,17.20-26", "Feldrede: Seligpreisungen und Wehklagen") +ueberblick_tag("7. Sonntag im Jahreskreis", "24.02.19", "Lk 6,27-38", "Feldrede: Feindesliebe etc.") -block bottomnav - +bottom_adv_weihn_jkr3-7("ueberblick") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/johdt.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/johdt.pug index c83bc0b..f2e0b85 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/johdt.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/johdt.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span Johannes der Täufer - block content .row .col-6.pr-5 @@ -627,12 +620,3 @@ block content br | Der Rückgriff auf die Ps 2,7 und Jes 42,1 erkennt darin die Erfüllung messianischer Verheißung. -block bottomnav - +bottom_adv_weihn_jkr3-7("johdt") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/adv_weihn_jkr3-7/weihnachten.pug b/views/nt/ev/lk/adv_weihn_jkr3-7/weihnachten.pug index 10ee7ae..574fca3 100644 --- a/views/nt/ev/lk/adv_weihn_jkr3-7/weihnachten.pug +++ b/views/nt/ev/lk/adv_weihn_jkr3-7/weihnachten.pug @@ -1,14 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_adv_weihn_jkr3-7 - +headline_item_active - span - q Weihnachten - block content .card.slide.mb-3 @@ -413,14 +405,3 @@ block content | Und doch ist das, was sie erlebt haben, nur eine erste Erfüllung; dass und wie Jesus der Retter ist, | das muss erst noch erzählt werden. p.mb-0 So lädt diese Notiz auch zum Weiterlesen ein. - - -block bottomnav - +bottom_adv_weihn_jkr3-7("weihnachten") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/einfuehrung/aufbau.pug b/views/nt/ev/lk/einfuehrung/aufbau.pug index ca7c1e9..4273b7d 100644 --- a/views/nt/ev/lk/einfuehrung/aufbau.pug +++ b/views/nt/ev/lk/einfuehrung/aufbau.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_einfuehrung - +headline_item_active - span Aufbau - block content .card.slide.bg-light.border-info @@ -51,14 +44,3 @@ block content | Lk 24,1-53 p.card-text.mb-0 | Auferweckung, Erscheinungen und Himmelfahrt jesu - - -block bottomnav - +bottom_einfuehrung("aufbau") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/einfuehrung/prolog.pug b/views/nt/ev/lk/einfuehrung/prolog.pug index 16cc7ed..d13b4b1 100644 --- a/views/nt/ev/lk/einfuehrung/prolog.pug +++ b/views/nt/ev/lk/einfuehrung/prolog.pug @@ -1,13 +1,7 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_einfuehrung - +headline_item_active - span Der Verfasser über sein Werk - + block content p | Als einziger der vier Evangelisten eröffnet Lukas sein Werk mit einem Prolog, wie man ihn von @@ -131,12 +125,3 @@ block content li | Wie akribisch beschäftige ich mit meiner eigenen, persönlichen Glaubensgeschichte? Warum ich was glaube? oder was ich warum nicht glaube? -block bottomnav - +bottom_einfuehrung("prolog") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/einfuehrung/quellen.pug b/views/nt/ev/lk/einfuehrung/quellen.pug index a88754f..b90dfc4 100644 --- a/views/nt/ev/lk/einfuehrung/quellen.pug +++ b/views/nt/ev/lk/einfuehrung/quellen.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_einfuehrung - +headline_item_active - span Quellen - block content p | Gemäß der sog. @@ -105,12 +98,3 @@ block content | andererseits verbessert er den sprachlichen Stil. -block bottomnav - +bottom_einfuehrung("quellen") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/einfuehrung/verfasser.pug b/views/nt/ev/lk/einfuehrung/verfasser.pug index 2355567..59a369e 100644 --- a/views/nt/ev/lk/einfuehrung/verfasser.pug +++ b/views/nt/ev/lk/einfuehrung/verfasser.pug @@ -1,13 +1,7 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_einfuehrung - +headline_item_active - span Verfasser - + block content p | Der wirkliche Name des Verfassers ist unbekannt. @@ -43,12 +37,3 @@ block content p | Vom gleichen Autor stammt auch die Apostelgeschichte, wie die beiden Vorworte sowie Sprache, Stil und Theologie verraten. -block bottomnav - +bottom_einfuehrung("verfasser") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/fz_oz_jkr12-17/gliederung.pug b/views/nt/ev/lk/fz_oz_jkr12-17/gliederung.pug index e38e5b9..d2974de 100644 --- a/views/nt/ev/lk/fz_oz_jkr12-17/gliederung.pug +++ b/views/nt/ev/lk/fz_oz_jkr12-17/gliederung.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_fz_oz_jkr12-17 - +headline_item_active - span Gliederung - block content .card.slide.mt-3.bg-light.border-info @@ -264,13 +257,3 @@ block content +symbol("arrow-right") | Christi Himmelfahrt [24,46-54] - -block bottomnav - +bottom_fz_oz_jkr12-17("gliederung") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/fz_oz_jkr12-17/index.pug b/views/nt/ev/lk/fz_oz_jkr12-17/index.pug index c6e3149..ce069d2 100644 --- a/views/nt/ev/lk/fz_oz_jkr12-17/index.pug +++ b/views/nt/ev/lk/fz_oz_jkr12-17/index.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_fz_oz_jkr12-17 - +headline_item_active - span Überblick - block content blockquote.blockquote.mb-5 p.mb-0 @@ -38,13 +31,3 @@ block content +ueberblick_tag("15. Sonntag im Jahreskreis", "14.07.19", "Lk 10,25-37", "Wichtigstes Gebot I: Barmherziger Samariter") +ueberblick_tag("16. Sonntag im Jahreskreis", "21.07.19", "Lk 10,38-42", "Wichtigstes Gebot II: Jesus bei Marta und Maria") +ueberblick_tag("17. Sonntag im Jahreskreis", "28.07.19", "Lk 11,1-13", "Wichtigstes Gebot III: Herrengebet") - -block bottomnav - +bottom_fz_oz_jkr12-17("ueberblick") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/index.pug b/views/nt/ev/lk/index.pug index 5c04a13..e2d4bac 100644 --- a/views/nt/ev/lk/index.pug +++ b/views/nt/ev/lk/index.pug @@ -1,11 +1,6 @@ extends layout include mixins -block headline - +headline - +headline_item_active - span Start - block content p | Das Evangelium nach Lukas ist ein Werk der dritten christlichen Generation. @@ -17,6 +12,3 @@ block content | Besonders das | soziale Zusammenleben und der Umgang mit den Sündern werden im Licht der | Barmherzigkeit Gottes beleuchtet. - -block bottomnav - +bottom_nav("start") diff --git a/views/nt/ev/lk/jkr18-34/index.pug b/views/nt/ev/lk/jkr18-34/index.pug index d0a0354..c042f8c 100644 --- a/views/nt/ev/lk/jkr18-34/index.pug +++ b/views/nt/ev/lk/jkr18-34/index.pug @@ -1,13 +1,6 @@ extends ../layout include ../mixins -block headline - +headline - +headline_item_start - +headline_item_jkr18-34 - +headline_item_active - span Überblick - block content blockquote.blockquote.mb-5 p.mb-0 @@ -40,13 +33,3 @@ block content +ueberblick_tag("32. Sonntag im Jahreskreis", "10.11.19", "Lk 20,27-38", "Frage nach der Auferstehung der Toten") +ueberblick_tag("33. Sonntag im Jahreskreis", "17.11.19", "Lk 21,5-19", "Von falschen Zeichen für das Ende der Welt; Mahnung zum Standhaftbleiben") +ueberblick_tag("34. Sonntag im Jahreskreis
Christkönig", "24.11.19", "Lk 23,35-43", "Heute noch wirst du mit mir im Paradies sein") - -block bottomnav - +bottom_jkr18-34("ueberblick") - - script. - push_slide_stack('.slide') - - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }) diff --git a/views/nt/ev/lk/layout.pug b/views/nt/ev/lk/layout.pug index 1bc168f..89f1e81 100644 --- a/views/nt/ev/lk/layout.pug +++ b/views/nt/ev/lk/layout.pug @@ -18,16 +18,27 @@ html(lang='de') +cookies_css body + +headline block headline + +navigation_auto(gliederung, current) .container-fluid block content + +bottom_autonav(gliederung, current) block bottomnav div(style="height: 20px;") script(src='/javascripts/bootstrap.min.js') + + script. + push_slide_stack('.slide') + + $(function () { + $('[data-toggle="tooltip"]').tooltip() + }) + +body_presentation_script diff --git a/views/nt/ev/lk/mixins.pug b/views/nt/ev/lk/mixins.pug index 84b642c..fcc7eb8 100644 --- a/views/nt/ev/lk/mixins.pug +++ b/views/nt/ev/lk/mixins.pug @@ -7,104 +7,13 @@ mixin symbol(s) mixin headline +headline_template("Mit dem Evangelium nach Lukas durch das Kirchenjahr") - ol.breadcrumb(onclick="show_all_slides();", style="margin-top: .5rem; border-radius: 0;") - block -//- mixin headline_item(section) -//- li.breadcrumb-item !{section} +mixin navigation_auto(gliederung, current) + +navigation_auto_template(gliederung, current, "#0e4f88") + +mixin bottom_autonav(gliederung, current) + +bottom_autonav_template(gliederung, current, "#a4d0fd") -mixin headline_item_start - li.breadcrumb-item - a(href=pathoffset+"/") Start - -mixin headline_item_einfuehrung - li.breadcrumb-item - a(href=pathoffset+"/einfuehrung") Einführung - -mixin headline_item_adv_weihn_jkr3-7 - li.breadcrumb-item - a(href=pathoffset+"/adv_weihn_jkr3-7") Advent, Weihnachten, Jahreskreis 3 - 7 - -mixin headline_item_fz_oz_jkr12-17 - li.breadcrumb-item - a(href=pathoffset+"/fz_oz_jkr12-17") Fastenzeit, Osterzeit, Jahreskreis 12 - 17 - -mixin headline_item_jkr18-34 - li.breadcrumb-item - a(href=pathoffset+"/jkr18-34") Jahreskreis 18 - 34 - -mixin headline_item_active - li.breadcrumb-item - .h3(style="margin-bottom: 0px; color: #0e4f88; width: 100%;") - block - -mixin bottom_nav_item(active, short, href, name) - if(active===short) - li.nav-item - a.nav-link.active !{name} - else - li.nav-item - a.nav-link(href=href) !{name} - -mixin bottom_nav(active) - //- hr(style="margin-top: 3rem; border-top-width: 7px; border-radius: 7px 7px 7px 7px; border-top-color: rgba(0, 0, 0, 0.25);") - hr(style="margin-top: 2rem; border-top-width: 7px; border-top-color: #a4d0fd;") - ul.nav.nav-fill.nav-pills(style="padding-left: 1rem; padding-right: 1rem;") - +bottom_nav_item(active, "start", pathoffset+"/", "Start") - +bottom_nav_item(active, "einfuehrung", pathoffset + "/einfuehrung", "Einführung") - +bottom_nav_item(active, "adv_weihn", pathoffset+"/adv_weihn_jkr3-7", "Advent, Weihnachten, Zeit im Jahreskreis 3 - 7") - +bottom_nav_item(active, "fz_oz", pathoffset+"/fz_oz_jkr12-17", "Fastenzeit, Osterzeit, Zeit im Jahreskreis 12 - 17") - +bottom_nav_item(active, "jkr", pathoffset+"/jkr18-34", "Zeit im Jahreskres 18 - 34") - -mixin bottom_subnav(active, short, href, name) - if(active===short) - li.nav-item - a.nav-link.active !{name} - else - li.nav-item - a.nav-link(href=href) !{name} - -mixin bottom_einfuehrung(active) - +bottom_nav("einfuehrung") - hr(style="border-top-width: 5px; border-top-color: #a4d0fd") - .small(style="margin-top: 3px;") - ul.nav.nav-fill.nav-pills.pill-sub-1 - +bottom_subnav(active, "verfasser", pathoffset+"/einfuehrung/verfasser", "Verfasser") - +bottom_subnav(active, "quellen", pathoffset+"/einfuehrung/quellen", "Quellen") - +bottom_subnav(active, "prolog", pathoffset+"/einfuehrung/prolog", "Der Verfasser über sein Werk") - +bottom_subnav(active, "aufbau", pathoffset+"/einfuehrung/aufbau", "Aufbau") - //- +bottom_subnav(active, "themen", pathoffset+"/einfuehrung/themen", "Themen") - -mixin bottom_adv_weihn_jkr3-7(active) - +bottom_nav("adv_weihn") - hr(style="border-top-width: 5px; border-top-color: #a4d0fd") - .small(style="margin-top: 3px;") - ul.nav.nav-fill.nav-pills.pill-sub-1 - +bottom_subnav(active, "ueberblick", pathoffset+"/adv_weihn_jkr3-7/index", "Überblick") - +bottom_subnav(active, "gliederung", pathoffset+"/adv_weihn_jkr3-7/gliederung", "Gliederung") - +bottom_subnav(active, "johdt", pathoffset+"/adv_weihn_jkr3-7/johdt", "Johannes der Täufer") - +bottom_subnav(active, "weihnachten", pathoffset+"/adv_weihn_jkr3-7/weihnachten","Weihnachten") - +bottom_subnav(active, "antritt", pathoffset+"/adv_weihn_jkr3-7/antritt", "Antrittspredigt") - +bottom_subnav(active, "fischfang", pathoffset+"/adv_weihn_jkr3-7/fischfang", "Reicher Fischfang/Berufung des Petrus") - +bottom_subnav(active, "feldrede", pathoffset+"/adv_weihn_jkr3-7/feldrede", "Feldrede") - -mixin bottom_fz_oz_jkr12-17(active) - +bottom_nav("fz_oz") - hr(style="border-top-width: 5px; border-top-color: #a4d0fd") - .small(style="margin-top: 3px;") - ul.nav.nav-fill.nav-pills.pill-sub-1 - +bottom_subnav(active, "ueberblick", pathoffset+"/fz_oz_jkr12-17/index", "Überblick") - +bottom_subnav(active, "gliederung", pathoffset+"/fz_oz_jkr12-17/gliederung", "Gliederung") - -mixin bottom_jkr18-34(active) - +bottom_nav("jkr") - hr(style="border-top-width: 5px; border-top-color: #a4d0fd") - .small(style="margin-top: 3px;") - ul.nav.nav-fill.nav-pills.pill-sub-1 - +bottom_subnav(active, "ueberblick", pathoffset+"/jkr18-34/index", "Überblick") - +bottom_subnav(active, "literatur", pathoffset+"/impulse_literatur/literatur", "Ausgewählte Literatur") - - mixin ueberblick_thead thead tr