Auto-Gliederung; Vereinfachungen; Lk-Umstellung

Die Mixins für die Auto-Gliederung wurden teils korrigiert, ferner gab 
es Vereinfachungen (so dass alles in layout.pug kann, was headline und 
bottom anbelangt); ferner das Lukas-Evangelium entsprechend umgestellt 
(auch als Testfall).
This commit is contained in:
2020-04-19 11:35:46 +02:00
parent c177813a25
commit c9477ac959
20 changed files with 236 additions and 383 deletions

View File

@@ -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: "<q>Weihnachten</q>",
subs: []
},
{
id : "antritt",
name: "Die Antrittspredigt Jesu",
subs: []
},
{
id : "fischfang",
name: "Reicher Fischfang/<q>Berufung</q> des Petrus",
subs: []
},
{
id : "feldrede",
name: "Die Rede am Fuß des Berges (<q>Feldrede</q>)",
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;

View File

@@ -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));
});