Changeset 22517 for branches


Ignore:
Timestamp:
May 6, 2013, 8:53:38 PM (8 years ago)
Author:
flop25
Message:

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

Location:
branches/2.5/admin/themes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/admin/themes/clear/theme.css

    r20156 r22517  
    294294#pwgMain {padding-left:0}
    295295
    296 input[type="submit"], input[type="button"], input[type="reset"], a.bigButton {
     296.grp_action A, input[type="submit"], input[type="button"], input[type="reset"], a.bigButton {
    297297  font-size:12px;
    298298  font-weight:bold;
     
    308308}
    309309
    310 input[type="submit"]:hover, input[type="button"]:hover, input[type="reset"]:hover, a.bigButton:hover {
     310.grp_action A:hover, input[type="submit"]:hover, input[type="button"]:hover, input[type="reset"]:hover, a.bigButton:hover {
    311311        cursor: pointer;
    312312  background-color:#ff7700;
  • branches/2.5/admin/themes/default/template/group_list.tpl

    r19292 r22517  
    2020     $(this).toggle();
    2121    });
    22    
     22
    2323    if (nbSelected<2) {
    2424      $("#two_to_select").show();
     
    3333  $("select[name=selectAction]").change(function () {
    3434    $("[id^=action_]").hide();
    35     $("#action_"+$(this).attr("value")).show(); 
    36     if ($(this).val() != -1) {
     35    $("#action_"+$(this).attr("value")).show();
     36    if ($(this).val() != -1 && $(this).val() !="manage_pemissions" && $(this).val() !="manage_members" ) {
    3737      $("#applyActionBlock").show();
    3838    }
     
    6060    <input type="text" id="groupname" name="groupname" maxlength="50" size="20">
    6161                <input type="submit" name="submit_add" value="{'Add'|@translate}">
    62                 <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     62                <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
    6363
    6464  </fieldset>
     
    6666<form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
    6767  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
    68  
     68
    6969  <table class="table2">
    7070    <tr class="throw">
     
    8383    {/if}
    8484  </table>
    85  
     85
    8686  <fieldset id="action">
    8787    <legend>{'Action'|@translate}</legend>
     
    175175        {/if}
    176176        </div>
    177    
    178    
     177
     178
    179179        <!-- plugins -->
    180180    {if !empty($element_set_groupe_plugins_actions)}
     
    185185      {/foreach}
    186186    {/if}
    187    
     187
    188188        <p id="applyActionBlock" style="display:none" class="actionButtons">
    189189          <input id="applyAction" class="submit" type="submit" value="{'Apply action'|@translate}" name="submit"> <span id="applyOnDetails"></span></p>
  • branches/2.5/admin/themes/roma/theme.css

    r20156 r22517  
    2525/* INPUT[type="checkbox"], INPUT[type="radio"]
    2626{ color:#999; background-color: #eee; }  */
    27 INPUT[type="submit"], INPUT[type="reset"]  { color:#999; border: 1px solid #666; background-color: #444; padding: 1px 15px; }
     27.grp_action A, INPUT[type="submit"], INPUT[type="reset"]  { color:#999; border: 1px solid #666; background-color: #444; padding: 1px 15px; }
    2828
    2929h2 { color: #ccc; }
     
    7474/* borders */
    7575fieldset { border: 2px solid #333; }
    76 INPUT, SELECT, TEXTAREA { border: 1px solid #666; }
     76.grp_action A, INPUT, SELECT, TEXTAREA { border: 1px solid #666; }
    7777input:focus, select:focus, textarea:focus {
    7878        background-color: #444;
     
    212212#ui-datepicker-div .ui-datepicker-days-cell { background-color:#444; border:1px solid #222; border-top-color: #444; border-left-color: #444;}
    213213INPUT[type="text"].large  { width: 317px; }
    214 input[type="button"], input[type="submit"], input[type="reset"] {
     214.grp_action A, input[type="button"], input[type="submit"], input[type="reset"] {
    215215color:#ff3363; background-color:#222; border-color: #ff3363; }
    216 input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
     216.grp_action A:hover, input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
    217217color:#999; border-color: #666; }
    218218.bigbutton { background:transparent url(images/quickLocalSync_inactiv.png) no-repeat scroll left top; display: block;
Note: See TracChangeset for help on using the changeset viewer.