From cd15f8f9dd2253206b9c63b2d8535f1eacb8c160 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Sun, 9 Feb 2020 15:01:01 +0100 Subject: [PATCH] update So 9. Feb 15:01:01 CET 2020 --- views/admin/{edit_users.pug => adm_edit_users.pug} | 0 views/admin/{test_alert.pug => adm_run_alert.pug} | 0 .../{show_active_user.pug => adm_show_clients.pug} | 0 views/admin/{show_log.pug => adm_show_log.pug} | 0 .../{show_active_waip.pug => adm_show_missions.pug} | 0 views/imprint.pug | 0 views/includes/header.pug | 10 +++++----- views/includes/{clock.pug => master_clock.pug} | 0 .../{rueckmeldung.pug => master_rueckmeldung.pug} | 0 views/includes/{wachalarm.pug => master_wachalarm.pug} | 0 views/login.pug | 6 +++--- views/privacy.pug | 0 views/user/{config.pug => user_config.pug} | 0 13 files changed, 8 insertions(+), 8 deletions(-) rename views/admin/{edit_users.pug => adm_edit_users.pug} (100%) rename views/admin/{test_alert.pug => adm_run_alert.pug} (100%) rename views/admin/{show_active_user.pug => adm_show_clients.pug} (100%) rename views/admin/{show_log.pug => adm_show_log.pug} (100%) rename views/admin/{show_active_waip.pug => adm_show_missions.pug} (100%) create mode 100755 views/imprint.pug rename views/includes/{clock.pug => master_clock.pug} (100%) rename views/includes/{rueckmeldung.pug => master_rueckmeldung.pug} (100%) rename views/includes/{wachalarm.pug => master_wachalarm.pug} (100%) create mode 100755 views/privacy.pug rename views/user/{config.pug => user_config.pug} (100%) diff --git a/views/admin/edit_users.pug b/views/admin/adm_edit_users.pug similarity index 100% rename from views/admin/edit_users.pug rename to views/admin/adm_edit_users.pug diff --git a/views/admin/test_alert.pug b/views/admin/adm_run_alert.pug similarity index 100% rename from views/admin/test_alert.pug rename to views/admin/adm_run_alert.pug diff --git a/views/admin/show_active_user.pug b/views/admin/adm_show_clients.pug similarity index 100% rename from views/admin/show_active_user.pug rename to views/admin/adm_show_clients.pug diff --git a/views/admin/show_log.pug b/views/admin/adm_show_log.pug similarity index 100% rename from views/admin/show_log.pug rename to views/admin/adm_show_log.pug diff --git a/views/admin/show_active_waip.pug b/views/admin/adm_show_missions.pug similarity index 100% rename from views/admin/show_active_waip.pug rename to views/admin/adm_show_missions.pug diff --git a/views/imprint.pug b/views/imprint.pug new file mode 100755 index 0000000..e69de29 diff --git a/views/includes/header.pug b/views/includes/header.pug index 0009010..29b50a2 100644 --- a/views/includes/header.pug +++ b/views/includes/header.pug @@ -27,13 +27,13 @@ header a#navbarAdminDropdown.text-nowrap.nav-link.dropdown-toggle.ion-md-build(href='#', role='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false') |  Administration .dropdown-menu(aria-labelledby='navbarAdminDropdown') - a.text-nowrap.dropdown-item.ion-md-contacts(href='/edit_users')  Benutzer und Rechte verwalten + a.text-nowrap.dropdown-item.ion-md-contacts(href='/adm_edit_users')  Benutzer und Rechte verwalten .dropdown-divider - 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 + a.text-nowrap.dropdown-item.ion-md-globe(href='/adm_show_clients')  Verbundene PCs und Benutzer anzeigen + a.text-nowrap.dropdown-item.ion-md-list(href='/adm_show_missions')  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-book(href='/show_log')  Log-Datei einsehen + a.text-nowrap.dropdown-item.text-danger.ion-md-warning(href='/adm_run_alert')  Test-Alarm versenden + a.text-nowrap.dropdown-item.ion-md-book(href='/adm_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 diff --git a/views/includes/clock.pug b/views/includes/master_clock.pug similarity index 100% rename from views/includes/clock.pug rename to views/includes/master_clock.pug diff --git a/views/includes/rueckmeldung.pug b/views/includes/master_rueckmeldung.pug similarity index 100% rename from views/includes/rueckmeldung.pug rename to views/includes/master_rueckmeldung.pug diff --git a/views/includes/wachalarm.pug b/views/includes/master_wachalarm.pug similarity index 100% rename from views/includes/wachalarm.pug rename to views/includes/master_wachalarm.pug diff --git a/views/login.pug b/views/login.pug index b773ea7..39b6a7f 100644 --- a/views/login.pug +++ b/views/login.pug @@ -17,9 +17,9 @@ block content label(for='inputPassword') Passwort input#login-password.form-control(type='password' name='password' placeholder='Passwort' required='') .form-group - .form-check - input#rembemerme.form-check-input(type='checkbox' name='rememberme') - label.form-check-label.text-warning(for='rembemerme') Anmeldung dauerhaft speichern + .custom-control.custom-switch + input#rembemerme.custom-control-input(type='checkbox' name='rememberme' checked='') + label.custom-control-label.text-warning(for='rembemerme') Anmeldung dauerhaft speichern button.btn.btn-lg.btn-primary.btn-block.text-uppercase(type='submit') Anmelden .row .col-sm-9.col-md-7.col-lg-5.mx-auto diff --git a/views/privacy.pug b/views/privacy.pug new file mode 100755 index 0000000..e69de29 diff --git a/views/user/config.pug b/views/user/user_config.pug similarity index 100% rename from views/user/config.pug rename to views/user/user_config.pug