adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

related to #1869 Adjustements for beta1

Browse Source 
* Removed console.log()
* Changed widget labels
* Set back all reloads params to true
* Changed icons for add album btn in album widget
This commit is contained in:
MatthieuLP
2023-06-21 16:39:23 +02:00
parent 60363ecd42
commit 3d6c533e98
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/js/mcs.js
+8 -16
View File
@@ -26,8 +26,6 @@ $(document).ready(function () {
});
global_params.search_id = search_id;
console.log("Global params after fetch");
console.log(global_params);
if (!global_params.fields) {
global_params.fields = {};
@@ -53,7 +51,7 @@ $(document).ready(function () {
$(".filter-word").addClass("filter-filled");
$(".filter-word .search-words").html(word_search_str.slice(0, -1));
} else {
$(".filter-word .search-words").html(str_word_widget);
$(".filter-word .search-words").html(str_word_widget_label);
}
word_search_fields = global_params.fields.allwords.fields;
@@ -96,7 +94,7 @@ $(document).ready(function () {
$(".filter-tag").addClass("filter-filled");
$(".filter.filter-tag .search-words").text(tag_search_str.slice(0, -2));
} else {
$(".filter.filter-tag .search-words").text("Tags");
$(".filter.filter-tag .search-words").text(str_tags_widget_label);
}
@@ -106,7 +104,6 @@ $(document).ready(function () {
// Setup album filter
if (global_params.fields.cat) {
console.log("there is an album in the search");
$(".filter-album").css("display", "flex");
$(".filter-manager-controller.album").prop("checked", true);
@@ -119,7 +116,7 @@ $(document).ready(function () {
$(".filter-album").addClass("filter-filled");
$(".filter-album .search-words").html(album_widget_value.slice(0, -2));
} else {
$(".filter-album .search-words").html("Album");
$(".filter-album .search-words").html(str_album_widget_label);
}
@@ -151,7 +148,7 @@ $(document).ready(function () {
$(".filter-author").addClass("filter-filled");
$(".filter.filter-author .search-words").text(author_search_str.slice(0, -2));
} else {
$(".filter.filter-author .search-words").text("Author");
$(".filter.filter-author .search-words").text(str_author_widget_label);
}
@@ -216,7 +213,7 @@ $(document).ready(function () {
}
});
// Set second param to true to trigger reload
performSearch(PS_params ,false);
performSearch(PS_params ,true);
})
/**
@@ -366,7 +363,7 @@ $(document).ready(function () {
});
$(".filter-album .filter-validate").on("click", function () {
$(".filter-album").trigger("click");
performSearch(PS_params, false);
performSearch(PS_params, true);
});
$(".filter-album .remove-filter").on("click", function () {
$(this).addClass('pwg-icon-spin6 animate-spin').removeClass('pwg-icon-cancel');
@@ -494,16 +491,12 @@ $(document).ready(function () {
})
function performSearch(params, reload = false) {
console.log("params sent to updatesearch");
console.log(params);
$.ajax({
url: "ws.php?format=json&method=pwg.images.filteredSearch.update",
type:"POST",
dataType: "json",
data: PS_params,
data: params,
success:function(data) {
console.log("perform search");
console.log(data);
if (reload) {
reloadPage();
}
@@ -512,7 +505,6 @@ function performSearch(params, reload = false) {
console.log(e);
},
}).done(function () {
console.log('ajax ended');
$(".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');
@@ -556,7 +548,7 @@ function fill_results(cats) {
function add_related_category(cat_id, cat_link_path) {
$(".selected-categories-container").append(
"<div class='breadcrumb-item'>" +
"<span class='link-path'>" + cat_link_path + "</span><span id="+ cat_id + " class='mcs-icon pwg-icon-close remove-item'></span>" +
"<span class='link-path'>" + cat_link_path + "</span><span id="+ cat_id + " class='mcs-icon pwg-icon-cancel remove-item'></span>" +
"</div>"
);
themes/default/template/index.tpl
+12 -9
View File
@@ -17,7 +17,10 @@ fullname_of_cat = {$fullname_of};
search_id = {$SEARCH_ID};
{/if}
str_word_widget = "{'Search for words'|@translate}";
str_word_widget_label = "{'Search for words'|@translate}";
str_tags_widget_label = "{'Search tags'|@translate}";
str_album_widget_label = "{'Search in albums'|@translate}";
str_author_widget_label = "{'Search for Author'|@translate}";
{/footer_script}
@@ -207,15 +210,15 @@ str_word_widget = "{'Search for words'|@translate}";
</label>
<label>
<input data-wid='tag' class="filter-manager-controller tags" type="checkbox"/>
<span class="mcs-icon pwg-icon-tag">Tags</span>
<span class="mcs-icon pwg-icon-tag">{'Search tags'|@translate}</span>
</label>
<label>
<input data-wid='album' class="filter-manager-controller album" type="checkbox"/>
<span class="mcs-icon pwg-icon-album">Album</span>
<span class="mcs-icon pwg-icon-album">{'Search in albums'|@translate}</span>
</label>
<label>
<input data-wid='authors' class="filter-manager-controller author" type="checkbox"/>
<span class="mcs-icon pwg-icon-user-edit">Authors</span>
<span class="mcs-icon pwg-icon-user-edit">{'Search for Author'|@translate}</span>
</label>
<label>
<input data-wid='added_by' class="filter-manager-controller added_by" type="checkbox"/>
@@ -294,7 +297,7 @@ str_word_widget = "{'Search for words'|@translate}";
<span class="filter-arrow pwg-icon-up-open"></span>
<div class="filter-form filter-tag-form">
<div class="filter-form-title">Tags</div>
<div class="filter-form-title">{'Search tags'|@translate}</div>
<div class="search-params">
<div>
<input type="radio" id="tag-all" name="tag_mode" value="AND" checked>
@@ -341,7 +344,7 @@ str_word_widget = "{'Search for words'|@translate}";
<span class="filter-arrow pwg-icon-up-open"></span>
<div class="filter-form filter-album-form">
<div class="filter-form-title">Album</div>
<div class="filter-form-title">{'Search in albums'|@translate}</div>
<div class="search-params">
{* <div>
<input type="radio" id="album-all" name="album_mode" value="ALL" checked>
@@ -356,7 +359,7 @@ str_word_widget = "{'Search for words'|@translate}";
</div>
<div class="add-album-button">
<label class="head-button-2 icon-add-album">
<p class="mcs-icon pwg-icon-close">{'Add Album'|@translate}</p>
<p class="mcs-icon pwg-icon-plus-circled">{'Add Album'|@translate}</p>
</label>
</div>
<div class="search-sub-cats">
@@ -382,7 +385,7 @@ str_word_widget = "{'Search for words'|@translate}";
<span class="filter-arrow pwg-icon-up-open"></span>
<div class="filter-form filter-author-form">
<div class="filter-form-title">Author</div>
<div class="filter-form-title">{'Search for Author'|@translate}</div>
<select id="authors" placeholder="{'Type in a search term'|translate}" name="authors[]" multiple>
{foreach from=$AUTHORS item=author}
<option value="{$author.author|strip_tags:false|escape:html}">{$author.author|strip_tags:false} ({$author.counter|translate_dec:'%d photo':'%d photos'})</option>
@@ -455,7 +458,7 @@ str_word_widget = "{'Search for words'|@translate}";
{$THUMBNAILS}
</ul>
{else}
{else if !empty($SEARCH_ID)}
<div class="mcs-no-result">
<div class="text">
<span>No results are available.</span>