mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Richter 2020-02-09 08:31:01 +01:00
parent 8f858909bb
commit 9697ccbae5
10 changed files with 1950 additions and 1937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/ionicons.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
public/fonts/ionicons.eot
View File

Binary file not shown.

3854
public/fonts/ionicons.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 305 KiB

After

Width:  |  Height:  |  Size: 305 KiB

BIN
public/fonts/ionicons.ttf
View File

Binary file not shown.

BIN
public/fonts/ionicons.woff
View File

Binary file not shown.

1
server/app_cfg.js
View File

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

2
server/routing.js
View File

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

6
views/error.pug
View File

@ -9,6 +9,6 @@ block content
h1.display-1.font-weight-bold= error.status h1.display-1.font-weight-bold= error.status
hr.my-4 hr.my-4
.lead .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

4
views/includes/footer.pug
View File

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

16
views/includes/header.pug
View File

@ -1,17 +1,27 @@
header header
// Fixed navbar // Fixed navbar
nav.navbar.navbar-expand-md.navbar-dark.bg-primary.fixed-top 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') 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 span.navbar-toggler-icon
#navbarCollapse.collapse.navbar-collapse #navbarCollapse.collapse.navbar-collapse
ul.navbar-nav.mr-auto ul.navbar-nav.mr-auto
li.nav-item(class=(title == 'Startseite') ? 'active' : null) 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) li.nav-item(class=(title == 'Alarmmonitor') ? 'active' : null)
a.nav-link.ion-md-desktop(href='/waip') Alarmmonitor 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) 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 ul.navbar-nav.ml-auto
if user if user
if user.permissions == 'admin' if user.permissions == 'admin'