update So 9. Feb 08:31:01 CET 2020

server/app_cfg.js

@@ -21,6 +21,7 @@ app_cfg.global = {
 
 app_cfg.public = {
 	app_name: 'Wachalarm IP-Web',
+	company: 'Leitstelle Lausitz',
 	version: '1.2',
 	map_tile: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
 	map_attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'

server/routing.js

@@ -9,6 +9,7 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
         sql.db_list_kreis(function(data) {
           var data_kreis = data
           res.render('home', {
+            public: app_cfg.public,
             title: 'Startseite',
             list_wache: data_wachen,
             list_traeger: data_traeger,
@@ -252,6 +253,7 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
     // render the error page
     res.status(err.status || 500);
     res.render('error', {
+      public: app_cfg.public,
       user: req.user
     });
   });

views/error.pug

@@ -9,6 +9,6 @@ block content
             h1.display-1.font-weight-bold= error.status
             hr.my-4
             .lead
-              h3 Es ist ein Fehler aufgetreten
+              h3.text-muted Es ist ein Fehler aufgetreten
-              p.text-muted= message
+              p.text-danger= message
-            .display-1.ion-ios-bug-outline
+            .display-4.text-muted.ion-ios-bug

views/includes/footer.pug

@@ -1,5 +1,5 @@
 footer.footer
   .container-fluid
     .row
-      .col-8.span.text-muted.text-left © Leitstelle Lausitz - #{new Date().getFullYear()}
+      .col.span.text-muted.text-left © #{public.company} - #{new Date().getFullYear()}
-      .col-4.span.text-muted.text-right Version 1.x
+      .col.span.text-muted.text-right= public.version

views/includes/header.pug

@@ -1,17 +1,27 @@
 header
   // Fixed navbar
   nav.navbar.navbar-expand-md.navbar-dark.bg-primary.fixed-top
-    a.navbar-brand(href='/') Wachalarm
+    a.navbar-brand(href='/')= public.app_name
     button.navbar-toggler(type='button', data-toggle='collapse', data-target='#navbarCollapse', aria-controls='navbarColor01', aria-expanded='false', aria-label='Toggle navigation')
       span.navbar-toggler-icon
     #navbarCollapse.collapse.navbar-collapse
       ul.navbar-nav.mr-auto
         li.nav-item(class=(title == 'Startseite') ? 'active' : null)
-          a.nav-link.ion-md-home(href='/')  Start
+          a.nav-link.ion-md-home(href='/')  Startseite
         li.nav-item(class=(title == 'Alarmmonitor') ? 'active' : null)
           a.nav-link.ion-md-desktop(href='/waip')  Alarmmonitor
+        a#navbarDropdown.nav-link.dropdown-toggle(href='#', role='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false')
+          | Weiteres
+        .dropdown-menu(aria-labelledby='navbarDropdown')
+          a.dropdown-item.ion-md-contacts(href='/edit_users')  Benutzer und Rechte verwalten
+          .dropdown-divider
+          a.dropdown-item(href='/show_active_user') Verbundene PCs/Benutzer
+          a.dropdown-item(href='/show_active_waip') laufende Einsätze  
+          .dropdown-divider
+          a.dropdown-item.text-danger.ion-md-warning(href='/test_alert')  Test-Alarm 
+          a.dropdown-item.ion-md-document(href='/show_log')  Log-Datei        
         li.nav-item(class=(title == 'Hilfe') ? 'active' : null)
-          a.nav-link.ion-md-help-buoy(href='/help')  Hilfe        
+          a.nav-link.ion-md-help-buoy(href='/help')  Weiteres    
       ul.navbar-nav.ml-auto
         if user
           if user.permissions == 'admin'