iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #2230 search filters, always display all date_posted presets

Browse Source
This commit is contained in:
plegall
2024-09-19 18:21:41 +02:00
parent 634711ca3a
commit 40947217ac
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/search_filters.inc.php
View File

@@ -192,13 +192,10 @@ SELECT
$counters = array();
foreach (array_keys($label_for_threshold) as $threshold)
{
if (isset($date_posted['pre_counters'][$threshold]))
{
$counters[$threshold] = array(
'label' => $label_for_threshold[$threshold],
'counter' => $date_posted['pre_counters'][$threshold],
);
}
$counters[$threshold] = array(
'label' => $label_for_threshold[$threshold],
'counter' => $date_posted['pre_counters'][$threshold] ?? 0,
);
}
foreach (array_keys($date_posted['list_of_dates']) as $y)

1
themes/default/css/clear-search.css
View File

@@ -173,6 +173,7 @@
.ratios-option.disabled label .ratio-name,
.filetypes-option.disabled label .ext-name,
.date_posted-option.disabled label .date-period,
.ratings-option.disabled label .ratings-name{
color:#888
}

1
themes/default/css/dark-search.css
View File

@@ -150,6 +150,7 @@
.ratios-option.disabled label .ratio-name,
.filetypes-option.disabled label .ext-name,
.date_posted-option.disabled label .date-period,
.ratings-option.disabled label .ratings-name{
color:#888
}

8
themes/default/template/include/search_filters.inc.tpl
View File

@@ -283,12 +283,12 @@ const prefix_icon = 'gallery-icon-';
<div class="date_posted-option-container">
<div class="preset_posted_date">
{foreach from=$DATE_POSTED item=date_posted key=k}
<div class="date_posted-option">
<input type="radio" id="date_posted-{$k}" value={$k} name="date_posted-period">
<div class="date_posted-option {if 0 == $date_posted.counter}disabled{/if}">
{if 0 != $date_posted.counter}<input type="radio" id="date_posted-{$k}" value={$k} name="date_posted-period">{/if}
<label for="date_posted-{$k}" id="{$k}">
<span class="mcs-icon gallery-icon-checkmark checked-icon"></span>
<span class="date-period">{$date_posted.label}</span>
<span class="date_posted-badge">{$date_posted.counter}</span>
{if 0 != $date_posted.counter}<span class="date_posted-badge">{$date_posted.counter}</span>{/if}
</label>
</div>
{/foreach}
@@ -575,7 +575,7 @@ const prefix_icon = 'gallery-icon-';
<div class="form-container">
<div class="filetypes-option-container">
{foreach from=$FILETYPES item=filetypes key=k}
<div class="filetypes-option {if 0 == $filetypes}disabled{/if}"">
<div class="filetypes-option {if 0 == $filetypes}disabled{/if}">
<input type="checkbox" id="filetype-{$k}" name="{$k}" {if 0 == $filetypes}disabled{/if}>
<label for="filetype-{$k}">
<span class="mcs-icon gallery-icon-checkmark checked-icon"></span>