Merge branch 'pr/n1006_mariusbaumann' into 0.4.10

1 files changed, 40 insertions, 38 deletions

diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html
index b049411fd..be624f555 100644
--- a/module/web/templates/default/admin.html
+++ b/module/web/templates/default/admin.html
@@ -9,18 +9,20 @@
 {% block subtitle %}{{ _("Administrate") }}{% endblock %}
 
 {% block content %}
-    
-    <a href="#" id="quit-pyload" style="font-size: large; font-weight: bold;">{{_("Quit pyLoad")}}</a> |
-    <a href="#" id="restart-pyload" style="font-size: large; font-weight: bold;">{{_("Restart pyLoad")}}</a>
+    <div class="btn-group">
+    <a href="#" id="quit-pyload" class="btn btn-default"><span class="glyphicon glyphicon-off"></span> {{_("Quit pyLoad")}}</a>
+    <a href="#" id="restart-pyload" class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span> {{_("Restart pyLoad")}}</a>
+</div>
     <br>
     <br>
 
     {{ _("To add user or change passwords use:") }} <b>python pyLoadCore.py -u</b><br>
     {{ _("Important: Admin user have always all permissions!") }}
-
-    <form action="" method="POST">
-        <table class="settable wide">
-            <thead style="font-size: 11px">
+<br>
+<br>
+    <form action="" method="POST" >
+        <table class="settable table" style="width:50%;">
+            <thead>
             <th>
                 {{ _("Name") }}
             </th>
@@ -38,9 +40,8 @@
             {% for name, data in users.iteritems() %}
                 <tr>
                     <td>{{ name }}</td>
-                    <td><a class="change_password" href="#" id="change_pw|{{name}}">{{ _("change") }}</a></td>
-                    <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %}
-                               checked="True" {% endif %}"></td>
+                    <td><a class="change_password btn btn-default btn-xs" href="#" id="change_pw|{{name}}"><span class="glyphicon glyphicon-pencil"></span> {{ _("change") }}</a></td>
+                    <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %} checked="True" {% endif %}></td>
                     <td>
                         <select multiple="multiple" size="{{ permlist|length }}" name="{{ name }}|perms">
                             {% for perm in permlist %}
@@ -58,40 +59,41 @@
 
         </table>
 
-        <button class="styled_button" type="submit">{{ _("Submit") }}</button>
+        <button class="btn btn-primary" type="submit">{{ _("Submit") }}</button>
     </form>
 {% endblock %}
 {% block hidden %}
-    <div id="password_box" class="window_box" style="z-index: 2">
-        <form id="password_form" action="/json/change_password" method="POST" enctype="multipart/form-data">
-            <h1>{{ _("Change Password") }}</h1>
-
+    <div id="password_box" style="z-index: 2">
+        <form id="password_form" class="from-group" action="/json/change_password" method="POST" enctype="multipart/form-data">
+            <h3>{{ _("Change Password") }}</h3>
             <p>{{ _("Enter your current and desired Password.") }}</p>
-            <label for="user_login">{{ _("User") }}
-                <span class="small">{{ _("Your username.") }}</span>
-            </label>
-            <input id="user_login" name="user_login" type="text" size="20"/>
-
-            <label for="login_current_password">{{ _("Current password") }}
-                <span class="small">{{ _("The password for this account.") }}</span>
-            </label>
-            <input id="login_current_password" name="login_current_password" type="password" size="20"/>
-
-            <label for="login_new_password">{{ _("New password") }}
-                <span class="small">{{ _("The new password.") }}</span>
-            </label>
-            <input id="login_new_password" name="login_new_password" type="password" size="20"/>
 
-            <label for="login_new_password2">{{ _("New password (repeat)") }}
-                <span class="small">{{ _("Please repeat the new password.") }}</span>
-            </label>
-            <input id="login_new_password2" name="login_new_password2" type="password" size="20"/>
-
-
-            <button id="login_password_button" type="submit">{{ _("Submit") }}</button>
-            <button id="login_password_reset" style="margin-left: 0" type="reset">{{ _("Reset") }}</button>
+<div class="form-group">
+    <label for="user_login">{{ _("User") }}</label>
+    <input class="form-control" id="user_login" name="user_login" type="text"/>
+    <p class="help-block">{{ _("Your username.") }}</p>
+  </div>
+  <div class="form-group">
+      <label for="login_current_password">{{ _("Current password") }}</label>
+      <input class="form-control" id="login_current_password" name="login_current_password" type="password"/>
+      <p class="help-block">{{ _("The password for this account.") }}</p>
+  </div>
+  <div class="form-group">
+        <label for="login_new_password">{{ _("New password") }}</label>
+        <input class="form-control" id="login_new_password" name="login_new_password" type="password"/>
+        <p class="help-block">{{ _("The new password.") }}</p>
+  </div>
+  <div class="form-group">
+        <label for="login_new_password2">{{ _("New password (repeat)") }}</label>
+        <input class="form-control" id="login_new_password2" name="login_new_password2" type="password" />
+        <p class="help-block">{{ _("Please repeat the new password.") }}</p>
+  </div>
+
+
+
+            <button class="btn btn-primary" id="login_password_button" type="submit" style="float: right">{{ _("Submit") }}</button>
+            <button class="btn btn-default" id="login_password_reset" style="margin-right: 5px; float: right" type="reset">{{ _("Reset") }}</button>
             <div class="spacer"></div>
-
         </form>
 
     </div>