From a215db600b9b0ca817011c1e1e57763e4ec14823 Mon Sep 17 00:00:00 2001 From: MatthieuLP Date: Mon, 31 Jul 2023 15:04:49 +0200 Subject: [PATCH] related to #1931 Moved the search filter in a dedicated template --- themes/default/js/mcs.js | 1 + .../template/include/search_filters.inc.tpl | 371 +++++++++++++++ themes/default/template/index.tpl | 443 +----------------- 3 files changed, 373 insertions(+), 442 deletions(-) create mode 100644 themes/default/template/include/search_filters.inc.tpl diff --git a/themes/default/js/mcs.js b/themes/default/js/mcs.js index 19f533b24..0458c63bb 100644 --- a/themes/default/js/mcs.js +++ b/themes/default/js/mcs.js @@ -37,6 +37,7 @@ $(document).ready(function () { } // Declare params sent to pwg.images.filteredSearch.update + // PS for performSearch() PS_params = {}; PS_params.search_id = search_id; empty_filters_list = []; diff --git a/themes/default/template/include/search_filters.inc.tpl b/themes/default/template/include/search_filters.inc.tpl new file mode 100644 index 000000000..9091311c7 --- /dev/null +++ b/themes/default/template/include/search_filters.inc.tpl @@ -0,0 +1,371 @@ +{footer_script} +{if isset($GP)} + global_params = {$GP}; +{/if} + +{if isset($fullname_of)} +fullname_of_cat = {$fullname_of}; +{/if} + +{if isset($SEARCH_ID)} +search_id = {$SEARCH_ID}; +{/if} + +str_word_widget_label = "{'Search for words'|@translate|escape:javascript}"; +str_tags_widget_label = "{'Tag'|@translate|escape:javascript}"; +str_album_widget_label = "{'Album'|@translate|escape:javascript}"; +str_author_widget_label = "{'Author'|@translate|escape:javascript}"; +str_added_by_widget_label = "{'Added by'|@translate|escape:javascript}"; +str_filetypes_widget_label = "{'File type'|@translate|escape:javascript}"; + +str_date_post = { + '7d': "{'last 7 days'|@translate|escape:javascript}", + '30d': "{'last 30 days'|@translate|escape:javascript}", + '6m': "{'last 6 months'|@translate|escape:javascript}", + '1y': "{'last year'|@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}"; + +{/footer_script} + +{combine_script id='mcs' load='async' require='jquery' path='themes/default/js/mcs.js'} +
+
+
+ + +
{'Choose filters'|@translate}
+ +
+ + + + + + + +
+ +
+
+ {'Cancel'|@translate} +
+
+ + {'Validate'|@translate} +
+
+
+
+
+ {'Choose filters'|@translate} +
+ + +
+ + + + +
+
{'Search for words'|@translate}
+
+ {'Delete'|@translate} + {'Clear'|@translate} +
+ {* Conseils de recherche *} +
+ + +
+ + + {'Search in :'|@translate} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + {'Validate'|@translate} +
+
+
+
+ + + + +
+
{'Tag'|@translate}
+
+ {'Delete'|@translate} + {'Clear'|@translate} +
+
+
+ + +
+
+ + +
+
+
+ +
+ + {'Validate'|@translate} +
+
+
+
+
+ + {'Post date'|@translate} + + +
+
{'Post date'|@translate}
+
+ + +
+ +
+ {foreach from=$DATE_POSTED item=badge_number key=k} +
+ + +
+ {/foreach} +
+
+ + {'Validate'|@translate} +
+
+
+
+ + + + +
+
{'Album'|@translate}
+
+ {'Delete'|@translate} + {'Clear'|@translate} +
+
+
+
+
+
+ +
+
+ + +
+
+ + {'Validate'|@translate} +
+
+
+ {include file='admin/themes/default/template/include/album_selector.inc.tpl' + title={'Search in albums'|@translate} + searchPlaceholder={'Search'|@translate} + show_root_btn=false + api_method='pwg.categories.getList' + } + {if isset($AUTHORS)} +
+ + + + +
+
{'Author'|@translate}
+
+ {'Delete'|@translate} + {'Clear'|@translate} +
+
+ + +
+ + {'Validate'|@translate} +
+
+
+
+ {/if} + + {if isset($ADDED_BY)} +
+ + + + +
+
{'Added by'|@translate}
+
+ {'Delete'|@translate} + {'Clear'|@translate} +
+
+ +
+ + {'Validate'|@translate} +
+
+
+
+ {/if} + + {if isset($FILETYPES)} +
+ + + + +
+
{'File type'|@translate}
+
+ + +
+
+
+ {foreach from=$FILETYPES item=filetypes key=k} +
+ + +
+ {/foreach} +
+
+
+ + {'Validate'|@translate} +
+
+
+ {/if} +
+ {'Empty filters'|@translate} +
+
+ +
+
+ {count($TAGS_FOUND)} +

{'Tags found'|@translate}

+
+
+ {count($ALBUMS_FOUND)} +

{'Albums found'|@translate}

