- improvement : in admin/user_perm, already authorized categories thanks to

  group associations are displayed and not taken into account for user
  specific permissions.


git-svn-id: http://piwigo.org/svn/trunk@818 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 26 insertions, 4 deletions

diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
index ebb4be2e7..108885d1e 100644
--- a/template/default/admin/user_perm.tpl
+++ b/template/default/admin/user_perm.tpl
@@ -1,7 +1,21 @@
 <h1>{TITLE}</h1>
 
-<form method="post" action="{F_ACTION}">
-  {DOUBLE_SELECT}
-</form>
+<!-- BEGIN groups -->
+<fieldset>
+  <legend>{lang:Categories authorized thanks to group associations}</legend>
 
-<p>{lang:Only private categories are listed}</p>
+  <ul>
+    <!-- BEGIN category -->
+    <li>{groups.category.NAME}</li>
+    <!-- END category -->
+  </ul>
+</fieldset>
+<!-- END groups -->
+
+<fieldset>
+  <legend>{lang:Other private categories}</legend>
+
+  <form method="post" action="{F_ACTION}">
+    {DOUBLE_SELECT}
+  </form>
+</fieldset>
diff --git a/template/default/default.css b/template/default/default.css
index 4ac6caa96..ac65a076b 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -596,4 +596,12 @@ div#theNavbar>dl>dd>ul {
   list-style-type: square;
   padding-left: 15px;
   margin: 5px;
+}
+
+div#adminMain>fieldset {
+  margin: 10px;
+}
+
+fieldset>legend {
+  font-style: italic;
 }
\ No newline at end of file