From b873330b141195de615ed901e0a76fd79544f953 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Mon, 3 Feb 2020 18:01:01 +0100 Subject: [PATCH] update Mo 3. Feb 18:01:01 CET 2020 --- server/app_cfg.js | 9 +++++---- views/includes/rueckmeldung.pug | 26 ++++++++++++++++++++------ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/server/app_cfg.js b/server/app_cfg.js index 6d2f45a..172c8a4 100644 --- a/server/app_cfg.js +++ b/server/app_cfg.js @@ -16,13 +16,14 @@ app_cfg.global = { ip_auth_range: ['::ffff:172.16.5.0/24', '::ffff:192.168.2.0/24'], saltRounds: 10, sessionsecret: '0987654321abcdef#xyz', - app_id: process.pid, - map_tile: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' + app_id: process.pid }; -app_cfg.dev = { +app_cfg.public = { app_name: 'Wachalarm IP-Web', - version: '1.2' + version: '1.2', + map_tile: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + map_attribution: '© OpenStreetMap contributors' }; module.exports = app_cfg; diff --git a/views/includes/rueckmeldung.pug b/views/includes/rueckmeldung.pug index 3ecc1a1..f708f22 100755 --- a/views/includes/rueckmeldung.pug +++ b/views/includes/rueckmeldung.pug @@ -17,11 +17,11 @@ li.list-group-item -Orststeil- li.list-group-item -Straße Hsnr- li.list-group-item.text-warning -Besonderheiten- - .col-12.mt-2 - .card.bg-secondary + .col-12 + .card.border-dark.mt-2 .card-header - h5.text-center.text-danger.font-weight-bold Alarmierte Einsatzmittel - .card-body.p-0 + h5.text-info CB FW Cottbus 1 + .card-body.p-1 div.d-flex.flex-wrap.justify-content-between.align-items-center div.flex-fill.rounded.bg-light.p-2.m-1 div.d-flex.justify-content-between @@ -29,20 +29,34 @@ div.p-2.badge.badge-success 2 div.flex-fill.rounded.bg-light.p-2.m-1 div.d-flex.justify-content-between - div.pr-2 FL CB 12/00-00 + div.pr-2 FL CB 01/00-00 div.p-2.badge.badge-warning 3 div.flex-fill.rounded.bg-light.p-2.m-1 div.d-flex.justify-content-between div.pr-2 FL CB T-Dienst div.p-2.badge.badge-danger 4 + .card.bg-secondary.mt-2 + .card-header + h5.text-center CB FW Madlow + .card-body.p-1 + div.d-flex.flex-wrap.justify-content-between.align-items-center div.flex-fill.rounded.bg-light.p-2.m-1 div.d-flex.justify-content-between - div.pr-2 KAT CB 00/00-00 + div.pr-2 FL CB 12/00-00 div.p-2.badge.badge-success 2 div.flex-fill.rounded.bg-light.p-2.m-1 div.d-flex.justify-content-between div.pr-2 FL SPN 00/00-00 div.p-2.badge.badge-info 1 + .card.bg-secondary.mt-2 + .card-header + h5.text-danger CB FW Cottbus 3 + .card-body.p-1 + div.d-flex.flex-wrap.justify-content-between.align-items-center + div.flex-fill.rounded.bg-light.p-2.m-1 + div.d-flex.justify-content-between + div.pr-2 KAT CB 00/00-00 + div.p-2.badge.badge-success 2 //table.table.table-striped tbody tr