From 5b60c54c5595f79d3f3219859e8f107649465b94 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 4 Jun 2013 04:44:34 +0000 Subject: 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 --- admin/themes/default/fontello/LICENSE.txt | 30 ++ admin/themes/default/fontello/README.txt | 75 +++++ admin/themes/default/fontello/config.json | 181 ++++++++++++ admin/themes/default/fontello/css/animation.css | 85 ++++++ .../themes/default/fontello/css/fontello-codes.css | 32 +++ .../default/fontello/css/fontello-embedded.css | 85 ++++++ .../default/fontello/css/fontello-ie7-codes.css | 30 ++ admin/themes/default/fontello/css/fontello-ie7.css | 41 +++ admin/themes/default/fontello/css/fontello.css | 83 ++++++ admin/themes/default/fontello/demo.html | 307 +++++++++++++++++++++ admin/themes/default/fontello/font/fontello.eot | Bin 0 -> 14344 bytes admin/themes/default/fontello/font/fontello.svg | 40 +++ admin/themes/default/fontello/font/fontello.ttf | Bin 0 -> 14176 bytes admin/themes/default/fontello/font/fontello.woff | Bin 0 -> 8824 bytes admin/themes/default/icon/plug_activate.png | Bin 432 -> 0 bytes admin/themes/default/icon/plug_activate_grey.png | Bin 388 -> 0 bytes admin/themes/default/icon/plug_deactivate.png | Bin 475 -> 0 bytes admin/themes/default/icon/plug_deactivate_grey.png | Bin 399 -> 0 bytes admin/themes/default/icon/plug_delete.png | Bin 425 -> 0 bytes admin/themes/default/icon/plug_delete_grey.png | Bin 436 -> 0 bytes admin/themes/default/icon/plug_install.png | Bin 417 -> 0 bytes admin/themes/default/icon/plug_install_grey.png | Bin 376 -> 0 bytes admin/themes/default/icon/plug_uninstall.png | Bin 429 -> 0 bytes admin/themes/default/icon/plug_uninstall_grey.png | Bin 387 -> 0 bytes admin/themes/default/icon/ranks.png | Bin 772 -> 0 bytes admin/themes/default/icon/ranks_grey.png | Bin 762 -> 0 bytes admin/themes/default/icon/sync_metadata.png | Bin 1877 -> 0 bytes admin/themes/default/icon/sync_metadata_pink.png | Bin 1949 -> 0 bytes admin/themes/default/icon/synchronize.png | Bin 782 -> 0 bytes admin/themes/default/js/menu_icons.js | 11 - admin/themes/default/template/admin.tpl | 61 ++-- admin/themes/default/template/configuration.tpl | 4 +- admin/themes/default/template/header.tpl | 5 +- admin/themes/default/template/tags.tpl | 7 +- 34 files changed, 1028 insertions(+), 49 deletions(-) create mode 100644 admin/themes/default/fontello/LICENSE.txt create mode 100644 admin/themes/default/fontello/README.txt create mode 100644 admin/themes/default/fontello/config.json create mode 100644 admin/themes/default/fontello/css/animation.css create mode 100644 admin/themes/default/fontello/css/fontello-codes.css create mode 100644 admin/themes/default/fontello/css/fontello-embedded.css create mode 100644 admin/themes/default/fontello/css/fontello-ie7-codes.css create mode 100644 admin/themes/default/fontello/css/fontello-ie7.css create mode 100644 admin/themes/default/fontello/css/fontello.css create mode 100644 admin/themes/default/fontello/demo.html create mode 100644 admin/themes/default/fontello/font/fontello.eot create mode 100644 admin/themes/default/fontello/font/fontello.svg create mode 100644 admin/themes/default/fontello/font/fontello.ttf create mode 100644 admin/themes/default/fontello/font/fontello.woff delete mode 100644 admin/themes/default/icon/plug_activate.png delete mode 100644 admin/themes/default/icon/plug_activate_grey.png delete mode 100644 admin/themes/default/icon/plug_deactivate.png delete mode 100644 admin/themes/default/icon/plug_deactivate_grey.png delete mode 100644 admin/themes/default/icon/plug_delete.png delete mode 100644 admin/themes/default/icon/plug_delete_grey.png delete mode 100644 admin/themes/default/icon/plug_install.png delete mode 100644 admin/themes/default/icon/plug_install_grey.png delete mode 100644 admin/themes/default/icon/plug_uninstall.png delete mode 100644 admin/themes/default/icon/plug_uninstall_grey.png delete mode 100644 admin/themes/default/icon/ranks.png delete mode 100644 admin/themes/default/icon/ranks_grey.png delete mode 100644 admin/themes/default/icon/sync_metadata.png delete mode 100644 admin/themes/default/icon/sync_metadata_pink.png delete mode 100644 admin/themes/default/icon/synchronize.png delete mode 100644 admin/themes/default/js/menu_icons.js (limited to 'admin/themes/default') diff --git a/admin/themes/default/fontello/LICENSE.txt b/admin/themes/default/fontello/LICENSE.txt new file mode 100644 index 000000000..f74ddb588 --- /dev/null +++ b/admin/themes/default/fontello/LICENSE.txt @@ -0,0 +1,30 @@ +Font license info + + +## Font Awesome + + Copyright (C) 2012 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + +## Elusive + + Copyright (C) 2013 by Aristeides Stathopoulos + + Author: Aristeides Stathopoulos + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://aristeides.com/ + + +## Typicons + + (c) Stephen Hutchings 2012 + + Author: Stephen Hutchings + License: CC BY-SA 3.0 (http://creativecommons.org/licenses/by-sa/3.0/) + Homepage: http://typicons.com/ + + diff --git a/admin/themes/default/fontello/README.txt b/admin/themes/default/fontello/README.txt new file mode 100644 index 000000000..43e23f283 --- /dev/null +++ b/admin/themes/default/fontello/README.txt @@ -0,0 +1,75 @@ +This webfont is generated by http://fontello.com open source project. + + +================================================================================ +Please, note, that you should obey original font licences, used to make this +webfont pack. Details available in LICENSE.txt file. + +- Usually, it's enough to publish content of LICENSE.txt file somewhere on your + site in "About" section. + +- If your project is open-source, usually, it will be ok to make LICENSE.txt + file publically available in your repository. + +- Fonts, used in Fontello, don't require to make clickable links on your site. + But any kind of additional authors crediting is welcome. +================================================================================ + + +Comments on archive content +--------------------------- + +- /font/* - fonts in different formats + +- /css/* - different kinds of css, for all situations. Should be ok with + twitter bootstrap. Also, you can skip style and assign icon classes + directly to text elements, if you don't mind about IE7. + +- demo.html - demo file, to show your webfont content + +- LICENSE.txt - license info about source fonts, used to build your one. + +- config.json - keeps your settings. You can import it back to fontello anytime, + to continue your work + + +Why so many CSS files ? +----------------------- + +Because we like to fit all your needs :) + +- basic file, .css - is usually enougth, in contains @font-face + and character codes definition + +- *-ie7.css - if you need IE7 support, but still don't wish to put char codes + directly into html + +- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face + rules, but still wish to benefit of css generation. That can be very + convenient for automated assets build systems. When you need to update font - + no needs to manually edit files, just override old version with archive + content. See fontello source codes for example. + +- *-embedded.css - basic css file, but with embedded WOFF font, to avoid + CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. + We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` + server headers. But if you ok with dirty hack - this file is for you. Note, + that data url moved to separate @font-face to avoid problems with + + + + + + + + +
+

