3 files changed, 62 insertions, 3 deletions
diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html
new file mode 100644
index 000000000..5b6be26eb
--- /dev/null
+++ b/module/web/templates/default/admin.html
@@ -0,0 +1,59 @@
+{% extends 'default/base.html' %}
+
+{% block title %}{{ _("Administrate User") }} - {{ super() }} {% endblock %}
+{% block subtitle %}{{ _("Administrate User") }}{% endblock %}
+
+{% block content %}
+
+{{ _("Note: You can only change permissions for webinterface.") }} {{ _("To add user or change passwords use:") }} <b>python pyLoadCore.py -u</b><br>
+{{ _("Important: Admin user have always all permissions! Only Admin user can use other clients like CLI and GUI.") }}
+
+<form action="" method="POST">
+<table class="settable wide">
+    <thead style="font-size: 11px">
+    <th>
+        {{ _("Name") }}
+    </th>
+    <th>
+        {{ _("Admin") }}
+    </th>
+    <th>
+        {{ _("Add downloads") }}
+    </th>
+    <th>
+        {{ _("Delete downloads") }}
+    </th>
+    <th>
+        {{ _("Change server status") }}
+    </th>
+    <th>
+        {{ _("See queue/collector") }}
+    </th>
+    <th>
+        {{ _("Download from webinterface") }}
+    </th>
+    <th>
+        {{ _("Change settings") }}
+    </th>
+    </thead>
+
+{% for name, data in users.iteritems() %}
+    <tr>
+        <td>{{name}}</td>
+        <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %} checked="True" {% endif %}"></td>
+        <td><input name="{{ name }}|add" type="checkbox" {% if data.perms.add %} checked="True" {% endif %}"></td>
+        <td><input name="{{ name }}|delete" type="checkbox" {% if data.perms.delete %} checked="True" {% endif %}"></td>
+        <td><input name="{{ name }}|status" type="checkbox" {% if data.perms.status %} checked="True" {% endif %}"></td>
+        <td><input name="{{ name }}|see_downloads" type="checkbox" {% if data.perms.see_downloads %} checked="True" {% endif %}"></td>
+        <td><input name="{{ name }}|download" type="checkbox" {% if data.perms.download %} checked="True" {% endif %}"></td>
+        <td><input name="{{ name }}|settings" type="checkbox" {% if data.perms.settings %} checked="True" {% endif %}"></td>
+    </tr>
+{% endfor %}
+
+
+</table>
+
+<button class="styled_button" type="submit">{{ _("Submit") }}</button>
+</form>
+
+{% endblock %}
+\ No newline at end of file
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 77774daf7..323f38b66 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -228,7 +228,7 @@ function AddBox()
 <img src="/media/default/img/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
 	<ul id="user-actions">
 		<li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
-		{% if user.is_staff %}
+		{% if user.is_admin %}
 		<li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
 		{% endif %}
 
diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html
index b59189a93..49de965a1 100644
--- a/module/web/templates/default/window.html
+++ b/module/web/templates/default/window.html
@@ -13,9 +13,9 @@
 <input id="add_name" name="add_name" type="text" size="20" />
 
 <label for="add_links">{{_("Links")}}
-<span class="small">{{_("Paste your links here")}}</span>
+<span class="small">{{_("Paste your links here or any text and press the filter button.")}}</span>
 <span class="small"> {{ _("Filter urls") }}
-<img alt="URIParsing" Title="Parse Uri" src="/media/default/img/parseUri.png" style="cursor:pointer;" onclick="parseUri()"/>
+<img alt="URIParsing" Title="Parse Uri" src="/media/default/img/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
 </span>
 
 </label>