aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default/template
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2013-06-04 04:44:34 +0000
committerrvelices <rv-github@modusoptimus.com>2013-06-04 04:44:34 +0000
commit5b60c54c5595f79d3f3219859e8f107649465b94 (patch)
tree1163f1c75f86f3ca463b55c5b01bc0bda5d5c18f /admin/themes/default/template
parentbfd8e798d78db071b7d5982ac9d9e68be493baad (diff)
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 ...) git-svn-id: http://piwigo.org/svn/trunk@23029 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/admin.tpl61
-rw-r--r--admin/themes/default/template/configuration.tpl4
-rw-r--r--admin/themes/default/template/header.tpl5
-rw-r--r--admin/themes/default/template/tags.tpl7
4 files changed, 39 insertions, 38 deletions
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 9e929d449..29212860c 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -10,28 +10,25 @@ jQuery(document).ready(function(){ldelim}
});
{/footer_script}
-{combine_script id='raphael' load='async' path='themes/default/js/raphael.js'}
-{combine_script id='raphael.menu_icons' require='raphael' load='async' path='admin/themes/default/js/menu_icons.js'}
-
<div id="menubar">
<div id="adminHome"><a href="{$U_ADMIN}">{'Administration Home'|@translate}</a></div>
- <dl class="first">
- <dt class="rdion"><span id="menubarPhotos">&nbsp;{'Photos'|@translate}&nbsp;</span></dt>
- <dd>
- <ul>
- <li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
- <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
- <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
- <li><a href="{$U_RECENT_SET}">{'Recent photos'|@translate}</a></li>
- <li><a href="{$U_BATCH}">{'Batch Manager'|@translate}</a></li>
+ <dl class="first">
+ <dt class="rdion"><span class="icon-picture"> </span>{'Photos'|@translate}</dt>
+ <dd>
+ <ul>
+ <li><a class="icon-plus-circled" href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
+ <li><a class="icon-star" href="{$U_RATING}">{'Rating'|@translate}</a></li>
+ <li><a class="icon-tags" href="{$U_TAGS}">{'Tags'|@translate}</a></li>
+ <li><a class="icon-clock" href="{$U_RECENT_SET}">{'Recent photos'|@translate}</a></li>
+ <li><a href="{$U_BATCH}">{'Batch Manager'|@translate}</a></li>
{if $NB_PHOTOS_IN_CADDIE > 0}
- <li><a href="{$U_CADDIE}">{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
+ <li><a class="icon-basket" href="{$U_CADDIE}">{'Caddie'|@translate}<span class="adminMenubarCounter">{$NB_PHOTOS_IN_CADDIE}</span></a></li>
{/if}
- </ul>
- </dd>
- </dl>
- <dl>
- <dt class="rdion"><span id="menubarAlbums">&nbsp;{'Albums'|@translate}&nbsp;</span></dt>
+ </ul>
+ </dd>
+ </dl>
+ <dl>
+ <dt class="rdion"><span class="icon-sitemap"> </span>{'Albums'|@translate}</dt>
<dd>
<ul>
<li><a href="{$U_CATEGORIES}">{'Manage'|@translate}</a></li>
@@ -39,18 +36,18 @@ jQuery(document).ready(function(){ldelim}
</ul>
</dd>
</dl>
- <dl>
- <dt class="rdion"><span id="menubarUsers">&nbsp;{'Users'|@translate}&nbsp;</span></dt>
+ <dl>
+ <dt class="rdion"><span class="icon-users"> </span>{'Users'|@translate}</dt>
<dd>
<ul>
<li><a href="{$U_USERS}">{'Manage'|@translate}</a></li>
<li><a href="{$U_GROUPS}">{'Groups'|@translate}</a></li>
- <li><a href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
+ <li><a class="icon-mail-alt" href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
</ul>
</dd>
</dl>
- <dl>
- <dt class="rdion"><span id="menubarPlugins">&nbsp;{'Plugins'|@translate}&nbsp;</span></dt>
+ <dl>
+ <dt class="rdion"><span class="icon-puzzle"> </span>{'Plugins'|@translate}</dt>
<dd>
<ul>
<li><a href="{$U_PLUGINS}">{'Manage'|@translate}</a></li>
@@ -65,31 +62,31 @@ jQuery(document).ready(function(){ldelim}
{/if}
</dd>
</dl>
- <dl>
- <dt class="rdion"><span id="menubarTools">&nbsp;{'Tools'|@translate}&nbsp;</span></dt>
+ <dl>
+ <dt class="rdion"><span class="icon-wrench"> </span>{'Tools'|@translate}</dt>
<dd>
<ul>
{if $ENABLE_SYNCHRONIZATION}
<li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
<li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
{/if}
- <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
- <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
+ <li><a class="icon-eye" href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
+ <li><a class="icon-tasks" href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
{if isset($U_PENDING_COMMENTS)}
- <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
+ <li><a class="icon-chat" href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
{/if}
<li><a href="{$U_UPDATES}">{'Updates'|@translate}</a></li>
</ul>
</dd>
</dl>
- <dl class="last">
- <dt class="rdion"><span id="menubarConfiguration">&nbsp;{'Configuration'|@translate}&nbsp;</span></dt>
+ <dl class="last">
+ <dt class="rdion"><span class="icon-cog"> </span>{'Configuration'|@translate}</dt>
<dd>
<ul>
<li><a href="{$U_CONFIG_GENERAL}">{'Options'|@translate}</a></li>
<li><a href="{$U_CONFIG_MENUBAR}">{'Menu Management'|@translate}</a></li>
<li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
- <li><a href="{$U_CONFIG_LANGUAGES}">{'Languages'|@translate}</a></li>
+ <li><a class="icon-asl" href="{$U_CONFIG_LANGUAGES}">{'Languages'|@translate}</a></li>
<li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
</ul>
</dd>
@@ -107,7 +104,7 @@ jQuery(document).ready(function(){ldelim}
<li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/help.png" alt="(?)"></a></li>
</ul>
{/if}
-
+
{if isset($errors)}
<div class="errors">
<ul>
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index a2520b0c3..76bb83c0e 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -792,6 +792,8 @@ jQuery(document).ready(function() {
</fieldset>
{/if}
+</div> <!-- configContent -->
+
{if !isset($default)}
<p class="formButtons">
<input type="submit" name="submit" value="{'Save Settings'|@translate}">
@@ -799,8 +801,6 @@ jQuery(document).ready(function() {
</form>
{/if}
-</div> <!-- configContent -->
-
{if isset($default)}
{$PROFILE_CONTENT}
{/if}
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index f8fff5750..365bcd8de 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -19,6 +19,7 @@
{/if}
{if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if}
{/foreach}
+{combine_css path="admin/themes/default/fontello/css/fontello.css"}
<!-- BEGIN get_combined_scripts -->
{get_combined_scripts load='header'}
@@ -53,8 +54,8 @@
<div id="pwgHead">
<h1>
<a href="{$U_RETURN}" title="{'Visit Gallery'|@translate}">
- <img src="{$ROOT_URL}admin/themes/{$theme.id}/icon/home.png" alt="{'Home'|@translate}">
- {$GALLERY_TITLE}
+ <span class="icon-home" style="font-size:larger"></span>
+ {$GALLERY_TITLE}
</a>
</h1>
diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index d2b155ece..a6aa736c1 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -117,7 +117,7 @@ jQuery('.showInfo').tipTip({
});
{/literal}{/footer_script}
{if count($all_tags)}
-<div><label>{'Search'|@translate}: <input id="searchInput" type="text" size="12"></label></div>
+<div><label><span class="icon-filter" style="visibility:hidden" id="filterIcon"></span>{'Search'|@translate}: <input id="searchInput" type="text" size="12"></label></div>
{footer_script}{literal}
$("#searchInput").on( "keydown", function() {
var $this = $(this),
@@ -127,9 +127,12 @@ $("#searchInput").on( "keydown", function() {
$this.data("timer", setTimeout( function() {
var val = $this.val();
- if (!val)
+ if (!val) {
$(".tagSelection>li").show();
+ $("#filterIcon").css("visibility","hidden");
+ }
else {
+ $("#filterIcon").css("visibility","visible");
var regex = new RegExp( val.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&"), "i" );
$(".tagSelection>li").each( function(i, li) {
var $li = $(li),