iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-01 02:52:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

related to #1931 & #1946 Can remove date filter with filter manager popin now

Browse Source
This commit is contained in:
MatthieuLP
2023-07-26 09:43:32 +02:00
parent b5dc413b40
commit 528db63bea
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
themes/default/js/mcs.js
View File

@@ -124,10 +124,10 @@ $(document).ready(function () {
// Setup Date post filter
if (global_params.fields.hasOwnProperty('date_posted')) {
$(".filter-date_post").css("display", "flex");
$(".filter-manager-controller.date_post").prop("checked", true);
$(".filter-date_posted").css("display", "flex");
$(".filter-manager-controller.date_posted").prop("checked", true);
if (global_params.fields.date_posted != null && global_params.fields.date_posted != "") {
$("#date_post-" + global_params.fields.date_posted).prop("checked", true);
$("#date_posted-" + global_params.fields.date_posted).prop("checked", true);
switch (global_params.fields.date_posted) {
case "7d":
@@ -147,11 +147,11 @@ $(document).ready(function () {
date_posted_str = str_date_post_u;
break;
}
$(".filter-date_post").addClass("filter-filled");
$(".filter.filter-date_post .search-words").text(date_posted_str);
$(".filter-date_posted").addClass("filter-filled");
$(".filter.filter-date_posted .search-words").text(date_posted_str);
}
$(".filter-date_post .filter-actions .clear").on('click', function () {
$(".date_post-option input").prop('checked', false);
$(".filter-date_posted .filter-actions .clear").on('click', function () {
$(".date_posted-option input").prop('checked', false);
});
PS_params.date_posted = global_params.fields.date_posted.length > 0 ? global_params.fields.date_posted : '';
@@ -361,6 +361,7 @@ $(document).ready(function () {
}
} else {
if ($(".filter.filter-" + $(this).data("wid")).is(':visible')) {
console.log($(this).data("wid"));
updateFilters($(this).data("wid"), 'del');
}
}
@@ -460,33 +461,33 @@ $(document).ready(function () {
/**
* Filter Date posted
*/
$(".filter-date_post").on("click", function (e) {
$(".filter-date_posted").on("click", function (e) {
if ($(".filter-form").has(e.target).length != 0 ||
$(e.target).hasClass("filter-form")) {
return;
}
$(".filter-date_post-form").toggle(0, function () {
$(".filter-date_posted-form").toggle(0, function () {
if ($(this).is(':visible')) {
$(".filter-date_post").addClass("show-filter-dropdown");
$(".filter-date_posted").addClass("show-filter-dropdown");
} else {
$(".filter-date_post").removeClass("show-filter-dropdown");
$(".filter-date_posted").removeClass("show-filter-dropdown");
global_params.fields.date_posted = $(".date_post-option input:checked").val();
global_params.fields.date_posted = $(".date_posted-option input:checked").val();
PS_params.date_posted = $(".date_post-option input:checked").length > 0 ? $(".date_post-option input:checked").val() : "";
PS_params.date_posted = $(".date_posted-option input:checked").length > 0 ? $(".date_posted-option input:checked").val() : "";
}
});
});
$(".filter-date_post .filter-validate").on("click", function () {
$(".filter-date_post").trigger("click");
$(".filter-date_posted .filter-validate").on("click", function () {
$(".filter-date_posted").trigger("click");
performSearch(PS_params, true);
});
$(".filter-date_post .filter-actions .delete").on("click", function () {
$(".filter-date_posted .filter-actions .delete").on("click", function () {
updateFilters('date_posted', 'del');
performSearch(PS_params, $(".filter-date_post").hasClass("filter-filled"));
if (!$(".filter-date_post").hasClass("filter-filled")) {
$(".filter-date_post").hide();
performSearch(PS_params, $(".filter-date_posted").hasClass("filter-filled"));
if (!$(".filter-date_posted").hasClass("filter-filled")) {
$(".filter-date_posted").hide();
$(".filter-manager-controller.date").prop("checked", false);
}
});

32
themes/default/template/index.tpl
View File

@@ -219,7 +219,7 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
<span class="mcs-icon pwg-icon-tag">{'Tag'|@translate}</span>
</label>
<label>
<input data-wid='date_posted' class="filter-manager-controller date_post" type="checkbox"/>
<input data-wid='date_posted' class="filter-manager-controller date_posted" type="checkbox"/>
<span class="mcs-icon pwg-icon-calendar-plus">{'Post date'|@translate}</span>
</label>
<label>
@@ -341,43 +341,43 @@ str_empty_search_bot_alt = "{'Pre-established filters are proposed, but you can
</div>
</div>
</div>
<div class="filter filter-date_post">
<div class="filter filter-date_posted">
<span class="mcs-icon pwg-icon-calendar-plus filter-icon"></span>
<span class="search-words">{'Post date'|@translate}</span>
<span class="filter-arrow pwg-icon-up-open"></span>
<div class="filter-form filter-date_post-form">
<div class="filter-form filter-date_posted-form">
<div class="filter-form-title">{'Post date'|@translate}</div>
<div class="filter-actions">
<span class="delete mcs-icon pwg-icon-trash" title="{'Delete'|@translate}"></span>
<span class="clear mcs-icon pwg-icon-broom" title="{'Clear'|@translate}"></span>
</div>
<div class="date_post-option-container">
<div class="date_post-option">
<input type="radio" id="date_post-7d" value="7d" name="date_post-period">
<label for="date_post-7d">
<div class="date_posted-option-container">
<div class="date_posted-option">
<input type="radio" id="date_posted-7d" value="7d" name="date_posted-period">
<label for="date_posted-7d">
<span class="mcs-icon pwg-icon-checkmark checked-icon"></span>
<span class="date-period">{'last 7 days'|@translate}</span>
</label>
</div>
<div class="date_post-option">
<input type="radio" id="date_post-30d" value="30d" name="date_post-period">
<label for="date_post-30d">
<div class="date_posted-option">
<input type="radio" id="date_posted-30d" value="30d" name="date_posted-period">
<label for="date_posted-30d">
<span class="mcs-icon pwg-icon-checkmark checked-icon"></span>
<span class="date-period">{'last 30 days'|@translate}</span>
</label>
</div>
<div class="date_post-option">
<input type="radio" id="date_post-6m" value="6m" name="date_post-period">
<label for="date_post-6m">
<div class="date_posted-option">
<input type="radio" id="date_posted-6m" value="6m" name="date_posted-period">
<label for="date_posted-6m">
<span class="mcs-icon pwg-icon-checkmark checked-icon"></span>
<span class="date-period">{'last 6 months'|@translate}</span>
</label>
</div>
<div class="date_post-option">
<input type="radio" id="date_post-1y" value="1y" name="date_post-period">
<label for="date_post-1y">
<div class="date_posted-option">
<input type="radio" id="date_posted-1y" value="1y" name="date_posted-period">
<label for="date_posted-1y">
<span class="mcs-icon pwg-icon-checkmark checked-icon"></span>
<span class="date-period">{'last year'|@translate}</span>
</label>