From a2d6f433b7071678bcb0319f709ff87f1a9b77ca Mon Sep 17 00:00:00 2001 From: Zacharie Date: Tue, 7 Jul 2020 15:58:57 +0200 Subject: [PATCH] Issue #1193 : Minor fixes on search info --- admin/themes/default/js/tags.js | 14 +++++++------- admin/themes/default/template/tags.tpl | 3 +-- admin/themes/default/theme.css | 5 ++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/admin/themes/default/js/tags.js b/admin/themes/default/js/tags.js index 0b179cd9f..9e7a0beb4 100644 --- a/admin/themes/default/js/tags.js +++ b/admin/themes/default/js/tags.js @@ -769,7 +769,7 @@ function tagListToString(list) { var maxShown = 100; var searchTimeOut; -var delaySearchInput = 500; +var delaySearchInput = 300; $("#search-tag .search-input").on("input", function() { actualPage = 1; @@ -1018,9 +1018,9 @@ $('.tag-pagination-select input[type="radio"]').on('click',function () { }) function updateSearchInfo () { - $('.search-info').html(str_showing.replace('%d1', $('.tag-box').length).replace('%d2', dataTags.length)); -} - -$(function() { - updateSearchInfo(); -}) + if ($('.search-input').val() != '') { + $('.search-info').html(str_filtered_on.replace('%d', dataTags.filter(isDataSearched).length)); + } else { + $('.search-info').html(''); + } +} \ No newline at end of file diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl index c249efb3f..8028f514a 100644 --- a/admin/themes/default/template/tags.tpl +++ b/admin/themes/default/template/tags.tpl @@ -24,8 +24,7 @@ var str_select_all_tag = '{'Select all %d tags'|@translate}'; var str_clear_selection = '{'Clear Selection'|@translate}'; var str_selection_done = '{'The %d tags on this page are selected'|@translate}'; var str_tag_selected = '{'%d tag selected'|@translate}'; -var str_showing = '{'Showing %d1 out of %d2'|@translate}'; -var str_filtered_on = '{'Filtered on %d tags'|@translate}'; +var str_filtered_on = '{'%d tags found'|@translate}'; {/footer_script} {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 169d046fa..e507456a7 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -264,7 +264,7 @@ TABLE.doubleSelect SELECT.categoryList { .search-info { position: absolute; - left: 0px; + left: -10px; top: 50%; transform: translate(-100%,-50%); font-style: italic; @@ -3706,8 +3706,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; align-items: center; font-size: 14px; display: none; - margin: 10px; - margin-right: 223px; + margin: 10px 243px 10px 32px; color: #0051a5; font-weight: 600; }