merge svn:22516 from trunk to branch 2.5

bug:2890
 for "Manage Permissions" and "Manage the members", don't display the button "apply action" button and style as a button the links

git-svn-id: http://piwigo.org/svn/branches/2.5@22517 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 9 insertions, 9 deletions

diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index c11b6369a..dd74e04ac 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -19,7 +19,7 @@ $(document).ready(function() {
     $("p[group_id="+$(this).attr("value")+"]").each(function () {
      $(this).toggle();
     });
-    
+
     if (nbSelected<2) {
       $("#two_to_select").show();
       $("#two_atleast").hide();
@@ -32,8 +32,8 @@ $(document).ready(function() {
   $("[id^=action_]").hide();
   $("select[name=selectAction]").change(function () {
     $("[id^=action_]").hide();
-    $("#action_"+$(this).attr("value")).show();  
-    if ($(this).val() != -1) {
+    $("#action_"+$(this).attr("value")).show();
+    if ($(this).val() != -1 && $(this).val() !="manage_pemissions" && $(this).val() !="manage_members" ) {
       $("#applyActionBlock").show();
     }
     else {
@@ -59,13 +59,13 @@ $(document).ready(function() {
     </span>
     <input type="text" id="groupname" name="groupname" maxlength="50" size="20">
 		<input type="submit" name="submit_add" value="{'Add'|@translate}">
-		<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
+		<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   </fieldset>
 </form>
 <form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-  
+
   <table class="table2">
     <tr class="throw">
       <th></th>
@@ -82,7 +82,7 @@ $(document).ready(function() {
     {/foreach}
     {/if}
   </table>
-  
+
   <fieldset id="action">
     <legend>{'Action'|@translate}</legend>
       <div id="forbidAction">{'No group selected, no action possible.'|@translate}</div>
@@ -174,8 +174,8 @@ $(document).ready(function() {
         {/foreach}
         {/if}
         </div>
-    
-    
+
+
         <!-- plugins -->
     {if !empty($element_set_groupe_plugins_actions)}
       {foreach from=$element_set_groupe_plugins_actions item=action}
@@ -184,7 +184,7 @@ $(document).ready(function() {
         </div>
       {/foreach}
     {/if}
-    
+
         <p id="applyActionBlock" style="display:none" class="actionButtons">
           <input id="applyAction" class="submit" type="submit" value="{'Apply action'|@translate}" name="submit"> <span id="applyOnDetails"></span></p>
     </div> <!-- #permitAction -->