diff --git a/install/obsolete.list b/install/obsolete.list index a60232884..03fd279ba 100644 --- a/install/obsolete.list +++ b/install/obsolete.list @@ -131,4 +131,14 @@ language/en_UK/help.html language/en_UK/help/advanced_feature.html include/smarty/demo admin/user_list_backend.php +themes/default/vendor/fontello/css/fontello-codes.css +themes/default/vendor/fontello/css/fontello-embedded.css +themes/default/vendor/fontello/css/fontello-ie7-codes.css +themes/default/vendor/fontello/css/fontello-ie7.css +themes/default/vendor/fontello/css/fontello.css +themes/default/vendor/fontello/font/fontello.eot +themes/default/vendor/fontello/font/fontello.svg +themes/default/vendor/fontello/font/fontello.ttf +themes/default/vendor/fontello/font/fontello.woff +themes/default/vendor/fontello/font/fontello.woff2 obsolete.list diff --git a/themes/default/js/mcs.js b/themes/default/js/mcs.js index 0d85e513c..f0bd66306 100644 --- a/themes/default/js/mcs.js +++ b/themes/default/js/mcs.js @@ -1,7 +1,8 @@ $(document).ready(function () { related_categories_ids = []; - $(".linkedAlbumPopInContainer .ClosePopIn").addClass("pwg-icon-cancel"); + $(".linkedAlbumPopInContainer .ClosePopIn").addClass(prefix_icon + "cancel"); + $(".linkedAlbumPopInContainer .searching").hide(); $(".filter-validate").on("click", function () { $(this).find(".loading").css("display", "block"); $(this).find(".validate-text").hide(); @@ -714,7 +715,7 @@ function performSearch(params, reload = false) { }).done(function () { $(".filter-validate").find(".validate-text").css("display", "block"); $(".filter-validate").find(".loading").hide(); - $(".remove-filter").removeClass('pwg-icon-spin6 animate-spin').addClass('pwg-icon-cancel'); + $(".remove-filter").removeClass(prefix_icon + 'spin6 animate-spin').addClass(prefix_icon + 'cancel'); }); } @@ -755,7 +756,7 @@ function fill_results(cats) { function add_related_category(cat_id, cat_link_path) { $(".selected-categories-container").append( "
" + - "" + cat_link_path + "" + + "" + cat_link_path + "" + "
" ); diff --git a/themes/default/template/include/search_filters.inc.tpl b/themes/default/template/include/search_filters.inc.tpl index c36d88fc6..013d3baea 100644 --- a/themes/default/template/include/search_filters.inc.tpl +++ b/themes/default/template/include/search_filters.inc.tpl @@ -3,7 +3,7 @@ {combine_script id='jquery.tipTip' load='header' path='themes/default/js/plugins/jquery.tipTip.minified.js'} {combine_css path="themes/default/css/search.css" order=-100} {combine_css path="themes/default/css/{$themeconf.colorscheme}-search.css" order=-100} -{combine_css path="themes/default/vendor/fontello/css/fontello.css" order=-10} +{combine_css path="themes/default/vendor/fontello/css/gallery-icon.css" order=-10} {footer_script} {if isset($GP)} @@ -28,44 +28,45 @@ str_filetypes_widget_label = "{'File type'|@translate|escape:javascript}"; str_empty_search_top_alt = "{'Fill in the filters to start a search'|@translate|escape:javascript}"; str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can add or remove them using the "Choose filters" button.'|@translate|escape:javascript}"; +const prefix_icon = 'gallery-icon-'; {/footer_script} {combine_script id='mcs' load='async' require='jquery' path='themes/default/js/mcs.js'}
- +
{'Choose filters'|@translate}
@@ -74,29 +75,29 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {'Cancel'|@translate}
- + {'Validate'|@translate}
- {'Choose filters'|@translate} + {'Choose filters'|@translate}
- +
- + - +
-
{'Search for words'|@translate}
+
{'Search for words'|@translate}
- {'Delete'|@translate} - {'Clear'|@translate} + {'Delete'|@translate} + {'Clear'|@translate}
- {* Conseils de recherche *} + {* Conseils de recherche *}
@@ -135,22 +136,22 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
- + {'Validate'|@translate}
{if isset($TAGS)}
- + - +
-
{'Tag'|@translate}
+
{'Tag'|@translate}
- {'Delete'|@translate} - {'Clear'|@translate} + {'Delete'|@translate} + {'Clear'|@translate}
@@ -169,7 +170,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {/foreach}
- + {'Validate'|@translate}
@@ -179,15 +180,15 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {if isset($DATE_POSTED)}
- + {'Post date'|@translate} - +
-
{'Post date'|@translate}
+
{'Post date'|@translate}
- - + +
@@ -195,7 +196,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
@@ -203,7 +204,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {/foreach}
- + {'Validate'|@translate}
@@ -211,15 +212,15 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {/if}
- + - +
-
{'Album'|@translate}
+
{'Album'|@translate}
- {'Delete'|@translate} - {'Clear'|@translate} + {'Delete'|@translate} + {'Clear'|@translate}
@@ -227,7 +228,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
@@ -235,7 +236,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
- + {'Validate'|@translate}
@@ -248,15 +249,15 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can } {if isset($AUTHORS)}
- + - +
-
{'Author'|@translate}
+
{'Author'|@translate}
- {'Delete'|@translate} - {'Clear'|@translate} + {'Delete'|@translate} + {'Clear'|@translate}
- + {'Validate'|@translate}
@@ -276,15 +277,15 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {if isset($ADDED_BY)}
- + - +
-
{'Added by'|translate}
+
{'Added by'|translate}
- - + +
@@ -293,7 +294,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
@@ -302,7 +303,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
- + {'Validate'|@translate}
@@ -311,15 +312,15 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {if isset($FILETYPES)}
- + - +
-
{'File type'|@translate}
+
{'File type'|@translate}
- - + +
@@ -327,7 +328,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
@@ -336,14 +337,14 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
- + {'Validate'|@translate}
{/if}
- {'Empty filters'|@translate} + {'Empty filters'|@translate}
@@ -366,7 +367,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {if isset($TAGS_FOUND)}
- +
{'Tags found'|@translate}
{'Tags listed here match your search by word. Click on one to browse by tag.'|translate}
@@ -382,7 +383,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {if isset($ALBUMS_FOUND)}
- +
{'Albums found'|@translate}
{'Albums listed here match your search by word. Click on one to browse by album.'|translate}
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index e437bc63b..580defda3 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -13,9 +13,9 @@