- User permissions template migration

- Categories inheritence has not yet been done


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

4 files changed, 3 insertions, 31 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 1652bb45c..c342e2283 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -61,9 +61,9 @@
 <div class="titreMenu">{L_AUTH}</div>
 <div class="menu">
 <ul class="menu">
-  <li><a class="adminMenu" href="{U_AUTH}">{L_AUTH}</a></li>
   <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>
diff --git a/template/default/admin/cat_options.tpl b/template/default/admin/cat_options.tpl
index 91e63b8a2..1e9704011 100644
--- a/template/default/admin/cat_options.tpl
+++ b/template/default/admin/cat_options.tpl
@@ -24,6 +24,7 @@
   </div>
 </div>
 <div style="clear:both;"></div>
+<input type="hidden" name="{HIDDEN_NAME}" value="{HIDDEN_VALUE}" />
 <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
 </form>
 <div class="information">{L_CAT_OPTIONS_INFO}</div>
diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
index f6fa3ba2a..e3944fe42 100644
--- a/template/default/admin/user_perm.tpl
+++ b/template/default/admin/user_perm.tpl
@@ -1,28 +1,6 @@
-<!-- BEGIN search -->
 <div class="admin">{L_SELECT_USERNAME}</div>
 <form method="post" name="post" action="{F_SEARCH_USER_ACTION}">
   <input type="text" name="username" maxlength="50" size="20" />
-  <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS}
   <input type="submit" name="submituser" value="{L_LOOKUP_USER}" class="bouton" /> 
   <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="bouton" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
-</form>
-<!-- END search -->
-<!-- BEGIN permission -->
-<div class="admin">{L_AUTH_USER} {USERNAME}</div>
-<form action="{F_AUTH_ACTION}" method="POST">
-  <ul class="menu">
-    <!-- BEGIN category -->
-        <li>
-        <input type="radio" name="{permission.category.CAT_ID}" value="0" {permission.category.AUTH_YES}/>{L_AUTHORIZED}
-        <input type="radio" name="{permission.category.CAT_ID}" value="1" {permission.category.AUTH_NO}/>{L_FORBIDDEN}
-        : 
-         <a href="{permission.category.CAT_URL}">{permission.category.CAT_NAME}</a>
-        <!-- BEGIN parent_forbidden -->
-        {L_PARENT_FORBIDDEN}&nbsp;-&nbsp;
-        <!-- END parent_forbidden -->
-		</li>
-    <!-- END category -->
-	</ul>
-	<input type="submit" name="submit" class="bouton" value="{L_SUBMIT}"/>
-</form>
-<!-- END permission -->
+</form>
\ No newline at end of file
diff --git a/template/default/admin/user_select_body.tpl b/template/default/admin/user_select_body.tpl
deleted file mode 100644
index 6790c2d00..000000000
--- a/template/default/admin/user_select_body.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="admin">{L_SELECT_USERNAME}</div>
-<form method="post" name="post" action="{F_USER_ACTION}">
-  <input type="text" name="username" maxlength="50" size="20" />
-  <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS}
-  <input type="submit" name="submituser" value="{L_LOOKUP_USER}" /> 
-  <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" onClick="window.open('{U_SEARCH_USER}', '_phpwgsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
-</form>
\ No newline at end of file