issue 426 step 1 reverted:

svn merge -r1466:1465 .
svn merge -r1463:1462 .


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

1 files changed, 0 insertions, 65 deletions

diff --git a/template/public/yoga/admin/cat_perm.tpl b/template/public/yoga/admin/cat_perm.tpl
deleted file mode 100644
index 9c8fafa69..000000000
--- a/template/public/yoga/admin/cat_perm.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
-  <h2>{lang:Manage permissions for a category}</h2>
-</div>
-
-<h3>{CATEGORIES_NAV}</h3>
-
-<form action="{F_ACTION}" method="post" id="categoryPermissions">
-
-  <h4>{lang:Groups}</h4>
-
-  <fieldset>
-    <legend>{lang:Permission granted}</legend>
-    <ul>
-      <!-- BEGIN group_granted -->
-      <li><label><input type="checkbox" name="deny_groups[]" value="{group_granted.ID}" /> {group_granted.NAME}</label></li>
-      <!-- END group_granted -->
-    </ul>
-    <input type="submit" name="deny_groups_submit" value="{lang:Deny selected groups}" {TAG_INPUT_ENABLED}/>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Permission denied}</legend>
-    <ul>
-      <!-- BEGIN group_denied -->
-      <li><label><input type="checkbox" name="grant_groups[]" value="{group_denied.ID}"> {group_denied.NAME}</label></li>
-      <!-- END group_denied -->
-    </ul>
-    <input type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" {TAG_INPUT_ENABLED}/>
-  </fieldset>
-
-  <h4>{lang:Users}</h4>
-  
-  <fieldset>
-    <legend>{lang:Permission granted}</legend>
-    <ul>
-      <!-- BEGIN user_granted -->
-      <li><label><input type="checkbox" name="deny_users[]" value="{user_granted.ID}" /> {user_granted.NAME}</label></li>
-      <!-- END user_granted -->
-    </ul>
-    <input type="submit" name="deny_users_submit" value="{lang:Deny selected users}" {TAG_INPUT_ENABLED}/>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Permission granted thanks to a group}</legend>
-    <ul>
-      <!-- BEGIN user_granted_indirect -->
-      <li>{user_granted_indirect.NAME} ({user_granted_indirect.GROUP})</li>
-      <!-- END user_granted_indirect -->
-    </ul>
-  </fieldset>
-
-  <fieldset>
-    <legend>{lang:Permission denied}</legend>
-    <ul>
-      <!-- BEGIN user_denied -->
-      <li><label><input type="checkbox" name="grant_users[]" value="{user_denied.ID}"> {user_denied.NAME}</label></li>
-      <!-- END user_denied -->
-    </ul>
-    <input type="submit" name="grant_users_submit" value="{lang:Grant selected users}" {TAG_INPUT_ENABLED}/>
-  </fieldset>
-
-</form>