+ fontello + font demo +

+ +
+
+
+
icon-home0x2302
+
icon-star0x2605
+
icon-star-empty0x2606
+
icon-cog0x2699
+
+
+
icon-cog-alt0x26ef
+
icon-mail0x2709
+
icon-pencil0x270e
+
icon-plus-circled0x2795
+
+
+
icon-asl0xe0ad
+
icon-eye0xe70a
+
icon-tags0xe70d
+
icon-chat0xe720
+
+
+
icon-trash0xe729
+
icon-basket0xe73d
+
icon-puzzle0xe7b6
+
icon-tasks0xf0ae
+
+
+
icon-filter0xf0b0
+
icon-mail-alt0xf0e0
+
icon-sitemap0xf0e8
+
icon-crop0xf125
+
+
+
icon-picture0x1f304
+
icon-user0x1f464
+
icon-users0x1f465
+
icon-shuffle0x1f500
+
+
+
icon-lock0x1f512
+
icon-link0x1f517
+
icon-wrench0x1f527
+
icon-clock0x1f554
+
+
+
icon-block0x1f6ab
+
+
+
Generated by fontello.com
+ + \ No newline at end of file diff --git a/admin/themes/default/fontello/font/fontello.eot b/admin/themes/default/fontello/font/fontello.eot new file mode 100644 index 000000000..fb88e3beb Binary files /dev/null and b/admin/themes/default/fontello/font/fontello.eot differ diff --git a/admin/themes/default/fontello/font/fontello.svg b/admin/themes/default/fontello/font/fontello.svg new file mode 100644 index 000000000..633b8c070 --- /dev/null +++ b/admin/themes/default/fontello/font/fontello.svg @@ -0,0 +1,40 @@ + + + +Copyright (C) 2012 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/themes/default/fontello/font/fontello.ttf b/admin/themes/default/fontello/font/fontello.ttf new file mode 100644 index 000000000..fe52c5e4d Binary files /dev/null and b/admin/themes/default/fontello/font/fontello.ttf differ diff --git a/admin/themes/default/fontello/font/fontello.woff b/admin/themes/default/fontello/font/fontello.woff new file mode 100644 index 000000000..f63e4e71c Binary files /dev/null and b/admin/themes/default/fontello/font/fontello.woff differ diff --git a/admin/themes/default/icon/plug_activate.png b/admin/themes/default/icon/plug_activate.png deleted file mode 100644 index feb97a1c9..000000000 Binary files a/admin/themes/default/icon/plug_activate.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_activate_grey.png b/admin/themes/default/icon/plug_activate_grey.png deleted file mode 100644 index bf2a9be53..000000000 Binary files a/admin/themes/default/icon/plug_activate_grey.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_deactivate.png b/admin/themes/default/icon/plug_deactivate.png deleted file mode 100644 index 8401ad8b9..000000000 Binary files a/admin/themes/default/icon/plug_deactivate.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_deactivate_grey.png b/admin/themes/default/icon/plug_deactivate_grey.png deleted file mode 100644 index a7e55e669..000000000 Binary files a/admin/themes/default/icon/plug_deactivate_grey.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_delete.png b/admin/themes/default/icon/plug_delete.png deleted file mode 100644 index 285e53e19..000000000 Binary files a/admin/themes/default/icon/plug_delete.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_delete_grey.png b/admin/themes/default/icon/plug_delete_grey.png deleted file mode 100644 index d3d070bfc..000000000 Binary files a/admin/themes/default/icon/plug_delete_grey.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_install.png b/admin/themes/default/icon/plug_install.png deleted file mode 100644 index bef78e171..000000000 Binary files a/admin/themes/default/icon/plug_install.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_install_grey.png b/admin/themes/default/icon/plug_install_grey.png deleted file mode 100644 index 3bd56be3c..000000000 Binary files a/admin/themes/default/icon/plug_install_grey.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_uninstall.png b/admin/themes/default/icon/plug_uninstall.png deleted file mode 100644 index 9fd420ad7..000000000 Binary files a/admin/themes/default/icon/plug_uninstall.png and /dev/null differ diff --git a/admin/themes/default/icon/plug_uninstall_grey.png b/admin/themes/default/icon/plug_uninstall_grey.png deleted file mode 100644 index 4d6291cee..000000000 Binary files a/admin/themes/default/icon/plug_uninstall_grey.png and /dev/null differ diff --git a/admin/themes/default/icon/ranks.png b/admin/themes/default/icon/ranks.png deleted file mode 100644 index 47710e87f..000000000 Binary files a/admin/themes/default/icon/ranks.png and /dev/null differ diff --git a/admin/themes/default/icon/ranks_grey.png b/admin/themes/default/icon/ranks_grey.png deleted file mode 100644 index f9757b998..000000000 Binary files a/admin/themes/default/icon/ranks_grey.png and /dev/null differ diff --git a/admin/themes/default/icon/sync_metadata.png b/admin/themes/default/icon/sync_metadata.png deleted file mode 100644 index c527e2b04..000000000 Binary files a/admin/themes/default/icon/sync_metadata.png and /dev/null differ diff --git a/admin/themes/default/icon/sync_metadata_pink.png b/admin/themes/default/icon/sync_metadata_pink.png deleted file mode 100644 index 954c69612..000000000 Binary files a/admin/themes/default/icon/sync_metadata_pink.png and /dev/null differ diff --git a/admin/themes/default/icon/synchronize.png b/admin/themes/default/icon/synchronize.png deleted file mode 100644 index 767bb3b6d..000000000 Binary files a/admin/themes/default/icon/synchronize.png and /dev/null differ diff --git a/admin/themes/default/js/menu_icons.js b/admin/themes/default/js/menu_icons.js deleted file mode 100644 index 1b77d03a2..000000000 --- a/admin/themes/default/js/menu_icons.js +++ /dev/null @@ -1,11 +0,0 @@ -Raphael("menubarUsers", 20, 16).path("M21.053,20.8c-1.132-0.453-1.584-1.698-1.584-1.698s-0.51,0.282-0.51-0.51s0.51,0.51,1.02-2.548c0,0,1.414-0.397,1.132-3.68h-0.34c0,0,0.849-3.51,0-4.699c-0.85-1.189-1.189-1.981-3.058-2.548s-1.188-0.454-2.547-0.396c-1.359,0.057-2.492,0.792-2.492,1.188c0,0-0.849,0.057-1.188,0.397c-0.34,0.34-0.906,1.924-0.906,2.321s0.283,3.058,0.566,3.624l-0.337,0.113c-0.283,3.283,1.132,3.68,1.132,3.68c0.509,3.058,1.019,1.756,1.019,2.548s-0.51,0.51-0.51,0.51s-0.452,1.245-1.584,1.698c-1.132,0.452-7.416,2.886-7.927,3.396c-0.511,0.511-0.453,2.888-0.453,2.888h26.947c0,0,0.059-2.377-0.452-2.888C28.469,23.686,22.185,21.252,21.053,20.8zM8.583,20.628c-0.099-0.18-0.148-0.31-0.148-0.31s-0.432,0.239-0.432-0.432s0.432,0.432,0.864-2.159c0,0,1.199-0.336,0.959-3.119H9.538c0,0,0.143-0.591,0.237-1.334c-0.004-0.308,0.006-0.636,0.037-0.996l0.038-0.426c-0.021-0.492-0.107-0.939-0.312-1.226C8.818,9.619,8.53,8.947,6.947,8.467c-1.583-0.48-1.008-0.385-2.159-0.336C3.636,8.179,2.676,8.802,2.676,9.139c0,0-0.72,0.048-1.008,0.336c-0.271,0.271-0.705,1.462-0.757,1.885v0.281c0.047,0.653,0.258,2.449,0.469,2.872l-0.286,0.096c-0.239,2.783,0.959,3.119,0.959,3.119c0.432,2.591,0.864,1.488,0.864,2.159s-0.432,0.432-0.432,0.432s-0.383,1.057-1.343,1.439c-0.061,0.024-0.139,0.056-0.232,0.092v5.234h0.575c-0.029-1.278,0.077-2.927,0.746-3.594C2.587,23.135,3.754,22.551,8.583,20.628zM30.913,11.572c-0.04-0.378-0.127-0.715-0.292-0.946c-0.719-1.008-1.008-1.679-2.59-2.159c-1.584-0.48-1.008-0.385-2.16-0.336C24.72,8.179,23.76,8.802,23.76,9.139c0,0-0.719,0.048-1.008,0.336c-0.271,0.272-0.709,1.472-0.758,1.891h0.033l0.08,0.913c0.02,0.231,0.022,0.436,0.027,0.645c0.09,0.666,0.21,1.35,0.33,1.589l-0.286,0.096c-0.239,2.783,0.96,3.119,0.96,3.119c0.432,2.591,0.863,1.488,0.863,2.159s-0.432,0.432-0.432,0.432s-0.053,0.142-0.163,0.338c4.77,1.9,5.927,2.48,6.279,2.834c0.67,0.667,0.775,2.315,0.746,3.594h0.48v-5.306c-0.016-0.006-0.038-0.015-0.052-0.021c-0.959-0.383-1.343-1.439-1.343-1.439s-0.433,0.239-0.433-0.432s0.433,0.432,0.864-2.159c0,0,0.804-0.229,0.963-1.841v-1.227c-0.001-0.018-0.001-0.033-0.003-0.051h-0.289c0,0,0.215-0.89,0.292-1.861V11.572z").scale(0.6, 0.6, 0, 0).attr({fill: "#464646", stroke: "none"}); - -Raphael("menubarAlbums", 20, 16).path("M6.812,17.202l7.396-3.665v-2.164h-0.834c-0.414,0-0.808-0.084-1.167-0.237v1.159l-7.396,3.667v2.912h2V17.202zM26.561,18.875v-2.913l-7.396-3.666v-1.158c-0.358,0.152-0.753,0.236-1.166,0.236h-0.832l-0.001,2.164l7.396,3.666v1.672H26.561zM16.688,18.875v-7.501h-2v7.501H16.688zM27.875,19.875H23.25c-1.104,0-2,0.896-2,2V26.5c0,1.104,0.896,2,2,2h4.625c1.104,0,2-0.896,2-2v-4.625C29.875,20.771,28.979,19.875,27.875,19.875zM8.125,19.875H3.5c-1.104,0-2,0.896-2,2V26.5c0,1.104,0.896,2,2,2h4.625c1.104,0,2-0.896,2-2v-4.625C10.125,20.771,9.229,19.875,8.125,19.875zM13.375,10.375H18c1.104,0,2-0.896,2-2V3.75c0-1.104-0.896-2-2-2h-4.625c-1.104,0-2,0.896-2,2v4.625C11.375,9.479,12.271,10.375,13.375,10.375zM18,19.875h-4.625c-1.104,0-2,0.896-2,2V26.5c0,1.104,0.896,2,2,2H18c1.104,0,2-0.896,2-2v-4.625C20,20.771,19.104,19.875,18,19.875z").scale(0.6, 0.6, 0, 0).attr({fill: "#464646", stroke: "none"}); - -Raphael("menubarPhotos", 20, 16).path("M2.5,4.833v22.334h27V4.833H2.5zM25.25,25.25H6.75V6.75h18.5V25.25zM11.25,14c1.426,0,2.583-1.157,2.583-2.583c0-1.427-1.157-2.583-2.583-2.583c-1.427,0-2.583,1.157-2.583,2.583C8.667,12.843,9.823,14,11.25,14zM24.251,16.25l-4.917-4.917l-6.917,6.917L10.5,16.333l-2.752,2.752v5.165h16.503V16.25z").scale(0.6, 0.6, 0, 0).attr({fill: "#464646", stroke: "none"}); - -Raphael("menubarPlugins", 20, 16).path("M3.739,13.619c0,0,3.516-4.669,5.592-3.642c2.077,1.027-0.414,2.795,1.598,3.719c2.011,0.924,5.048-0.229,4.376-2.899c-0.672-2.67-1.866-0.776-2.798-2.208c-0.934-1.432,4.586-4.59,4.586-4.59s3.361,6.651,4.316,4.911c1.157-2.105,3.193-4.265,5.305-1.025c0,0,1.814,2.412,0.246,3.434s-2.917,0.443-3.506,1.553c-0.586,1.112,3.784,4.093,3.784,4.093s-2.987,4.81-4.926,3.548c-1.939-1.262,0.356-3.364-2.599-3.989c-1.288-0.23-3.438,0.538-3.818,2.34c-0.13,2.709,1.604,2.016,2.797,3.475c1.191,1.457-4.484,4.522-4.484,4.522s-1.584-3.923-3.811-4.657c-2.227-0.735-0.893,2.135-2.917,2.531c-2.024,0.396-4.816-2.399-3.46-4.789c1.358-2.391,3.275-0.044,3.441-1.951C7.629,16.087,3.739,13.619,3.739,13.619z").scale(0.6, 0.6, 0, 0).attr({fill: "#464646", stroke: "none"}); - -Raphael("menubarTools", 20, 16).path("M26.834,14.693c1.816-2.088,2.181-4.938,1.193-7.334l-3.646,4.252l-3.594-0.699L19.596,7.45l3.637-4.242c-2.502-0.63-5.258,0.13-7.066,2.21c-1.907,2.193-2.219,5.229-1.039,7.693L5.624,24.04c-1.011,1.162-0.888,2.924,0.274,3.935c1.162,1.01,2.924,0.888,3.935-0.274l9.493-10.918C21.939,17.625,24.918,16.896,26.834,14.693z").scale(0.5, 0.5, 0, 0).attr({fill: "#464646", stroke: "none"}); - -Raphael("menubarConfiguration", 20, 16).path("M26.974,16.514l3.765-1.991c-0.074-0.738-0.217-1.454-0.396-2.157l-4.182-0.579c-0.362-0.872-0.84-1.681-1.402-2.423l1.594-3.921c-0.524-0.511-1.09-0.977-1.686-1.406l-3.551,2.229c-0.833-0.438-1.73-0.77-2.672-0.984l-1.283-3.976c-0.364-0.027-0.728-0.056-1.099-0.056s-0.734,0.028-1.099,0.056l-1.271,3.941c-0.967,0.207-1.884,0.543-2.738,0.986L7.458,4.037C6.863,4.466,6.297,4.932,5.773,5.443l1.55,3.812c-0.604,0.775-1.11,1.629-1.49,2.55l-4.05,0.56c-0.178,0.703-0.322,1.418-0.395,2.157l3.635,1.923c0.041,1.013,0.209,1.994,0.506,2.918l-2.742,3.032c0.319,0.661,0.674,1.303,1.085,1.905l4.037-0.867c0.662,0.72,1.416,1.351,2.248,1.873l-0.153,4.131c0.663,0.299,1.352,0.549,2.062,0.749l2.554-3.283C15.073,26.961,15.532,27,16,27c0.507,0,1.003-0.046,1.491-0.113l2.567,3.301c0.711-0.2,1.399-0.45,2.062-0.749l-0.156-4.205c0.793-0.513,1.512-1.127,2.146-1.821l4.142,0.889c0.411-0.602,0.766-1.243,1.085-1.905l-2.831-3.131C26.778,18.391,26.93,17.467,26.974,16.514zM20.717,21.297l-1.785,1.162l-1.098-1.687c-0.571,0.22-1.186,0.353-1.834,0.353c-2.831,0-5.125-2.295-5.125-5.125c0-2.831,2.294-5.125,5.125-5.125c2.83,0,5.125,2.294,5.125,5.125c0,1.414-0.573,2.693-1.499,3.621L20.717,21.297z").scale(0.5, 0.5, 0, 0).attr({fill: "#464646", stroke: "none"}); 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'} - - {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"} {get_combined_scripts load='header'} @@ -53,8 +54,8 @@

- {'Home'|@translate} - {$GALLERY_TITLE} + + {$GALLERY_TITLE}

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)} -
+
{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), -- cgit v1.2.3