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

related to #1834 added filtered users sentence and fixed search cancel in search input

Browse Source
This commit is contained in:
MatthieuLP
2022-12-20 16:33:19 +01:00
parent aa4ee2ca89
commit 23a8d1d1fe
4 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
admin/themes/default/js/user_list.js
View File

@@ -14,6 +14,7 @@ let last_user_id = -1;
let pwg_token = '';
let selection = [];
let first_update = true;
let total_users = 0
/*----------------
Escape of pop-in
----------------*/
@@ -291,6 +292,19 @@ $( document ).ready(function() {
$("select[name='filter_group']").val(has_group);
update_user_list();
}
$('.search-cancel').on('click', function () {
$('.search-input').val('');
$('.search-input').trigger ("input");
})
$('.search-input').on('input', function() {
if ($('.search-input').val() == '') {
$('.search-cancel').hide();
} else {
$('.search-cancel').show();
}
})
});
function set_view_selector(view_type) {
@@ -1465,15 +1479,6 @@ function update_guest_info() {
}
function update_user_list() {
let nb_filters = 0;
($(".advanced-filter-select[name=filter_status]").val() != "") ? nb_filters += 1 : false;
($(".advanced-filter-select[name=filter_group]").val() != "") ? nb_filters += 1 : false;
($(".advanced-filter-select[name=filter_level]").val() != "") ? nb_filters += 1 : false;
($(".dates-select-bar .slider-bar-container").slider("option", "values")[0] != 0) ? nb_filters += 1 : false;
($(".dates-select-bar .slider-bar-container").slider("option", "values")[1] != register_dates.length -1) ? nb_filters += 1 : false;
show_filter_infos(nb_filters);
let update_data = {
display: "all",
order: "id",
@@ -1505,8 +1510,8 @@ function update_user_list() {
console.log(data.message);
return;
}
total_users = data.result.total_count;
if (first_update) {
let total_users = data.result.total_count;
$("h1").append(`<span class='badge-number'>${total_users}</span>`);
first_update = false;
}
@@ -1524,6 +1529,15 @@ function update_user_list() {
set_selected_to_selection();
$(".user-update-spinner").hide();
let nb_filters = 0;
($(".advanced-filter-select[name=filter_status]").val() != "") ? nb_filters += 1 : false;
($(".advanced-filter-select[name=filter_group]").val() != "") ? nb_filters += 1 : false;
($(".advanced-filter-select[name=filter_level]").val() != "") ? nb_filters += 1 : false;
($(".dates-select-bar .slider-bar-container").slider("option", "values")[0] != 0) ? nb_filters += 1 : false;
($(".dates-select-bar .slider-bar-container").slider("option", "values")[1] != register_dates.length -1) ? nb_filters += 1 : false;
show_filter_infos(nb_filters);
},
error: (raw_data) => {
$(".user-update-spinner").hide();
@@ -1604,6 +1618,16 @@ function delete_user(uid) {
}
function show_filter_infos(nb_filters) {
if ($("#user_search").val().length != 0 || nb_filters != 0) {
if (total_users != "1") {
$(".filtered-users").html(filtered_users.replace(/%d/g, total_users));
} else {
$(".filtered-users").html(filtered_user.replace(/%d/g, total_users));
}
} else {
$(".filtered-users").html("");
}
if (nb_filters != 0) {
$(".advanced-filter-btn").css({
width: "80px",

13
admin/themes/default/template/user_list.tpl
View File

@@ -34,6 +34,8 @@ const hide_str = '{'Hide'|@translate|escape:javascript}';
const show_str = '{'Show'|@translate|escape:javascript}';
const user_added_str = '{'User %s added'|@translate|escape:javascript}';
const str_popin_update_btn = '{'Update'|@translate|escape:javascript}';
const filtered_users = '{'<b>%d</b> filtered users'|@translate|escape:javascript}';
const filtered_user = '{'<b>%d</b> filtered user'|@translate|escape:javascript}';
const history_base_url = "{$U_HISTORY}";
const view_selector = '{$view_selector}';
@@ -232,14 +234,15 @@ $(document).ready(function() {
<div class="not-in-selection-mode" style="width: 264px; height:2px">
</div>
</div>
<div class="filtered-users"></div>
<div class="advanced-filter-btn icon-filter">
<span>{'Filters'|@translate}</span>
<span class="filter-counter">2</span>
<span class="filter-counter"></span>
</div>
<div id='search-user'>
<div class='search-info'> </div>
{*This input (#user_search2) is used to bait the chrome autocomplete tool. It is hidden in navigator and is not meant to be seen.*}
<input id="user_search2" class='search-input' type='text' placeholder='{'Search'|@translate}'>
<input id="user_search2" class='search-input2' type='text' placeholder='{'Search'|@translate}'>
<span class='icon-search search-icon'> </span>
<span class="icon-cancel search-cancel"></span>
<input id="user_search" class='search-input' type='text' placeholder='{'Search'|@translate}'>
@@ -2426,4 +2429,10 @@ Advanced filter
margin:0 4px 0 7px;
display: none;
}
.filtered-users {
position: absolute;
right: 770px;
line-height: 38px;
}
</style>

2
language/en_UK/admin.lang.php
View File

@@ -1326,4 +1326,6 @@ $lang['Apply to root albums'] = 'Apply to root albums';
$lang['Album name must not be empty'] = 'Album name must not be empty';
$lang['Visit history'] = 'Visit history';
$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'Some photos are missing from your file system. Details provided by plugin Check Uploads';
$lang['<b>%d</b> filtered users'] = '<b>%d</b> filtered users';
$lang['<b>%d</b> filtered user'] = '<b>%d</b> filtered user';
// Leave this line empty

2
language/fr_FR/admin.lang.php
View File

@@ -1326,4 +1326,6 @@ $lang['Apply to root albums'] = 'Appliquer aux albums racine';
$lang['Album name must not be empty'] = 'Le nom de l\'album ne doit pas être vide';
$lang['Visit history'] = 'Historique des visites';
$lang['Some photos are missing from your file system. Details provided by plugin Check Uploads'] = 'Des photos sont absentes de votre système de fichier. À contrôler avec le plugin Check Uploads.';
$lang['<b>%d</b> filtered users'] = '<b>%d</b> utilisateurs filtrés';
$lang['<b>%d</b> filtered user'] = '<b>%d</b> utilisateur filtré';
// Leave this line empty