update Mo 10. Feb 20:31:01 CET 2020

server/routing.js

@@ -48,11 +48,11 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
   });
 
   // get /rueckmeldung
-  app.get('/rueckmeldung/:waip_uuid', function(req, res, next) {
+  app.get('/rmld/:waip_uuid', function(req, res, next) {
     var waip_uuid = req.params.waip_uuid;
     sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
       if (einsatzdaten) {
-        res.render('response', {
+        res.render('rmld', {
           title: 'Einsatz-Rückmeldung',
           user: req.user,
           einsatzdaten: einsatzdaten
@@ -142,10 +142,10 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
     });
   });
 
-  // get /show_active_waip
-  app.get('/show_active_waip', auth.ensureAdmin, function(req, res) {
+  // get /adm_show_missions
+  app.get('/adm_show_missions', auth.ensureAdmin, function(req, res) {
     sql.db_get_active_waips(function(data) {
-      res.render('show_active_waip', {
+      res.render('admin/adm_show_missions', {
         title: 'Akutelle Einsätze',
         user: req.user,
         dataSet: data

views/admin/adm_show_missions.pug

@@ -1,4 +1,4 @@
-extends layout
+extends ../layout
 
 block content
   main(role='main')

views/home.pug

@@ -4,6 +4,10 @@ block content
   main(role='main')
     .jumbotron
       .container
+        .d-flex.flex-row
+          .div
+            .text-danger.ion-md-desktop
+          .div
             h1.text-danger.display-4= public.app_name
             h5.text-muted © #{public.company}
             hr

views/includes/footer.pug

@@ -1,5 +1,5 @@
 footer.footer
   .container-fluid
-    .row
-      .col-9.span.text-muted.text-left © #{public.company} - #{new Date().getFullYear()}
-      .col-3.span.text-muted.text-right= public.version
+    .d-flex.justify-content-between
+      .span.text-muted.text-left © #{public.company} - #{new Date().getFullYear()}
+      .span.text-muted.text-right= public.version

views/includes/header.pug

@@ -38,7 +38,7 @@ header
             a.text-nowrap.ion-md-settings.nav-link(href='/config')  Einstellungen                 
           li.nav-item
             form(action='/logout', method='POST')
-              button.btn.btn-outline-warning.text-nowrap.ion-md-log-out(type='submit')=' \''+user.user +'\' abmelden'         
+              button.btn.btn-dark.text-nowrap.ion-md-log-out(type='submit')=' \''+user.user +'\' abmelden'         
         else 
           li.nav-item(class=(title == 'Login') ? 'active' : null)
             a.text-nowrap.nav-link.ion-md-log-in(href='/login')  Anmelden

views/includes/master_rueckmeldung.pug

@@ -1,7 +1,6 @@
 .row.no-gutters
-  .col-6
+  .d-flex.justify-content-between
     p#einsatz_datum.text-muted 01.01.2020 
-  .col-6
     p#einsatz_uhrzeit.text-muted.text-right 11:22:33
   .col-10
     case einsatzdaten.einsatzart

views/rmld.pug

@@ -5,9 +5,9 @@ append head
 
 block content
   include includes/modal_info
-  include includes/modal_response
+  include includes/modal_rmld
   .container-fluid
-    include includes/rueckmeldung
+    include includes/master_rueckmeldung
   script.
     var einsatzdaten_obj = !{JSON.stringify(einsatzdaten).replace(/<\//g, '<\\/')}
   script(src='/js/leaflet.js')