From 78c3813ee8f66606dc7f7a56f08b8a00d59dd268 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Tue, 5 May 2020 10:01:01 +0200 Subject: [PATCH] update Di 5. Mai 10:01:01 CEST 2020 --- public/js/client_waip.js | 6 ++++-- views/includes/master_wachalarm.pug | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/public/js/client_waip.js b/public/js/client_waip.js index 84aa5fc..a639a77 100644 --- a/public/js/client_waip.js +++ b/public/js/client_waip.js @@ -115,7 +115,8 @@ function do_on_Inactive() { $(".navbar").fadeOut("slow"); $(".footer").fadeOut("slow"); $(".fullheight").css({ - height: 'calc(100vh - 2rem)' + height: 'calc(100vh - 2rem)', + cursor: 'none' }); $("body").css({ paddingTop: "1rem", @@ -136,7 +137,8 @@ function do_on_Active() { paddingBottom: '0' }); $(".fullheight").css({ - height: 'calc(100vh - 60px - 5rem)' + height: 'calc(100vh - 60px - 5rem)', + cursor: 'auto' }); resize_text(); }; diff --git a/views/includes/master_wachalarm.pug b/views/includes/master_wachalarm.pug index 1540fb0..b038123 100644 --- a/views/includes/master_wachalarm.pug +++ b/views/includes/master_wachalarm.pug @@ -1,14 +1,28 @@ // BUG: Darstellung in Safari-Mobil fehlerhaft (generell Mobil, ggf. extra Darstellung) #waiptableau.fullheight.row.no-gutters + .col-12.h-5.d-flex.py-1.text-muted + button#replay.btn.btn-outline-light.h-100.py-1 + .ion-md-play-circle + button#volume.btn.btn-outline-light.h-100.mx-1 + .ion-md-volume-high + #date-time.align-middle || -Datum- - -Uhrzeit- + .flex-grow-1.bg-warning.text-right + #wachenname.ion-md-business=data_wache || ' -Wachenname-' + //.col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline + // TODO Information in Wachalarm-Bild ob alle Rechte, oder ob reduzierte Version + + + // BUG: Buttons für Sounds werden fehlerhaft dargestellt - .col-6.h-5.d-flex.align-items-center.py-1.text-muted.tf_singleline + //.col-6.h-5.d-flex.align-items-center.py-1.text-muted.tf_singleline button#replay.btn.btn-outline-light.h-100.py-1 .ion-md-play-circle button#volume.btn.btn-outline-light.h-100.mx-1 .ion-md-volume-high #date-time div -Datum- - -Uhrzeit- - .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline + //.col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-muted.tf_singleline + // TODO Information in Wachalarm-Bild ob alle Rechte, oder ob reduzierte Version #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-dark.tf_singleline