+
+
+ +
+
+ +
{'Tags found'|@translate}
+ +
+ {foreach from=$TAGS_FOUND item=tag_path key=k} +
+ {$tag_path} +
+ {/foreach} +
+
+
+ +
+
+ +
{'Albums found'|@translate}
+ +
+ {foreach from=$ALBUMS_FOUND item=album_path key=k} +
+ {$album_path} +
+ {/foreach} +
+
+
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index d5d0e5397..720a8fae4 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -5,38 +5,6 @@ {$MENUBAR} -{footer_script} -{if isset($GP)} - global_params = {$GP}; -{/if} - -{if isset($fullname_of)} -fullname_of_cat = {$fullname_of}; -{/if} - -{if isset($SEARCH_ID)} -search_id = {$SEARCH_ID}; -{/if} - -str_word_widget_label = "{'Search for words'|@translate|escape:javascript}"; -str_tags_widget_label = "{'Tag'|@translate|escape:javascript}"; -str_album_widget_label = "{'Album'|@translate|escape:javascript}"; -str_author_widget_label = "{'Author'|@translate|escape:javascript}"; -str_added_by_widget_label = "{'Added by'|@translate|escape:javascript}"; -str_filetypes_widget_label = "{'File type'|@translate|escape:javascript}"; - -str_date_post = { - '7d': "{'last 7 days'|@translate|escape:javascript}", - '30d': "{'last 30 days'|@translate|escape:javascript}", - '6m': "{'last 6 months'|@translate|escape:javascript}", - '1y': "{'last year'|@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}"; - -{/footer_script} - {if isset($errors) or isset($infos)}
{include file='infos_errors.tpl'} @@ -201,416 +169,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can {/if} {if !empty($SEARCH_ID)} -{combine_script id='mcs' load='async' require='jquery' path='themes/default/js/mcs.js'} -{* Recherche multicritère *} -
-
-
- - -
{'Choose filters'|@translate}
- -
- - - - - - - -
- -
-
- {'Cancel'|@translate} -
-
- - {'Validate'|@translate} -
-
-
-
-
- {'Choose filters'|@translate} -
- - -
-
- - - - -
-
{'Search for words'|@translate}
-
- {'Delete'|@translate} - {'Clear'|@translate} -
- {* Conseils de recherche *} -
- - -
- - - {'Search in :'|@translate} -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- - {'Validate'|@translate} -
-
-
-
- - - - -
-
{'Tag'|@translate}
-
- {'Delete'|@translate} - {'Clear'|@translate} -
-
-
- - -
-
- - -
-
-
- -
- - {'Validate'|@translate} -
-
-
-
-
- - {'Post date'|@translate} - - -
-
{'Post date'|@translate}
-
- - -
- -
- {*
- - -
-
- - -
-
- - -
-
- - -
*} - {foreach from=$DATE_POSTED item=badge_number key=k} -
- - -
- {/foreach} -
-
- - {'Validate'|@translate} -
-
-
-
- - - - -
-
{'Album'|@translate}
-
- {'Delete'|@translate} - {'Clear'|@translate} -
-
- {*
- - -
-
- - -
*} -
-
-
-
- -
-
- - -
-
- - {'Validate'|@translate} -
-
-
- {include file='admin/themes/default/template/include/album_selector.inc.tpl' - title={'Search in albums'|@translate} - searchPlaceholder={'Search'|@translate} - show_root_btn=false - api_method='pwg.categories.getList' - } - {if isset($AUTHORS)} -
- - - - -
-
{'Author'|@translate}
-
- {'Delete'|@translate} - {'Clear'|@translate} -
-
- - -
- - {'Validate'|@translate} -
-
-
-
- {/if} - - {if isset($ADDED_BY)} -
- - - - -
-
{'Added by'|@translate}
-
- {'Delete'|@translate} - {'Clear'|@translate} -
-
- -
- - {'Validate'|@translate} -
-
-
-
- {/if} - - {if isset($FILETYPES)} -
- - - - -
-
{'File type'|@translate}
-
- - -
-
-
- {foreach from=$FILETYPES item=filetypes key=k} -
- - -
- {/foreach} -
-
-
- - {'Validate'|@translate} -
-
-
- {/if} - - {*
- Note div -
- -
-
-
- Height div -
- -
-
-
- Width div -
- -
-
-
- File type div -
- -
-
-
- File size div -
- -
-
*} -
- -
- {'Empty filters'|@translate} -
-
- -
-
- {count($TAGS_FOUND)} -

{'Tags found'|@translate}

-
-
- {count($ALBUMS_FOUND)} -

{'Albums found'|@translate}

-
-
- -
-
- -
{'Tags found'|@translate}
- -
- {foreach from=$TAGS_FOUND item=tag_path key=k} -
- {$tag_path} -
- {/foreach} -
-
-
- -
-
- -
{'Albums found'|@translate}
- -
- {foreach from=$ALBUMS_FOUND item=album_path key=k} -
- {$album_path} -
- {/foreach} -
-
-
+ {include file='themes/default/template/include/search_filters.inc.tpl'} {/if} {if !empty($THUMBNAILS)}