From 2bdb0e54e123dc921c1b465d76ac3da757472d8a Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 07 Jan 2017 16:27:15 +0000
Subject: [PATCH] Bootstrap-Version zur Standardversion umkopiert

---
 web/ui/stile.css         |  153 +++------------------
 web/ui/user-neutral.html |   57 ++++++++
 web/ui/stile-neutral.css |  137 +++++++++++++++++++
 web/ui/user.html         |   29 ++-
 4 files changed, 235 insertions(+), 141 deletions(-)

diff --git a/web/ui/stile-neutral.css b/web/ui/stile-neutral.css
new file mode 100644
index 0000000..3836af3
--- /dev/null
+++ b/web/ui/stile-neutral.css
@@ -0,0 +1,137 @@
+
+html, body {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+
+h1 {
+  margin: 0;
+  padding: 0;
+}
+
+#inhalt {
+  height: 100%;
+}
+
+
+
+
+/* Buttons
+–––––––––––––––––––––––––––––––––––––––––––––––––– */
+.button,
+button,
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+  display: inline-block;
+  height: 38px;
+  padding: 0 30px;
+  color: #555;
+  text-align: center;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 38px;
+  letter-spacing: .1rem;
+  text-transform: uppercase;
+  text-decoration: none;
+  white-space: nowrap;
+  background-color: transparent;
+  border-radius: 4px;
+  border: 1px solid #bbb;
+  cursor: pointer;
+  box-sizing: border-box; }
+.button:hover,
+button:hover,
+input[type="submit"]:hover,
+input[type="reset"]:hover,
+input[type="button"]:hover,
+.button:focus,
+button:focus,
+input[type="submit"]:focus,
+input[type="reset"]:focus,
+input[type="button"]:focus {
+  color: #333;
+  border-color: #888;
+  outline: 0; }
+.button.button-primary,
+button.button-primary,
+input[type="submit"].button-primary,
+input[type="reset"].button-primary,
+input[type="button"].button-primary {
+  color: #FFF;
+  background-color: #33C3F0;
+  border-color: #33C3F0; }
+.button.button-primary:hover,
+button.button-primary:hover,
+input[type="submit"].button-primary:hover,
+input[type="reset"].button-primary:hover,
+input[type="button"].button-primary:hover,
+.button.button-primary:focus,
+button.button-primary:focus,
+input[type="submit"].button-primary:focus,
+input[type="reset"].button-primary:focus,
+input[type="button"].button-primary:focus {
+  color: #FFF;
+  background-color: #1EAEDB;
+  border-color: #1EAEDB; }
+
+/* Forms
+–––––––––––––––––––––––––––––––––––––––––––––––––– */
+input[type="email"],
+input[type="number"],
+input[type="search"],
+input[type="text"],
+input[type="tel"],
+input[type="url"],
+input[type="password"],
+textarea {
+  height: 38px;
+  padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */
+  background-color: #fff;
+  border: 1px solid #D1D1D1;
+  border-radius: 4px;
+  box-shadow: none;
+  box-sizing: border-box; }
+/* Removes awkward default styles on some inputs for iOS */
+input[type="email"],
+input[type="number"],
+input[type="search"],
+input[type="text"],
+input[type="tel"],
+input[type="url"],
+input[type="password"],
+textarea {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          appearance: none; }
+textarea {
+  min-height: 65px;
+  padding-top: 6px;
+  padding-bottom: 6px; }
+input[type="email"]:focus,
+input[type="number"]:focus,
+input[type="search"]:focus,
+input[type="text"]:focus,
+input[type="tel"]:focus,
+input[type="url"]:focus,
+input[type="password"]:focus,
+textarea:focus,
+select:focus {
+  border: 1px solid #33C3F0;
+  outline: 0; }
+label,
+legend {
+  display: block;
+  margin-bottom: .5rem;
+  font-weight: 600; }
+fieldset {
+  padding: 0;
+  border-width: 0; }
+input[type="checkbox"],
+input[type="radio"] {
+  display: inline; }
+label > .label-body {
+  display: inline-block;
+  margin-left: .5rem;
+  font-weight: normal; }
\ No newline at end of file
diff --git a/web/ui/stile.css b/web/ui/stile.css
index 3836af3..abfb850 100644
--- a/web/ui/stile.css
+++ b/web/ui/stile.css
@@ -1,137 +1,34 @@
 
-html, body {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-h1 {
-  margin: 0;
-  padding: 0;
-}
 
 #inhalt {
-  height: 100%;
+  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%
+}
 
-/* Buttons
-–––––––––––––––––––––––––––––––––––––––––––––––––– */
-.button,
-button,
-input[type="submit"],
-input[type="reset"],
-input[type="button"] {
-  display: inline-block;
-  height: 38px;
-  padding: 0 30px;
-  color: #555;
-  text-align: center;
-  font-size: 11px;
-  font-weight: 600;
-  line-height: 38px;
-  letter-spacing: .1rem;
-  text-transform: uppercase;
-  text-decoration: none;
-  white-space: nowrap;
-  background-color: transparent;
-  border-radius: 4px;
-  border: 1px solid #bbb;
-  cursor: pointer;
-  box-sizing: border-box; }
-.button:hover,
-button:hover,
-input[type="submit"]:hover,
-input[type="reset"]:hover,
-input[type="button"]:hover,
-.button:focus,
-button:focus,
-input[type="submit"]:focus,
-input[type="reset"]:focus,
-input[type="button"]:focus {
-  color: #333;
-  border-color: #888;
-  outline: 0; }
-.button.button-primary,
-button.button-primary,
-input[type="submit"].button-primary,
-input[type="reset"].button-primary,
-input[type="button"].button-primary {
-  color: #FFF;
-  background-color: #33C3F0;
-  border-color: #33C3F0; }
-.button.button-primary:hover,
-button.button-primary:hover,
-input[type="submit"].button-primary:hover,
-input[type="reset"].button-primary:hover,
-input[type="button"].button-primary:hover,
-.button.button-primary:focus,
-button.button-primary:focus,
-input[type="submit"].button-primary:focus,
-input[type="reset"].button-primary:focus,
-input[type="button"].button-primary:focus {
-  color: #FFF;
-  background-color: #1EAEDB;
-  border-color: #1EAEDB; }
+#nav {
+  margin-top: 1em;
+}
 
-/* Forms
-–––––––––––––––––––––––––––––––––––––––––––––––––– */
-input[type="email"],
-input[type="number"],
-input[type="search"],
-input[type="text"],
-input[type="tel"],
-input[type="url"],
-input[type="password"],
-textarea {
-  height: 38px;
-  padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */
-  background-color: #fff;
-  border: 1px solid #D1D1D1;
-  border-radius: 4px;
-  box-shadow: none;
-  box-sizing: border-box; }
-/* Removes awkward default styles on some inputs for iOS */
-input[type="email"],
-input[type="number"],
-input[type="search"],
-input[type="text"],
-input[type="tel"],
-input[type="url"],
-input[type="password"],
-textarea {
-  -webkit-appearance: none;
-     -moz-appearance: none;
-          appearance: none; }
-textarea {
-  min-height: 65px;
-  padding-top: 6px;
-  padding-bottom: 6px; }
-input[type="email"]:focus,
-input[type="number"]:focus,
-input[type="search"]:focus,
-input[type="text"]:focus,
-input[type="tel"]:focus,
-input[type="url"]:focus,
-input[type="password"]:focus,
-textarea:focus,
-select:focus {
-  border: 1px solid #33C3F0;
-  outline: 0; }
-label,
-legend {
-  display: block;
-  margin-bottom: .5rem;
-  font-weight: 600; }
-fieldset {
-  padding: 0;
-  border-width: 0; }
-input[type="checkbox"],
-input[type="radio"] {
-  display: inline; }
-label > .label-body {
-  display: inline-block;
-  margin-left: .5rem;
-  font-weight: normal; }
\ No newline at end of file
+#role-form {
+  margin-top: 1em;
+}
+
+#user-role-form {
+  margin-top: 1em;
+}
\ No newline at end of file
diff --git a/web/ui/user-neutral.html b/web/ui/user-neutral.html
new file mode 100644
index 0000000..d5ffe63
--- /dev/null
+++ b/web/ui/user-neutral.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <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-neutral.css">
+  </head>
+  <body>
+    <div id="inhalt">
+      <div class="breadcrumb">
+        Verwaltung | Benutzer | Rollen 
+      </div>
+      <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&ouml;schen">
+          <input type="button" name="nutzerNeu" id="nutzerNeu" value="Neu">            
+        </div>
+      </div>
+      <div id="nav">
+        <button id="nav-back-btn">zur&uuml;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>
+      </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">
+        </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">
+        </div>
+      </div>
+    </div>
+    <script src="/jslib/jquery-1.11.1/jquery-1.11.1.min.js"></script>
+    <script src="ui.js"></script>
+    <script type="text/javascript" charset="utf-8">
+      //var ui;
+      $(document).ready(function() {
+        um_init();
+      });
+    </script>
+  </body>
+</html>
diff --git a/web/ui/user.html b/web/ui/user.html
index d2b05aa..4eb0b9c 100644
--- a/web/ui/user.html
+++ b/web/ui/user.html
@@ -4,46 +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/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&ouml;schen">
-          <input type="button" name="nutzerNeu" id="nutzerNeu" value="Neu">            
+          <input type="button" name="nutzerLoeschen" id="nutzerLoeschen" value="L&ouml;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&uuml;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&uuml;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