From db91af2a52d471b974560e16f5853b429776dd37 Mon Sep 17 00:00:00 2001
From: Maxim Leshchenko <cnmaks90@gmail.com>
Date: Tue, 14 Dec 2021 22:43:10 +0200
Subject: [PATCH] Search: Fix redesign This commit makes the search workable,
 fixes the length of the search button, translates the placeholder and returns
 the number of results

---
 Web/Presenters/templates/Search/Index.xml | 10 +++++++---
 Web/static/css/style.css                  |  2 ++
 locales/en.strings                        |  1 +
 locales/ru.strings                        |  1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml
index 3eaa281c..52279b8c 100644
--- a/Web/Presenters/templates/Search/Index.xml
+++ b/Web/Presenters/templates/Search/Index.xml
@@ -31,11 +31,15 @@
         </a>
     </div>
 
-    <div class="header_search_inputbt">
+    <form class="header_search_inputbt">
         <input name="type" type="hidden" value="{$type ?? 'users'}" />
-        <input type="" name="" class="header_search_input" placeholder="Начните вводить любое имя, название или слово">
+        <input name="query" class="header_search_input" placeholder="{_search_placeholder}" value="{$_GET['query'] ?? ''}" />
         <button class="button_search">{_search_button}</button>
-    </div>
+    </form>
+
+    <p style="margin-left: 15px; margin-top: 0;">
+        <b>{tr("results", $count)}</b>
+    </p>
 {/block}
 
 {block link|strip|stripHtml}
diff --git a/Web/static/css/style.css b/Web/static/css/style.css
index 845543aa..26f4b546 100644
--- a/Web/static/css/style.css
+++ b/Web/static/css/style.css
@@ -1610,6 +1610,7 @@ body.scrolled .toTop:hover {
     padding: 10px;
     border-top: 1px solid #ebebeb;
     display: flex;
+    margin-bottom: 0;
 }
 
 .header_search_input {
@@ -1638,6 +1639,7 @@ body.scrolled .toTop:hover {
     cursor: pointer;
     text-decoration: none;
     margin-left: 10px;
+    width: 7.5%;
 }
 
 .content_search {
diff --git a/locales/en.strings b/locales/en.strings
index 9669b070..8ea074b5 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -362,6 +362,7 @@
 "search_for_groups" = "Search for groups";
 "search_for_people" = "Search for people";
 "search_button" = "Find";
+"search_placeholder" = "Start typing any name, title or word";
 "results_zero" = "No results";
 "results_one" = "$1 result";
 "results_other" = "$1 results";
diff --git a/locales/ru.strings b/locales/ru.strings
index 5e3f9345..6b73dbcf 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -380,6 +380,7 @@
 "search_for_groups" = "Поиск групп";
 "search_for_people" = "Поиск людей";
 "search_button" = "Найти";
+"search_placeholder" = "Начните вводить любое имя, название или слово";
 "results_zero" = "Ни одного результата";
 "results_one" = "Один результат";
 "results_few" = "$1 результата";