From e541bd036f8227bcd5d1cba61bbff7175220f1ac Mon Sep 17 00:00:00 2001
From: Zacharie <guetzac@gmail.com>
Date: Thu, 3 Sep 2020 17:13:42 +0200
Subject: [PATCH] Minor changes on search album page

---
 admin/themes/default/template/cat_search.tpl | 19 +++++++++----------
 admin/themes/default/theme.css               | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/admin/themes/default/template/cat_search.tpl b/admin/themes/default/template/cat_search.tpl
index 7f4018a70..05e651f1d 100644
--- a/admin/themes/default/template/cat_search.tpl
+++ b/admin/themes/default/template/cat_search.tpl
@@ -14,7 +14,6 @@ var categories = Object.values(data);
 
 var str_albums_found = '{"<b>%d</b> albums found"}';
 var str_album_found = '{"<b>1</b> album found"}';
-var str_title_page = '{'Album search tool'|@translate}'
 {literal}
 var editLink = "admin.php?page=album-";
 var colors = ["icon-red", "icon-blue", "icon-yellow", "icon-purple", "icon-green"];
@@ -32,12 +31,10 @@ function updateSearch () {
     $('.search-album-help').show();
     $('.search-album-ghost').show();
     $('.search-album-num-result').hide();
-    $('.titrePage h2, h1').html(str_title_page);
   } else {
     $('.search-album-ghost').hide();
     $('.search-album-help').hide();
     $('.search-album-num-result').show();
-    $('.titrePage h2, h1').html(str_title_page + ' [' + string + ']');
 
     nbResult = 0;
     categories.forEach((c) => {
@@ -124,14 +121,16 @@ $('.search-input').focus();
 </div>
 
 <div class="search-album">
-  <div class="search-album-label">{'Search albums'|@translate}</div>
-  <div class="search-album-input-container" style="position:relative">
-    <span class="icon-search search-icon"></span>
-    <span class="icon-cancel search-cancel"></span>
-    <input class='search-input' type="text" placeholder="{'Portraits'|@translate}">
+  <div class="search-album-cont">
+    <div class="search-album-label">{'Search albums'|@translate}</div>
+    <div class="search-album-input-container" style="position:relative">
+      <span class="icon-search search-icon"></span>
+      <span class="icon-cancel search-cancel"></span>
+      <input class='search-input' type="text" placeholder="{'Portraits'|@translate}">
+    </div>
+    <span class="search-album-help icon-help-circled" title="{'Enter a term to search for album'|@translate}"></span>
+    <span class="search-album-num-result"></span>
   </div>
-  <span class="search-album-help icon-help-circled" title="{'Enter a term to search for album'|@translate}"></span>
-  <span class="search-album-num-result"></span>
 </div>
 
 <div class="search-album-ghost">
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 09c68ba3f..193a5fb9a 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -4700,6 +4700,12 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   margin-bottom: 25px
 }
 
+.search-album-cont {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+
 .search-album-label {
   font-weight: bold;
   font-size: 16px;
@@ -4721,10 +4727,15 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 
 .search-album-help {
   cursor: help;
-  margin: 5px;
   font-size: 20px;
 }
 
+.search-album-help, .search-album-num-result {
+  position: absolute;
+  right: 0;
+  transform: translateX(calc(100% + 10px));
+}
+
 .search-album-ghost, .search-album-result {
   display: flex;
   flex-direction: column;