fixes #2417 ability to hide the new filter "expert mode"

... and removes 2 other duplicates of the filters_views configuration
This commit is contained in:
plegall
2025-10-28 18:39:18 +01:00
parent f0f4b30ce2
commit b416bdb7c9
12 changed files with 85 additions and 64 deletions
+2 -3
View File
@@ -117,7 +117,7 @@ if (!isset($conf['filters_views']))
conf_update_param('filters_views', $conf['default_filters_views'], true);
}
$filters_names_checkboxes = array_diff(array_keys(safe_unserialize($conf['filters_views'])), array('last_filters_conf'));
$filters_names_checkboxes = array_values(array_diff(array_keys(safe_unserialize($conf['filters_views'])), array('last_filters_conf')));
// image order management
$sort_fields = array(
@@ -688,12 +688,11 @@ switch ($page['section'])
}
case 'search':
{
$filters_names = $filters_names_checkboxes;
$template->assign(
'search',
array(
'filters_views' => safe_unserialize($conf['filters_views']),
'filters_names' => $filters_names,
'filters_names' => $filters_names_checkboxes,
),
);
$template->assign('SHOW_FILTER_RATINGS', $conf['rate']);
@@ -2,22 +2,7 @@
{footer_script}
filters_names =
[
'words',
'tags',
'post_date',
'creation_date',
'album',
'author',
'added_by',
'file_type',
'ratio',
'rating',
'file_size',
'height',
'width'
];
const filters_names = {$search.filters_names|json_encode};
for(const filter_name of filters_names){
if(!$("input#"+filter_name+"Filters").is(':checked')){
@@ -91,6 +76,8 @@ for(const filter_name of filters_names){
>
{if $filter_name == 'words'}
{'Search for words'|translate}
{else if $filter_name == 'expert'}
{'Expert mode'|translate}
{else if $filter_name == 'file_size'}
{'Filesize'|translate}
{else}
@@ -100,7 +87,7 @@ for(const filter_name of filters_names){
<div class='select-views-arrow icon-down-open' id="{$filter_name}Arrow"> </div>
<select name="filters_views[{$filter_name}][access]" id="f{$filter_name}Select" class="select-views">
<option value="everybody" {if ($search.filters_views.$filter_name.access == "everybody")}selected{/if}>{'Everybody'|translate}</option>
<option value="registered-users" {if ($search.filters_views.$filter_name.access == "registered-users")}selected{/if}>{'Registered users'|translate}</option>
<option value="registered-users" {if ($search.filters_views.$filter_name.access == "registered-users")}selected{/if}>{'registered users'|translate|ucfirst}</option>
<option value="admins-only" id="{$filter_name}Admin" {if ($search.filters_views.$filter_name.access == "admins-only")}selected{/if}>{'Admins only'|translate}</option>
</select>
<div class='icon-users select-views-admin' id="{$filter_name}AdminIcon"> </div>
@@ -225,7 +212,14 @@ for(const filter_name of filters_names){
{/if}
hidden/>
</label>
<label class="filter-manager-options-container">
<span class="mcs-icon-options gallery-icon-chemistry">{'Expert mode'|translate}</span>
<input type="checkbox" class="filter-manager-options-check" name="filters_views[expert][default]" id="default_expert"
{if ($search.filters_views.expert.default)}
checked="checked"
{/if}
hidden/>
</label>
</fieldset>
</div>
+2 -2
View File
@@ -8454,7 +8454,7 @@ color:#FF7B00;
/* Filters options */
.filters-grid{
display: grid;
grid-template-columns: 200px 118px 25px;
grid-template-columns: 200px 150px 25px;
margin-bottom: 0px !important;
}
.select-views{
@@ -8468,7 +8468,7 @@ color:#FF7B00;
.select-views-arrow{
display: flex;
position: absolute;
margin-left: 299.9px;
margin-left: 333px;
margin-top: 5px;
pointer-events: none;
}