From 5f8a4d25ea9034cadc8ae19a2ffab788f62cc56c Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 27 Sep 2011 16:24:03 +0200
Subject: reworked authorization, now works on api level

---
 module/web/templates/default/admin.html | 50 +++++++++------------------------
 module/web/templates/default/base.html  |  4 +--
 2 files changed, 16 insertions(+), 38 deletions(-)

(limited to 'module/web/templates')

diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html
index 7b9a8b32d..96c5e7ef3 100644
--- a/module/web/templates/default/admin.html
+++ b/module/web/templates/default/admin.html
@@ -72,9 +72,8 @@
 
 {% 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.") }}
+    {{ _("Important: Admin user have always all permissions!") }}
 
     <form action="" method="POST">
         <table class="settable wide">
@@ -89,48 +88,27 @@
                 {{ _("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>
-            <th>
-                {{ _("Filemanager") }}
+                {{ _("Permissions") }}
             </th>
             </thead>
 
-            {% for name, data in users.iteritems ( ) %}
+            {% 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><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>
-                    <td><input name="{{ name }}|filemanager" type="checkbox" {% if data.perms.filemanager %}
-                               checked="True" {% endif %}"></td>
+                    <td>
+                        <select multiple="multiple" size="{{ permlist|length }}" name="{{ name }}|perms">
+                            {% for perm in permlist %}
+                            {% if data.perms|getitem(perm) %}
+                                <option selected="selected">{{ perm }}</option>
+                            {% else %}
+                                <option>{{ perm }}</option>
+                            {% endif %}
+                            {% endfor %}
+                        </select>
+                    </td>
                 </tr>
             {% endfor %}
 
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 4057d320c..2987cf081 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -257,7 +257,7 @@ function AddBox(){
 	<div style="clear:both;"></div>
 </div>
 
-{% if perms.status %}
+{% if perms.STATUS %}
 <ul id="page-actions2">
 	<li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
     <li id="action_stop"><a href="#"  class="action stop" accesskey="o" rel="nofollow">{{_("Stop")}}</a></li>
@@ -266,7 +266,7 @@ function AddBox(){
 </ul>
 {% endif %}
 
-{% if perms.see_downloads %}
+{% if perms.LIST %}
 <ul id="page-actions">
     <li><span class="time">{{_("Download:")}}</span><a id="time" style=" background-color: {% if status.download %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.download %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
     <li><span class="reconnect">{{_("Reconnect:")}}</span><a id="reconnect" style=" background-color: {% if status.reconnect %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.reconnect %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
-- 
cgit v1.2.3