Changeset 23029


Ignore:
Timestamp:
Jun 4, 2013, 6:44:34 AM (11 years ago)
Author:
rvelices
Message:

feature 2916 Replace raphael with symbol fonts
I added more icons than before (I think it's better as we can find links faster but that's arguable ...)

Location:
trunk
Files:
17 added
32 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/include/add_core_tabs.inc.php

    r19703 r23029  
    3131      global $admin_album_base_url;
    3232      $sheets['properties'] = array('caption' => l10n('Properties'), 'url' => $admin_album_base_url.'-properties');
    33       $sheets['sort_order'] = array('caption' => l10n('Manage photo ranks'), 'url' => $admin_album_base_url.'-sort_order');
    34       $sheets['permissions'] = array('caption' => l10n('Permissions'), 'url' => $admin_album_base_url.'-permissions');
    35       $sheets['notification'] = array('caption' => l10n('Notification'), 'url' => $admin_album_base_url.'-notification');
     33      $sheets['sort_order'] = array('caption' => '<span class="icon-shuffle"></span>'.l10n('Manage photo ranks'), 'url' => $admin_album_base_url.'-sort_order');
     34      $sheets['permissions'] = array('caption' => '<span class="icon-lock"></span>'.l10n('Permissions'), 'url' => $admin_album_base_url.'-permissions');
     35      $sheets['notification'] = array('caption' => '<span class="icon-mail-alt"></span>'.l10n('Notification'), 'url' => $admin_album_base_url.'-notification');
    3636      break;
    3737     
    … …  
    4040      $sheets['list'] = array('caption' => l10n('List'), 'url' => $my_base_url.'cat_list');
    4141      $sheets['move'] = array('caption' => l10n('Move'), 'url' => $my_base_url.'cat_move');
    42       $sheets['permalinks'] = array('caption' => l10n('Permalinks'), 'url' => $my_base_url.'permalinks');
     42      $sheets['permalinks'] = array('caption' => '<span class="icon-link"></span>'.l10n('Permalinks'), 'url' => $my_base_url.'permalinks');
    4343      break;
    4444     
    … …  
    5151    case 'cat_options':
    5252      global $link_start, $conf;
    53       $sheets['status'] = array('caption' => l10n('Public / Private'), 'url' => $link_start.'cat_options&amp;section=status');
    54       $sheets['visible'] = array('caption' => l10n('Lock'), 'url' => $link_start.'cat_options&amp;section=visible');
     53      $sheets['status'] = array('caption' => '<span class="icon-lock"></span>'.l10n('Public / Private'), 'url' => $link_start.'cat_options&amp;section=status');
     54      $sheets['visible'] = array('caption' => '<span class="icon-block"></span>'.l10n('Lock'), 'url' => $link_start.'cat_options&amp;section=visible');
    5555      if ($conf['activate_comments'])
    56         $sheets['comments'] = array('caption' => l10n('Comments'), 'url' => $link_start.'cat_options&amp;section=comments');
     56        $sheets['comments'] = array('caption' => '<span class="icon-chat"></span>'.l10n('Comments'), 'url' => $link_start.'cat_options&amp;section=comments');
    5757      if ($conf['allow_random_representative'])
    5858        $sheets['representative'] = array('caption' => l10n('Representative'), 'url' => $link_start.'cat_options&amp;section=representative');
    … …  
    105105      global $admin_photo_base_url;
    106106      $sheets['properties'] = array('caption' => l10n('Properties'), 'url' => $admin_photo_base_url.'-properties');
    107       $sheets['coi'] = array('caption' => l10n('Center of interest'), 'url' => $admin_photo_base_url.'-coi');
     107      $sheets['coi'] = array('caption' => '<span class="icon-crop"></span>'.l10n('Center of interest'), 'url' => $admin_photo_base_url.'-coi');
    108108      break;
    109109     

  • trunk/admin/themes/clear/theme.css

    r22664 r23029  
    156156/* .tabsheet a:hover */
    157157.tabsheet li.selected_tab  a { color: #555; }
    158 .tabsheet a span { display:block; font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
     158.tabsheet a span { font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
    159159
    160160.sort { clear: none; }
    … …  
    175175#menubar dl.first dt {border-radius:0 6px 0 0;}
    176176#menubar dl.last {border-bottom:1px solid #ddd; border-radius:0 0 6px 0;}
    177 #menubar dt { background-color: #ddd; margin: 0; display: block; font-weight:bold;
    178 position:relative; padding: 5px 1px 4px 5px; font-size: 13px; color: #777; }
    179 #menubar dt  span { cursor:pointer; }
     177#menubar dt {
     178        background-color: #ddd; margin: 0; display: block; font-weight:bold;
     179        position:relative; padding: 5px 1px 4px 5px; font-size: 13px; color: #777;
     180        cursor:pointer;
     181}
    180182#menubar li { margin: 0; padding-left:10px; }
    181183#menubar li A { display:block; }

  • trunk/admin/themes/default/template/admin.tpl

    r20156 r23029  
    1111{/footer_script}
    1212
    13 {combine_script id='raphael' load='async' path='themes/default/js/raphael.js'}
    14 {combine_script id='raphael.menu_icons' require='raphael' load='async' path='admin/themes/default/js/menu_icons.js'}
    15 
    1613<div id="menubar">
    1714  <div id="adminHome"><a href="{$U_ADMIN}">{'Administration Home'|@translate}</a></div>
    18   <dl class="first">
    19     <dt class="rdion"><span id="menubarPhotos">&nbsp;{'Photos'|@translate}&nbsp;</span></dt>
    20     <dd>
    21       <ul>
    22         <li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
    23         <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
    24         <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
    25         <li><a href="{$U_RECENT_SET}">{'Recent photos'|@translate}</a></li>
    26         <li><a href="{$U_BATCH}">{'Batch Manager'|@translate}</a></li>
     15        <dl class="first">
     16                <dt class="rdion"><span class="icon-picture"> </span>{'Photos'|@translate}</dt>
     17                <dd>
     18                        <ul>
     19                                <li><a class="icon-plus-circled" href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
     20                                <li><a class="icon-star" href="{$U_RATING}">{'Rating'|@translate}</a></li>
     21                                <li><a class="icon-tags" href="{$U_TAGS}">{'Tags'|@translate}</a></li>
     22                                <li><a class="icon-clock" href="{$U_RECENT_SET}">{'Recent photos'|@translate}</a></li>
     23                                <li><a href="{$U_BATCH}">{'Batch Manager'|@translate}</a></li>
    2724{if $NB_PHOTOS_IN_CADDIE > 0}
    28         <li><a href="{$U_CADDIE}">{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
     25                                <li><a class="icon-basket" href="{$U_CADDIE}">{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
    2926{/if}
    30       </ul>
    31     </dd>
    32   </dl>
    33   <dl>
    34     <dt class="rdion"><span id="menubarAlbums">&nbsp;{'Albums'|@translate}&nbsp;</span></dt>
     27                        </ul>
     28                </dd>
     29        </dl>
     30        <dl>
     31                <dt class="rdion"><span class="icon-sitemap"> </span>{'Albums'|@translate}</dt>
    3532    <dd>
    3633      <ul>
    … …  
    4037    </dd>
    4138  </dl>
    42   <dl>
    43     <dt class="rdion"><span id="menubarUsers">&nbsp;{'Users'|@translate}&nbsp;</span></dt>
     39        <dl>
     40                <dt class="rdion"><span class="icon-users"> </span>{'Users'|@translate}</dt>
    4441    <dd>
    4542      <ul>
    4643        <li><a href="{$U_USERS}">{'Manage'|@translate}</a></li>
    4744        <li><a href="{$U_GROUPS}">{'Groups'|@translate}</a></li>
    48         <li><a href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
     45                                <li><a class="icon-mail-alt" href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
    4946      </ul>
    5047    </dd>
    5148  </dl>
    52   <dl>
    53     <dt class="rdion"><span id="menubarPlugins">&nbsp;{'Plugins'|@translate}&nbsp;</span></dt>
     49        <dl>
     50                <dt class="rdion"><span class="icon-puzzle"> </span>{'Plugins'|@translate}</dt>
    5451    <dd>
    5552      <ul>
    … …  
    6663    </dd>
    6764  </dl>
    68   <dl>
    69     <dt class="rdion"><span id="menubarTools">&nbsp;{'Tools'|@translate}&nbsp;</span></dt>
     65        <dl>
     66                <dt class="rdion"><span class="icon-wrench"> </span>{'Tools'|@translate}</dt>
    7067    <dd>
    7168      <ul>
    … …  
    7471        <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
    7572{/if}
    76         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
    77         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
     73                                <li><a class="icon-eye" href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
     74                                <li><a class="icon-tasks" href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
    7875{if isset($U_PENDING_COMMENTS)}
    79         <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
     76                                <li><a class="icon-chat" href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
    8077{/if}
    8178        <li><a href="{$U_UPDATES}">{'Updates'|@translate}</a></li>
    … …  
    8380    </dd>
    8481  </dl>
    85   <dl class="last">
    86     <dt class="rdion"><span id="menubarConfiguration">&nbsp;{'Configuration'|@translate}&nbsp;</span></dt>
     82        <dl class="last">
     83                <dt class="rdion"><span class="icon-cog"> </span>{'Configuration'|@translate}</dt>
    8784    <dd>
    8885      <ul>
    … …  
    9087        <li><a href="{$U_CONFIG_MENUBAR}">{'Menu Management'|@translate}</a></li>
    9188        <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
    92         <li><a href="{$U_CONFIG_LANGUAGES}">{'Languages'|@translate}</a></li>
     89                                <li><a class="icon-asl" href="{$U_CONFIG_LANGUAGES}">{'Languages'|@translate}</a></li>
    9390        <li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
    9491      </ul>
    … …  
    108105  </ul>
    109106  {/if}
    110  
     107
    111108  {if isset($errors)}
    112109  <div class="errors">

  • trunk/admin/themes/default/template/configuration.tpl

    r18165 r23029  
    793793{/if}
    794794
     795</div> <!-- configContent -->
     796
    795797{if !isset($default)}
    796798        <p class="formButtons">
    … …  
    800802{/if}
    801803
    802 </div> <!-- configContent -->
    803 
    804804{if isset($default)}
    805805{$PROFILE_CONTENT}

  • trunk/admin/themes/default/template/header.tpl

    r18756 r23029  
    2020{if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if}
    2121{/foreach}
     22{combine_css path="admin/themes/default/fontello/css/fontello.css"}
    2223
    2324<!-- BEGIN get_combined_scripts -->
    … …  
    5455  <h1>
    5556    <a href="{$U_RETURN}" title="{'Visit Gallery'|@translate}">
    56       <img src="{$ROOT_URL}admin/themes/{$theme.id}/icon/home.png" alt="{'Home'|@translate}">
    57       {$GALLERY_TITLE}
     57                        <span class="icon-home" style="font-size:larger"></span>
     58                        {$GALLERY_TITLE}
    5859    </a>
    5960  </h1>

  • trunk/admin/themes/default/template/tags.tpl

    r22592 r23029  
    118118{/literal}{/footer_script}
    119119{if count($all_tags)}
    120 <div><label>{'Search'|@translate}: <input id="searchInput" type="text" size="12"></label></div>
     120<div><label><span class="icon-filter" style="visibility:hidden" id="filterIcon"></span>{'Search'|@translate}: <input id="searchInput" type="text" size="12"></label></div>
    121121{footer_script}{literal}
    122122$("#searchInput").on( "keydown", function() {
    … …  
    128128        $this.data("timer", setTimeout( function() {
    129129                var val = $this.val();
    130                 if (!val)
     130                if (!val) {
    131131                        $(".tagSelection>li").show();
     132                        $("#filterIcon").css("visibility","hidden");
     133                }
    132134                else {
     135                        $("#filterIcon").css("visibility","visible");
    133136                        var regex = new RegExp( val.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&"), "i" );
    134137                        $(".tagSelection>li").each( function(i, li) {

  • trunk/admin/themes/roma/theme.css

    r22664 r23029  
    133133 }
    134134.tabsheet a:hover, .tabsheet li.selected_tab  a { color: #F36; }
    135 .tabsheet a span { background-color:#222; display:block; font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
     135.tabsheet a span { background-color:#222; font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
    136136/* menubar is on all admin pages => No specific css file */
    137137#menubar {
    … …  
    150150background:transparent url(images/menubar-top.png) no-repeat scroll left 1px; }
    151151#menubar dl.last { padding: 0 0 24px 0;}
    152 #menubar dt { margin: 0; display: block; background: none; left:10px; font-weight:bold;
    153 position:relative; padding: 5px 1px 4px 5px; top:-8px; font-size: 13px; color: #666;  outline:none;}
    154 #menubar dt  span { background-color: #111; cursor:pointer; }
     152#menubar dt {
     153        margin: 0; display: block; background: none; left:10px; font-weight:bold;
     154        position:relative; padding: 5px 1px 4px 5px; top:-8px; font-size: 13px; color: #666;  outline:none;
     155        cursor:pointer;
     156}
     157#menubar dt  span { background-color: #111; }
    155158#menubar li { margin: 0 0 0 6px; }
    156159#menubar li.external { list-style-image:url(images/external_inactive.png); padding:10px 0px 0pt 10px; }
Note: See TracChangeset for help on using the changeset viewer.