- Group permission delivery

- Reorganisation of common.lang.php


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

3 files changed, 8 insertions, 29 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index c342e2283..50e2e581a 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -63,7 +63,6 @@
 <ul class="menu">
   <li><a class="adminMenu" href="{U_USERS_AUTH}">{L_USERS}</a></li>
   <li><a class="adminMenu" href="{U_GROUPS_AUTH}">{L_GROUPS}</a></li>
-  <li><a class="adminMenu" href="{U_CAT_AUTH}">{L_CATEGORIES}</a></li
 </ul>
 </div>
       </div>
@@ -71,7 +70,7 @@
 	<td style="padding:10px;width:99%;" valign="top">
 <div class="home">
   <div class="titrePage">{PAGE_TITLE}</div>
-  <div align="center">{ADMIN_CONTENT}</div>
+  <div align="center">{ADMIN_CONTENT}{ADMIN_CONTENT_2}</div>
 </div>
 	</td>
   </tr>
diff --git a/template/default/admin/group_perm.tpl b/template/default/admin/group_perm.tpl
new file mode 100644
index 000000000..9bf490e5b
--- /dev/null
+++ b/template/default/admin/group_perm.tpl
@@ -0,0 +1,7 @@
+<!-- BEGIN select_box -->
+<form method="post" name="post" action="{S_GROUP_ACTION}">
+  <div class="admin">{L_GROUP_SELECT}</div>
+  {S_GROUP_SELECT}&nbsp;&nbsp;
+  <input type="submit" name="edit" value="{L_LOOK_UP}" class="bouton" />
+</form>
+<!-- END select_box -->
\ No newline at end of file
diff --git a/template/default/admin/group_perm.vtp b/template/default/admin/group_perm.vtp
deleted file mode 100644
index ef0a0bba3..000000000
--- a/template/default/admin/group_perm.vtp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--VTP_confirmation-->
-<div class="info">{#permuser_info_message} [ <a href="{#back_url}">{#adduser_info_back}</a> ]</div>
-<!--/VTP_confirmation-->
-
-<div class="info">{#permuser_only_private}</div>
-
-<form action="{#action}" method="post">
-  <table style="width:100%;">
-    <!--VTP_category-->
-    <tr>
-      <td>
-        <img src="./template/{#user_template}/admin/images/puce.gif" alt="&gt;" /> <a href="{#cat_perm_link}"><span style="color:{#color}">{#name}</span></a>
-      </td>
-      <td style="text-align:right;">
-        <!--VTP_parent_forbidden-->
-        {#permuser_parent_forbidden}
-        <!--/VTP_parent_forbidden-->
-        <input type="radio" name="access-{#id}" value="0"{#authorized_checked}/>{#permuser_authorized}
-        <input type="radio" name="access-{#id}" value="1"{#forbidden_checked}/>{#permuser_forbidden}
-      </td>
-    </tr>
-    <!--/VTP_category-->
-    <tr>
-      <td colspan="2" align="center"><input type="submit" name="submit" value="{#submit}"/></td>
-    </tr>
-  </table>
-</form>
\ No newline at end of file