From 6172de5f63b4034be8e382bce43716a2a20b832a Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Mon, 17 Feb 2020 21:31:02 +0100 Subject: [PATCH] update Mo 17. Feb 21:31:02 CET 2020 --- views/includes/master_dashboard.pug | 72 +++++++++++++++-------------- views/includes/modal_rmld.pug | 14 +++--- views/waip.pug | 2 +- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/views/includes/master_dashboard.pug b/views/includes/master_dashboard.pug index 168ef7c..0b0c6cc 100755 --- a/views/includes/master_dashboard.pug +++ b/views/includes/master_dashboard.pug @@ -1,34 +1,36 @@ -.row.no-gutters - .col-12.d-flex.justify-content-between - p#einsatz_datum.text-muted 01.01.2020 - p#einsatz_uhrzeit.text-muted.text-right 11:22:33 - .col-10 - .align-items-center.font-weight-bold.rounded.bg-light.p-3.mr-2 - .ion-md-apps -Stichwort- - .col-2 - .align-items-center.justify-content-center.rounded.bg-light.text-info.p-3 - .ion-md-apps.text-center - .col-12 - div.border-top.m-3 - .card.mt-2 - .card-body.p-0 - #map.rounded(style={height: '20em'}) - .card-body.p-0 - ul.list-group.list-group-flush - li.list-group-item -Objekt- - li.list-group-item -Ort- - li.list-group-item -Orststeil- - li.list-group-item -Straße Hsnr- - li.list-group-item.text-warning -Besonderheiten- - .col-12 - div.border-top.m-3 - .card.bg-secondary.mt-2 - .card-header.bg-light.p-2 - h5.text-danger.text-center Alarmierte Einsatzmittel - .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 +.row + .col-4 + .row.no-gutters + .col-12.d-flex.justify-content-between + p#einsatz_datum.text-muted 01.01.2020 + p#einsatz_uhrzeit.text-muted.text-right 11:22:33 + .col-10 + .align-items-center.font-weight-bold.rounded.bg-light.p-3.mr-2 + .ion-md-apps -Stichwort- + .col-2 + .align-items-center.justify-content-center.rounded.bg-light.text-info.p-3 + .ion-md-apps.text-center + .col-12 + div.border-top.m-3 + .card.mt-2 + .card-body.p-0 + #map.rounded(style={height: '20em'}) + .card-body.p-0 + ul.list-group.list-group-flush + li.list-group-item -Objekt- + li.list-group-item -Ort- + li.list-group-item -Orststeil- + li.list-group-item -Straße Hsnr- + li.list-group-item.text-warning -Besonderheiten- + .col-12 + div.border-top.m-3 + .card.bg-secondary.mt-2 + .card-header.bg-light.p-2 + h5.text-danger.text-center Alarmierte Einsatzmittel + .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 //.col-12 div.border-top.my-3 @@ -96,6 +98,8 @@ div.d-flex.justify-content-between.align-items-center div FL SPN 00/00-00 div.badge.badge-info 1 - .col-12 - div.border-top.m-3 - button#rueckmeldung.btn.btn-danger.btn-lg.btn-block.ion-md-paper-plane(type='button') Rückmeldung senden + .col-8 + .row.no-gutters + .col-12 + div.border-top.m-3 + button#rueckmeldung.btn.btn-danger.btn-lg.btn-block.ion-md-paper-plane(type='button') Rückmeldung senden diff --git a/views/includes/modal_rmld.pug b/views/includes/modal_rmld.pug index 92bc243..7bd3981 100644 --- a/views/includes/modal_rmld.pug +++ b/views/includes/modal_rmld.pug @@ -1,12 +1,12 @@ // Modal -- if (!einsatzdaten) { -- var einsatzdaten = {}; -- einsatzdaten.uuid = '0'; -- einsatzdaten.wachen = {}; -- einsatzdaten.wachen.waip_wachen_ID = 0; -- einsatzdaten.wachen.wachenname = ''; -- } +// if (!einsatzdaten) { +// var einsatzdaten = {}; +// einsatzdaten.uuid = '0'; +// einsatzdaten.wachen = {}; +// einsatzdaten.wachen.waip_wachen_ID = 0; +// einsatzdaten.wachen.wachenname = ''; +// } #responseModal.modal.fade(tabindex='-1', role='dialog', aria-hidden='true') .modal-dialog.modal-dialog-centered(role='document') diff --git a/views/waip.pug b/views/waip.pug index 4e78eae..396ae39 100644 --- a/views/waip.pug +++ b/views/waip.pug @@ -5,7 +5,7 @@ append head block content include includes/modal_info - include includes/modal_rmld + //include includes/modal_rmld .container-fluid #waipclock.d-none include includes/master_clock