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

3 files changed, 15 insertions, 15 deletions

diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index 174d9a8dd..374ec3437 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -293,7 +293,7 @@ UL.thumbnails li.rank-of-image {background-color: #ddd;}
 
 #pwgMain {padding-left:0}
 
-input[type="submit"], input[type="button"], input[type="reset"], a.bigButton {
+.grp_action A, input[type="submit"], input[type="button"], input[type="reset"], a.bigButton {
   font-size:12px;
   font-weight:bold;
   letter-spacing:1px;
@@ -307,7 +307,7 @@ input[type="submit"], input[type="button"], input[type="reset"], a.bigButton {
   margin-left:0;
 }
 
-input[type="submit"]:hover, input[type="button"]:hover, input[type="reset"]:hover, a.bigButton:hover {
+.grp_action A:hover, input[type="submit"]:hover, input[type="button"]:hover, input[type="reset"]:hover, a.bigButton:hover {
 	cursor: pointer;
   background-color:#ff7700;
   color:white;
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 -->
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index 6622fdd2b..489dc125d 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -24,7 +24,7 @@ option[disabled] { background-color: #999; color: #444; }
 input[type="radio"], input[type="checkbox"] { background-color: transparent; }
 /* INPUT[type="checkbox"], INPUT[type="radio"]
 { color:#999; background-color: #eee; }  */
-INPUT[type="submit"], INPUT[type="reset"]  { color:#999; border: 1px solid #666; background-color: #444; padding: 1px 15px; }
+.grp_action A, INPUT[type="submit"], INPUT[type="reset"]  { color:#999; border: 1px solid #666; background-color: #444; padding: 1px 15px; }
 
 h2 { color: #ccc; }
 
@@ -73,7 +73,7 @@ UL.thumbnails span.wrap2 {
  background-image: url(images/fillet.png); background-repeat: repeat-x; }
 /* borders */
 fieldset { border: 2px solid #333; }
-INPUT, SELECT, TEXTAREA { border: 1px solid #666; }
+.grp_action A, INPUT, SELECT, TEXTAREA { border: 1px solid #666; }
 input:focus, select:focus, textarea:focus {
 	background-color: #444;
 	color: #999;
@@ -211,9 +211,9 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 #ui-datepicker-div .ui-datepicker-current-day { background-color: #111 !important; border-color: #444; border-top-color: #111; border-left-color: #111;}
 #ui-datepicker-div .ui-datepicker-days-cell { background-color:#444; border:1px solid #222; border-top-color: #444; border-left-color: #444;}
 INPUT[type="text"].large  { width: 317px; }
-input[type="button"], input[type="submit"], input[type="reset"] {
+.grp_action A, input[type="button"], input[type="submit"], input[type="reset"] {
 color:#ff3363; background-color:#222; border-color: #ff3363; }
-input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
+.grp_action A:hover, input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
 color:#999; border-color: #666; }
 .bigbutton { background:transparent url(images/quickLocalSync_inactiv.png) no-repeat scroll left top; display: block;
 color:#111; font-size:28px; height:161px; margin: 0 20px 0 auto; padding:0 18px 0; text-align:center; width:625px;