diff --git a/misc/hexagon_brb_2km.geojson b/misc/hexagon_brb_2km.geojson old mode 100644 new mode 100755 diff --git a/server/socket.js b/server/socket.js old mode 100644 new mode 100755 diff --git a/views/includes/footer.pug b/views/includes/footer.pug index 2ca6686..77d1a15 100644 --- a/views/includes/footer.pug +++ b/views/includes/footer.pug @@ -1,3 +1,5 @@ footer.footer .container-fluid - span.text-muted © Leitstelle Lausitz - #{new Date().getFullYear()} + .row + .col-8.span.text-muted.text-left © Leitstelle Lausitz - #{new Date().getFullYear()} + .col-4.span.text-muted.text-right Version 1.x diff --git a/views/includes/rueckmeldung.pug b/views/includes/rueckmeldung.pug old mode 100644 new mode 100755 index 61998e8..c1f70c5 --- a/views/includes/rueckmeldung.pug +++ b/views/includes/rueckmeldung.pug @@ -1,46 +1,39 @@ -#waiptableau.fullheight.row.no-gutters - .col-6.h-5.d-flex.align-items-center.py-1.text-dark - button#replay.btn.btn-outline-dark.h-100.py-1.tf_singleline - .ion-md-play-circle - button#volume.btn.btn-outline-dark.h-100.mx-1.tf_singleline - .ion-md-volume-high - #date-time. - .tf_singleline -Datum- - -Uhrzeit- - .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-dark.tf_singleline - #wachenname.ion-md-business=data_wache || ' -Wachenname-' - .col-10.h-15.h-20_ls.pr-3 - #einsatz_art.h-100.w-100.d-flex.align-items-center.font-weight-bold.p-3.rounded.bg-light.tf_singleline - #einsatz_stichwort.ion-md-apps -Stichwort- - .col-2.h-15.h-20_ls.d-flex.align-items-center.justify-content-center.p-3.rounded.bg-light.text-info.tf_singleline - #sondersignal.ion-md-apps - .col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls - #map.h-100.rounded - .col-12.col-7_ls.h-40.h-70_ls - .row.no-gutters.h-100.pt-3 - .col-12.h-10.h-100.w-100 - #rueckmeldung.list-group.list-group-horizontal.text-center.h-100.w-100 - a.list-group-item.flex-fill.list-group-item-action.text-secondary.tf_singleline - .ion-md-paper-plane - .col-6.h-65.d-flex.align-items-end.justify-content-start.tf_multiline - #ortsdaten.flex-fill -Objekt- - br - | -Ort- - br - | -Ortsteil- - br - | -Straße Hsnr- - .col-6.h-65.d-flex.align-items-end.justify-content-end.tf_multiline - ul#em_alarmiert.list-group - li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 1- - li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 2- - li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel n- - // TODO: Status mit anzeigen (als .badge.badge-pill) - .col-12.h-5.d-flex.align-items-end.justify-content-center.text-dark.tf_singleline - #em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n- - .col-12.h-20.d-flex.align-items-center.rounded.bg-light.font-weight-bold.text-info.tf_singleline - #besonderheiten -Besonderheiten- - .col-12.h-5.d-flex.align-items-end.justify-content-center.pt-3 - .progress(style='height: 100%;').flex-fill - #hilfsfrist.progress-bar.progress-bar-striped.progress-bar-animated(role='progressbar', aria-valuenow='0', aria-valuemin='0', aria-valuemax='100', style='width: 0%') - audio#audio(controls='') - source(src='', type='audio/mpeg') +.row.no-gutters + .col-10 + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-light.p-3.mr-1 + #einsatz_stichwort.ion-md-apps -Stichwort- + .col-2 + .align-items-center.justify-content-center.rounded.bg-light.text-info.p-3 + #sondersignal.ion-md-apps.text-center +.row + .col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls + #map.h-100.rounded + .col-12.col-7_ls.h-40.h-70_ls + .row.no-gutters.h-100.pt-3 + .col-12.h-10.h-100.w-100 + #rueckmeldung.list-group.list-group-horizontal.text-center.h-100.w-100 + a.list-group-item.flex-fill.list-group-item-action.text-secondary.tf_singleline + .ion-md-paper-plane + .col-6.h-65.d-flex.align-items-end.justify-content-start.tf_multiline + #ortsdaten.flex-fill -Objekt- + br + | -Ort- + br + | -Ortsteil- + br + | -Straße Hsnr- + .col-6.h-65.d-flex.align-items-end.justify-content-end.tf_multiline + ul#em_alarmiert.list-group + li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 1- + li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 2- + li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel n- + // TODO: Status mit anzeigen (als .badge.badge-pill) + .col-12.h-5.d-flex.align-items-end.justify-content-center.text-dark.tf_singleline + #em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n- + .col-12.h-20.d-flex.align-items-center.rounded.bg-light.font-weight-bold.text-info.tf_singleline + #besonderheiten -Besonderheiten- + .col-12.h-5.d-flex.align-items-end.justify-content-center.pt-3 + .progress(style='height: 100%;').flex-fill + #hilfsfrist.progress-bar.progress-bar-striped.progress-bar-animated(role='progressbar', aria-valuenow='0', aria-valuemin='0', aria-valuemax='100', style='width: 0%') + audio#audio(controls='') + source(src='', type='audio/mpeg') diff --git a/views/test_rueckmeldung.pug b/views/test_rueckmeldung.pug old mode 100644 new mode 100755 index 6facbda..ef92c10 --- a/views/test_rueckmeldung.pug +++ b/views/test_rueckmeldung.pug @@ -1,15 +1,15 @@ -extends layout - -append head - link(rel='stylesheet', href='/css/ionicons.min.css') - link(rel='stylesheet', href='/css/leaflet.css') - // link(rel='stylesheet', href='/css/waip.css') - -block content - //include includes/modal_response - .container-fluid - include includes/rueckmeldung - script(src='/js/leaflet.js') - // script(src='/js/textFit.min.js') - // script(src='/js/waip_client.js') - +extends layout + +append head + link(rel='stylesheet', href='/css/ionicons.min.css') + link(rel='stylesheet', href='/css/leaflet.css') + // link(rel='stylesheet', href='/css/waip.css') + +block content + //include includes/modal_response + .container-fluid + include includes/rueckmeldung + script(src='/js/leaflet.js') + // script(src='/js/textFit.min.js') + // script(src='/js/waip_client.js') +