From 4d6f3742db2a3d0aa62eba5c5fe793af79f4078f Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Sun, 9 Feb 2020 14:31:01 +0100 Subject: [PATCH] update So 9. Feb 14:31:01 CET 2020 --- server/routing.js | 8 ++++---- views/about.pug | 19 +++++++++++++++++++ views/error.pug | 4 ++-- views/help.pug | 34 ---------------------------------- views/includes/header.pug | 8 ++++---- 5 files changed, 29 insertions(+), 44 deletions(-) create mode 100644 views/about.pug delete mode 100644 views/help.pug diff --git a/server/routing.js b/server/routing.js index b3e20cb..4c4f5b9 100644 --- a/server/routing.js +++ b/server/routing.js @@ -96,11 +96,11 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) { }); }); - // get /help - app.get('/help', function(req, res) { - res.render('help', { + // get /about + app.get('/about', function(req, res) { + res.render('about', { public: app_cfg.public, - title: 'Hilfe', + title: 'Über', user: req.user }); }); diff --git a/views/about.pug b/views/about.pug new file mode 100644 index 0000000..c813982 --- /dev/null +++ b/views/about.pug @@ -0,0 +1,19 @@ +extends layout + +block content + main(role='main') + .container + .row + .col + .jumbotron.text-center + h1.display-1.text-danger.font-weight-bold.d-none.d-lg-block= public.app_name + h1.text-danger.font-weight-bold.d-lg-none= public.app_name + hr.my-4 + .lead + h4.text-info Entwickelt von Robert Richter + p Alle Rechte vorbehalten + br + p.text-muted + | mehr Informationen unter + a(href="https://github.com/Robert-112/Wachalarm-IP-Web") https://github.com/Robert-112/Wachalarm-IP-Web + .display-4.text-muted.ion-logo-github \ No newline at end of file diff --git a/views/error.pug b/views/error.pug index d5375f1..c5d913d 100644 --- a/views/error.pug +++ b/views/error.pug @@ -7,8 +7,8 @@ block content .col .jumbotron.text-center h1.display-1.font-weight-bold= error.status + p.text-muted Es ist ein Fehler aufgetreten hr.my-4 .lead - h3.text-muted Es ist ein Fehler aufgetreten - p.text-danger= message + h4.text-danger= message .display-4.text-muted.ion-ios-bug diff --git a/views/help.pug b/views/help.pug deleted file mode 100644 index 1f567a5..0000000 --- a/views/help.pug +++ /dev/null @@ -1,34 +0,0 @@ -extends layout - -block content - main(role='main') - .container - .row - .col - .jumbotron.text-center - h1.display-1.font-weight-bold= title - hr.my-4 - .lead - h3.text-muted= public.app_name - p Entwickelt von Robert Richter - p Alle Rechte vorbehalten - br - p - | mehr Informationen unter - a(href="https://github.com/Robert-112/Wachalarm-IP-Web") https://github.com/Robert-112/Wachalarm-IP-Web - .display-4.text-muted.ion-md-github - //extends layout - //block content - main(role='main') - .container.h-100 - .row.justify-content-center.h-100.d-flex - .col-md-8 - .card.text-center - h1.card-header Wachalarm-IP-Web - .card-body - p Entwickelt von Robert Richter - p Alle Rechte vorbehalten - br - p - | mehr Informationen unter - a(href="https://github.com/Robert-112/Wachalarm-IP-Web") https://github.com/Robert-112/Wachalarm-IP-Web diff --git a/views/includes/header.pug b/views/includes/header.pug index 057105c..0009010 100644 --- a/views/includes/header.pug +++ b/views/includes/header.pug @@ -20,7 +20,7 @@ header a.text-nowrap.dropdown-item(href='/impressum')  Impressum a.text-nowrap.dropdown-item(href='/datenschutz')  Datenschutzerkläung .dropdown-divider - a.text-nowrap.dropdown-item(href='/help')  Hilfe + a.text-nowrap.dropdown-item(href='/about')  Über diese Anwendung if user if user.permissions == 'admin' li.text-nowrap.nav-item.dropdown @@ -29,11 +29,11 @@ header .dropdown-menu(aria-labelledby='navbarAdminDropdown') a.text-nowrap.dropdown-item.ion-md-contacts(href='/edit_users')  Benutzer und Rechte verwalten .dropdown-divider - a.text-nowrap.dropdown-item(href='/show_active_user')  Verbundene PCs und Benutzer anzeigen - a.text-nowrap.dropdown-item(href='/show_active_waip')  laufende Einsätze anzeigen + a.text-nowrap.dropdown-item.ion-md-globe(href='/show_active_user')  Verbundene PCs und Benutzer anzeigen + a.text-nowrap.dropdown-item.ion-md-paper(href='/show_active_waip')  laufende Einsätze anzeigen .dropdown-divider a.text-nowrap.dropdown-item.text-danger.ion-md-warning(href='/test_alert')  Test-Alarm versenden - a.text-nowrap.dropdown-item.ion-md-document(href='/show_log')  Log-Datei einsehen + a.text-nowrap.dropdown-item.ion-md-book(href='/show_log')  Log-Datei einsehen li.nav-item.pr-3(class=(title == 'Einstellungen') ? 'active' : null) a.text-nowrap.ion-md-settings.nav-link(href='/config')  Einstellungen li.nav-item