From 118fec17cb94bd495dc3911b831520046ab5acc5 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 07 Jan 2017 15:44:05 +0000
Subject: [PATCH] Bootstrap-Stile angewendet
---
web/ui/stile-bootstrap.css | 34 +++++++++++++++++
web/ui/user-bootstrap.html | 32 ++++++++--------
web/ui/ui.js | 1
3 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/web/ui/stile-bootstrap.css b/web/ui/stile-bootstrap.css
new file mode 100644
index 0000000..abfb850
--- /dev/null
+++ b/web/ui/stile-bootstrap.css
@@ -0,0 +1,34 @@
+
+
+#inhalt {
+ margin-top: 0.5em;
+ margin-left: 0.5em;
+ margin-right: 0.5em;
+}
+
+#nutzerliste {
+ height: 10em;
+ width: 80%
+}
+
+#nutzerrollen {
+ height: 5em;
+ width: 80%
+}
+
+#rollen {
+ height: 5em;
+ width: 80%
+}
+
+#nav {
+ margin-top: 1em;
+}
+
+#role-form {
+ margin-top: 1em;
+}
+
+#user-role-form {
+ margin-top: 1em;
+}
\ No newline at end of file
diff --git a/web/ui/ui.js b/web/ui/ui.js
index b0ccf4e..0e7b427 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -194,6 +194,7 @@
$("#nutzerrollen").append('<option value=' + rolle.String + '>' + rolle.String + '</option>');
}
$('#nutzerRolleEntziehen').prop( "disabled", true );
+ $('#rolleErteilen').prop( "disabled", true );
}
function um_show_role_list(resp) {
diff --git a/web/ui/user-bootstrap.html b/web/ui/user-bootstrap.html
index 434bb0e..4eb0b9c 100644
--- a/web/ui/user-bootstrap.html
+++ b/web/ui/user-bootstrap.html
@@ -4,49 +4,49 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Benutzer</title>
- <!-- <link rel="stylesheet" type="text/css" href="stile.css"> -->
- <link rel="stylesheet" type="text/css" href="/jslib/skeleton-2.0.4/css/skeleton.css">
- <link rel="stylesheet" type="text/css" href="/jslib/skeleton-2.0.4/css/normalize.css">
- <link rel="stylesheet" type="text/css" href="stile-skeleton.css">
+ <link rel="stylesheet" type="text/css" href="/jslib/bootstrap4_a6/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css" href="stile-bootstrap.css">
</head>
<body>
<div id="inhalt">
<div class="breadcrumb">
- Verwaltung | Benutzer | Rollen
+ <a class="breadcrumb-item" href="/wbx">WebBox</a>
+ <a class="breadcrumb-item" href="/wbx/mng/index.html">Verwaltung</a>
+ <span class="breadcrumb-item active">Benutzer</span>
</div>
- <h1>Benutzer</h1>
+ <!-- <h1>Benutzer</h1> -->
<div id="user-list-form">
<select size="5" name="nutzerliste" id="nutzerliste"></select>
<div>
- <input type="button" name="nutzerLoeschen" id="nutzerLoeschen" value="Löschen">
- <input type="button" name="nutzerNeu" id="nutzerNeu" value="Neu">
+ <input type="button" name="nutzerLoeschen" id="nutzerLoeschen" value="Löschen" class="btn btn-danger">
+ <input type="button" name="nutzerNeu" id="nutzerNeu" value="Neu" class="btn btn-primary">
</div>
- </div>
- <div id="nav">
- <button id="nav-back-btn">zurück</button>
</div>
<div id="user-form">
<input type="text" size="20" maxlength="30" placeholder="Anmeldename" name="anmeldename" id="anmeldename">
<input type="password" size="20" maxlength="30" placeholder="Kennwort" name="kennwort" id="kennwort">
<input type="password" size="20" maxlength="30" placeholder="Wiederholung" name="kennwortw" id="kennwortw">
- <button class="user-cancel-btn">Abbrechen</button>
- <button class="user-save-btn">OK</button>
+ <!--<button class="user-cancel-btn">Abbrechen</button>-->
+ <button class="user-save-btn btn btn-primary">Speichern</button>
</div>
<div id="user-role-form">
<h5>Rollen von <span id="userid"></span></h5>
<select size="5" name="nutzerrollen" id="nutzerrollen"></select>
<div>
- <input type="button" name="nutzerRolleEntziehen" id="nutzerRolleEntziehen" value="Entziehen">
+ <input type="button" name="nutzerRolleEntziehen" id="nutzerRolleEntziehen" value="Entziehen" class="btn btn-danger">
</div>
</div>
<div id="role-form">
<h5>Rollen</h5>
<select size="5" name="rollen" id="rollen"></select>
<div>
- <input type="button" name="neueRolle" id="neueRolle" value="Neu">
- <input type="button" name="rolleErteilen" id="rolleErteilen" value="Erteilen">
+ <input type="button" name="neueRolle" id="neueRolle" value="Neu" class="btn btn-primary">
+ <input type="button" name="rolleErteilen" id="rolleErteilen" value="Erteilen" class="btn btn-info">
</div>
</div>
+ <div id="nav">
+ <button id="nav-back-btn" class="btn btn-secondary">zurück</button>
+ </div>
</div>
<script src="/jslib/jquery-1.11.1/jquery-1.11.1.min.js"></script>
<script src="ui.js"></script>
--
Gitblit v1.9.3