From 045d4840c96bfddba207cdb5eb9aa64ffea12f29 Mon Sep 17 00:00:00 2001
From: undisclosed
Date: Thu, 14 May 2020 20:56:54 +0000
Subject: [PATCH] Design angepasst, App-Menu deaktiviert
---
web/ui2/js/app.js | 43 +++++++++++++++------
web/ui2/data/tpl/nutzer-rollen-dlg.tpl | 3 -
web/ui2/index.html | 8 ++++
web/ui2/stile.css | 28 ++++++++++++--
4 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/web/ui2/data/tpl/nutzer-rollen-dlg.tpl b/web/ui2/data/tpl/nutzer-rollen-dlg.tpl
index 558f286..d739070 100644
--- a/web/ui2/data/tpl/nutzer-rollen-dlg.tpl
+++ b/web/ui2/data/tpl/nutzer-rollen-dlg.tpl
@@ -8,5 +8,4 @@
{{/List}}
</div>
<h6>Verfügbare Rollen</h6>
-<div class="alle-rollen-behaelter"></div>
-<button type="button" class="zurueck-btn">< Zurück</button>
+<div class="alle-rollen-behaelter"></div>
\ No newline at end of file
diff --git a/web/ui2/index.html b/web/ui2/index.html
index 6f38b03..faecbe2 100644
--- a/web/ui2/index.html
+++ b/web/ui2/index.html
@@ -11,6 +11,7 @@
<body>
<!-- Kopfzeile -->
<div class="nord">
+ <!--
<div id="nav-menu">
<div id="nav-toggle" class="hamburger hamburger--elastic">
<div class="hamburger-box">
@@ -18,9 +19,16 @@
</div>
</div>
</div>
+ -->
+ <div class="back-btn">
+ <button type="button" class="zurueck-btn">❮ Zurück</button>
+ </div>
<div class="app-titel">
<span id="app-titel">Nutzerverwaltung</span>
</div>
+ <div class="top-btn-area">
+ <button type="button" class="top-btn" id="nutzer-neu-btn">+</button>
+ </div>
</div>
<div class="inhalt">
<!-- westliche Seitenleiste -->
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 0548b27..8f7f251 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -49,6 +49,7 @@
this.init = function () {
self.vorlagen = new Vorlagen();
+ /*
self.appMenu = new AppMenu();
self.appMenu.init(
"data/menu/",
@@ -59,9 +60,13 @@
document.querySelector('.hamburger').addEventListener('click', function (e) {
self.menue_umschalten();
});
+ */
var dlg = document.querySelector(".dialog");
dlg.style.flexBasis = '0em';
+ document.querySelector('#nutzer-neu-btn').addEventListener('click', self.nutzer_neu_dialog_zeigen);
self.seitenleiste_umschalten();
+ self.west_umschalten();
+ self.west_umschalten();
self.get_login();
self.get_user_list();
self.loc = window.location.protocol + '//' + window.location.host;
@@ -103,7 +108,8 @@
});
});
});
- });
+ });
+ document.querySelector('.zurueck-btn').style.color = 'black';
};
this.grant_role_klick = function(event) {
@@ -137,7 +143,7 @@
this.info_dialog_zeigen = function () {
self.dialog_zeigen('data/tpl/dlg-info.tpl', '');
- self.menue_umschalten();
+ //self.menue_umschalten();
};
this.nutzer_neu_dialog_zeigen = function () {
@@ -147,7 +153,7 @@
btn.addEventListener('click', self.nutzer_speichern);
}
});
- self.menue_umschalten();
+ //self.menue_umschalten();
};
this.seitenleiste_umschalten = function () {
@@ -162,6 +168,18 @@
//self.menue_umschalten();
};
+ this.west_umschalten = function() {
+ var westDiv = document.querySelector('.west');
+ if (westDiv.classList.contains('west-open')) {
+ westDiv.classList.remove('west-open');
+ westDiv.style.flexBasis = '0em';
+ } else {
+ westDiv.classList.add('west-open');
+ westDiv.style.flexBasis = '6em';
+ }
+ //self.menue_umschalten();
+ };
+
this.fusszeile_umschalten = function () {
var suedDiv = document.querySelector('.sued');
if (suedDiv.classList.contains('sued-open')) {
@@ -171,7 +189,7 @@
suedDiv.classList.add('sued-open');
suedDiv.style.height = '1.5em';
}
- self.menue_umschalten();
+ //self.menue_umschalten();
};
this.meldung_mit_timeout = function (meldung, timeout) {
@@ -240,15 +258,16 @@
var m = 'getUserNameList';
var u = '../svc/' + m;
self.http_get(u, function (antwort) {
- self.vorlagen.html_erzeugen(
- 'data/tpl/inhalt.tpl',
- JSON.parse(antwort),
- function (h) {
- var elem = document.getElementById('nutzer');
- elem.innerHTML = h;
- self.addEvtListener('p.nutzer-liste-eintrag', 'click', self.nutzerliste_klick);
+ self.vorlagen.html_erzeugen(
+ 'data/tpl/inhalt.tpl',
+ JSON.parse(antwort),
+ function (h) {
+ var elem = document.getElementById('nutzer');
+ elem.innerHTML = h;
+ self.addEvtListener('p.nutzer-liste-eintrag', 'click', self.nutzerliste_klick);
+ document.querySelector('.zurueck-btn').style.color = '#eee';
+ });
});
- });
};
this.neuen_nutzer_speichern = function(u) {
diff --git a/web/ui2/stile.css b/web/ui2/stile.css
index 38f4530..8c68991 100644
--- a/web/ui2/stile.css
+++ b/web/ui2/stile.css
@@ -27,11 +27,11 @@
flex-flow: row;
height: 100%; /* Anmerkung 2 */
min-height: 0; /* Anmerkung 1 */
- background-color: #ededed;
+ /* background-color: #ededed; */
overflow: hidden;
}
.nord {
- background-color: black;
+ background-color: #eee;
display: flex;
flex-flow: row;
height: 2em;
@@ -89,8 +89,28 @@
*/
.app-titel {
- margin-left: 0.6em;
- color: white;
+ margin-left: 0.1em;
+ color: black;
+}
+
+.zurueck-btn, .zurueck-btn:focus {
+ border: 0;
+ margin: 0 1.2em 0 0.6em;
+ padding: 0;
+ color: black;
+}
+
+.zurueck-btn:hover {
+ color: #888;
+}
+
+.top-btn {
+ margin: 0 1em 0 1em;
+
+ height: 28px;
+ line-height: 24px;
+ text-align: center;
+ font-size: large;
}
.pointer-cursor {
--
Gitblit v1.9.3