Issue #1193 : minor design fix

Piwigo · Jul 7, 2020 · ed237dc · ed237dc
1 parent 9a1ce36
commit ed237dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/admin/themes/default/js/tags.js b/admin/themes/default/js/tags.js
@@ -515,6 +515,7 @@ function updateSelectionContent() {
     $('#MergeSelectionMode').removeClass('unavailable');
     if (mergeOption) {
       $('#MergeOptionsBlock').show();
+      $('.selection-mode-tag').hide();
       updateMergeItems();
     } else {
       $('#MergeOptionsBlock').hide();
@@ -1018,8 +1019,13 @@ $('.tag-pagination-select input[type="radio"]').on('click',function () {
 })
 
 function updateSearchInfo () {
-  if ($('.search-input').val() != '') {    
-    $('.search-info').html(str_filtered_on.replace('%d', dataTags.filter(isDataSearched).length));
+  if ($('.search-input').val() != '') { 
+    let number = dataTags.filter(isDataSearched).length;   
+    if (number > 1) {
+      $('.search-info').html(str_tags_found.replace('%d', number));
+    } else {
+      $('.search-info').html(str_tag_found.replace('%d', number));
+    }
   } else {
     $('.search-info').html('');
   }

diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
@@ -24,7 +24,8 @@ 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 = '{'<b>%d</b> tag selected'|@translate}';
-var str_filtered_on = '{'<b>%d</b> tags found'|@translate}';
+var str_tags_foud = '{'<b>%d</b> tags found'|@translate}';
+var str_tag_foud = '{'<b>%d</b> tag 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
@@ -1,3 +1,8 @@
+/* Fix bold in MACOS */
+* {
+  -moz-osx-font-smoothing: grayscale;
+}
+
 /* content.css */
 [class*="icon-"]:before { text-decoration:none !important; }
 
@@ -2607,6 +2612,10 @@ input:checked + .slider:before {
   font-size: 20px !important;
 }
 
+
+.jconfirm-buttons .btn {
+  text-transform: none !important;
+}
 /*Group checkbox*/
 
 .Group-checkbox{
@@ -3526,7 +3535,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 }
 
 .tag-container .tag-box .showOptions {
-  color: #777;
+  color: #aaa;
 }
 
 .tag-container .tag-box.edit-name .showOptions {