Changeset 25449


Ignore:
Timestamp:
11/11/13 12:49:27 (6 years ago)
Author:
plg
Message:

feature 2890: small changes to the new design of group manager. Tab (with
icon), javascript open for "add group" form, use a "link style" for
"Permissions" on each album, add icon for "Permissions" link, use same colors
for "selected" items as for photos batch manager or comments manager, replace
"-" by "·" and make it less visible (softer color) for user separator.

Location:
trunk/admin
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/group_list.php

    r25119 r25449  
    3030 
    3131// +-----------------------------------------------------------------------+ 
     32// | tabs                                                                  | 
     33// +-----------------------------------------------------------------------+ 
     34 
     35include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); 
     36 
     37$my_base_url = get_root_url().'admin.php?page='; 
     38 
     39$tabsheet = new tabsheet(); 
     40$tabsheet->set_id('groups'); 
     41$tabsheet->select('group_list'); 
     42$tabsheet->assign(); 
     43 
     44// +-----------------------------------------------------------------------+ 
    3245// | Check Access and exit when user status is not ok                      | 
    3346// +-----------------------------------------------------------------------+ 
     
    401414      'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('default').']' : ''), 
    402415      'NB_MEMBERS' => count($members), 
    403       'L_MEMBERS' => implode(' - ', $members), 
     416      'L_MEMBERS' => implode(' <span class="userSeparator">&middot;</span> ', $members), 
    404417      'MEMBERS' => l10n_dec('%d member', '%d members', count($members)), 
    405418      'U_MEMBERS' => $members_url.$row['id'], 
  • trunk/admin/include/add_core_tabs.inc.php

    r25372 r25449  
    6666      $sheets[''] = array('caption' => '<span class="icon-users"> </span>'.l10n('User list'), 'url' => ''); 
    6767      break; 
    68        
     68 
     69    case 'groups': 
     70      $sheets[''] = array('caption' => '<span class="icon-group"> </span>'.l10n('Groups'), 'url' => ''); 
     71      break; 
     72 
    6973    case 'configuration': 
    7074      global $conf_link; 
  • trunk/admin/themes/clear/theme.css

    r23426 r25449  
    330330} 
    331331label>p.group_select { 
    332   color: #666; 
    333   background-color:#F9F9F9; 
    334 } 
     332  color: #000; 
     333  background-color:#C2F5C2; 
     334} 
     335 
     336.userSeparator { 
     337  color:#999; 
     338} 
  • trunk/admin/themes/default/template/group_list.tpl

    r23121 r25449  
    22{literal} 
    33$(document).ready(function() { 
     4  /** 
     5   * Add group 
     6   */ 
     7  jQuery("#addGroup").click(function() { 
     8    jQuery("#addGroupForm").toggle(); 
     9    jQuery("input[name=groupname]").focus(); 
     10    return false; 
     11  }); 
     12 
     13  jQuery("#addGroupClose").click(function() { 
     14    jQuery("#addGroupForm").hide(); 
     15    return false; 
     16  }); 
     17 
    418  $('.groups input').change(function () { $(this).parent('p').toggleClass('group_select'); }); 
    519  $(".grp_action").hide(); 
     
    5266</div> 
    5367 
    54 <form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties"> 
     68<p class="showCreateAlbum" id="showAddGroup"> 
     69  <a class="icon-plus-circled" href="#" id="addGroup">{'Add group'|translate}</a> 
     70</p> 
     71 
     72<form method="post" style="display:none" id="addGroupForm" name="add_user" action="{$F_ADD_ACTION}" class="properties"> 
    5573  <fieldset> 
    5674    <legend>{'Add group'|@translate}</legend> 
    57     <span class="property"> 
    58       <label for="groupname">{'Group name'|@translate}</label> 
    59     </span> 
    60     <input type="text" id="groupname" name="groupname" maxlength="50" size="20"> 
    61                 <input type="submit" name="submit_add" value="{'Add'|@translate}"> 
    62                 <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     75 
     76    <p> 
     77      <strong>{'Group name'|translate}</strong><br> 
     78      <input type="text" name="groupname" maxlength="50" size="20"> 
     79    </p> 
     80 
     81    <p class="actionButtons"> 
     82      <input class="submit" name="submit_add" type="submit" value="{'Add'|translate}"> 
     83      <a href="#" id="addGroupClose">{'Cancel'|@translate}</a> 
     84    </p> 
     85 
     86    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
    6387 
    6488  </fieldset> 
    6589</form> 
     90 
    6691<form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties"> 
    6792  <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     
    7398      <label><p>{$group.NAME}<i><small>{$group.IS_DEFAULT}</small></i><input class="group_selection" name="group_selection[]" type="checkbox" value="{$group.ID}"></p></label> 
    7499      <p class="list_user">{if $group.MEMBERS>0}<a href="{$group.U_MEMBERS}" title="{'Manage the members'|@translate}">{$group.MEMBERS}</a><br>{$group.L_MEMBERS}{else}{$group.MEMBERS}{/if}</p> 
    75       <a class="buttonLike group_perm" href="{$group.U_PERM}" title="{'Permissions'|@translate}">{'Manage Permissions'|@translate}</a> 
     100      <a class="icon-lock group_perm" href="{$group.U_PERM}" title="{'Permissions'|@translate}">{'Permissions'|translate}</a> 
    76101    </li> 
    77102    {/foreach} 
  • trunk/admin/themes/roma/theme.css

    r25372 r25449  
    304304} 
    305305label>p.group_select { 
    306   color: #111; 
    307   background-color:#ccc; 
     306  color: #fff; 
     307  background-color:#555; 
     308} 
     309 
     310.userSeparator { 
     311  color:#666; 
    308312} 
    309313 
Note: See TracChangeset for help on using the changeset viewer.