From 4041fbc345fbb4a49ad00d4dc31ee795887d8ddd Mon Sep 17 00:00:00 2001
From: lalka2016 <99399973+lalka2016@users.noreply.github.com>
Date: Mon, 29 May 2023 20:48:05 +0300
Subject: [PATCH] Fix debilny oshibky
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Убрал лишние ключи локализации, исправил панель поеска и исправил hometown
---
 Web/Presenters/templates/@layout.xml            | 6 +++---
 Web/Presenters/templates/Search/Index.xml       | 2 +-
 Web/Presenters/templates/components/comment.xml | 4 ++--
 Web/static/css/main.css                         | 6 +++---
 locales/en.strings                              | 9 ---------
 locales/ru.strings                              | 9 ---------
 locales/ru_old.strings                          | 9 ---------
 locales/ru_sov.strings                          | 9 ---------
 8 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index cee07a9c..48c2b839 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -92,9 +92,9 @@
                             <div class="{if $atSearch}nodivider{else}link{/if}">
 
                                 {if !$atSearch}
-                                    <form action="/search" method="get" id="searcher">
+                                    <form action="/search" method="get" id="searcher" style="position:relative;">
                                         <input id="searchInput" onfocus="expandSearch()" onblur="decreaseSearch()" class="sr" type="search" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
-                                        <select name="type" class="whatFind" style="display:none;">
+                                        <select name="type" class="whatFind" style="display:none;top: 0px;">
                                             <option value="users">{_s_by_people}</option>
                                             <option value="groups">{_s_by_groups}</option>
                                             <option value="posts">{_s_by_posts}</option>
@@ -104,7 +104,7 @@
                                         </select>
                                     </form>
                                 {else}
-                                    <form action="/search" method="get" id="searcher">
+                                    <form action="/search" method="get" id="searcher" style="margin-top: -1px;position:relative;">
                                         <input id="searchInput" value="{$_GET['query'] ?? ''}" type="search" class="sr" name="query" placeholder="{_header_search}" style="height: 20px;background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 555px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
                                         <select name="type" class="whatFind">
                                             <option value="users"    {if str_contains($_SERVER['REQUEST_URI'], "type=users")}selected{/if}>{_s_by_people}</option>
diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml
index 7bb81e91..4d9ade92 100644
--- a/Web/Presenters/templates/Search/Index.xml
+++ b/Web/Presenters/templates/Search/Index.xml
@@ -293,7 +293,7 @@
             <div class="searchOptionBlock" id="s_main">
                 <input type="text" value="{if !is_null($_GET['status'])}{$_GET['status']}{/if}" form="searcher" placeholder="{_status}" name="status">
                 <input type="text" value="{if !is_null($_GET['city'])}{$_GET['city']}{/if}" form="searcher" placeholder="{_city}" name="city">
-                <input type="text" value="{if !is_null($_GET['native_city'])}{$_GET['native_city']}{/if}" form="searcher" placeholder="{_s_native_city}" name="native_city">
+                <input type="text" value="{if !is_null($_GET['hometown'])}{$_GET['hometown']}{/if}" form="searcher" placeholder="{_hometown}" name="hometown">
                 <input name="is_online" type="checkbox" {if !is_null($_GET['is_online']) && $_GET['is_online'] == "1"}checked{/if} form="searcher" value="1">{_s_now_on_site}
             </div>
         </div>
diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml
index 94813a5f..0c725714 100644
--- a/Web/Presenters/templates/components/comment.xml
+++ b/Web/Presenters/templates/components/comment.xml
@@ -31,9 +31,9 @@
                     <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
                         <a {if is_null($linkW)}href="#_comment{$comment->getId()}"{else}href="wall{!is_null($comment->getTarget()) ? $comment->getTarget()->getPrettyId() : $comment->getOwner()->getId()}#_comment{$comment->getId()}"{/if} class="date">{$comment->getPublicationTime()}</a>&nbsp;|
                         {if $comment->canBeDeletedBy($thisUser)}
-                            <a href="/comment{$comment->getId()}/delete">{_delete}</a>
+                            <a href="/comment{$comment->getId()}/delete">{_delete}</a>&nbsp;|
                         {/if}
-                        {if is_null($linkW)}&nbsp;|
+                        {if is_null($linkW)}
                         <a class="comment-reply">{_reply}</a>{/if}
                         <div style="float: right; font-size: .7rem;">
                             <a class="post-like-button" href="/comment{$comment->getId()}/like?hash={rawurlencode($csrfToken)}">
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index f2241092..09d625ba 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2328,7 +2328,7 @@ a.poll-retract-vote {
     border: solid 1px #575757;
     background-color: #696969;
     color:white;
-    margin-left: -3px;
+    margin-left: -11px;
     padding-bottom:2px;
     width:80px;
     cursor: pointer;
@@ -2416,8 +2416,8 @@ a.poll-retract-vote {
     border:none;
     position:absolute;
     width:150px;
-    right:95px;
-    top:12px;
+    cursor:pointer;
+    right:80px;
     text-align:right;
 }
 
diff --git a/locales/en.strings b/locales/en.strings
index 482fed16..b36ec078 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -1490,17 +1490,8 @@
 "s_date_before" = "Before";
 "s_date_after" = "After";
 
-"s_region" = "Region";
-"s_city" = "City";
-"s_native_city" = "Hometown";
-
 "s_main" = "Main";
-"s_age" = "Age";
-"s_sex" = "Sex";
-"s_wemen" = "Woman";
-"s_man" = "Man";
 
-"s_relationship" = "Relationship";
 "s_now_on_site" = "now on site";
 "s_with_photo" = "with photo";
 "s_only_in_names" = "only in names";
diff --git a/locales/ru.strings b/locales/ru.strings
index 92961cdb..dd3157e2 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -1384,17 +1384,8 @@
 "s_date_before" = "До";
 "s_date_after" = "После";
 
-"s_region" = "Регион";
-"s_city" = "Город";
-"s_native_city" = "Родной город";
-
 "s_main" = "Основное";
-"s_age" = "Возраст";
-"s_sex" = "Пол";
-"s_wemen" = "Женский";
-"s_man" = "Мужской";
 
-"s_relationship" = "Семейное положение";
 "s_now_on_site" = "cейчас на сайте";
 "s_with_photo" = "с фото";
 "s_only_in_names" = "только в именах";
diff --git a/locales/ru_old.strings b/locales/ru_old.strings
index 6df9ce4b..c75889db 100644
--- a/locales/ru_old.strings
+++ b/locales/ru_old.strings
@@ -760,17 +760,8 @@
 "s_date_before" = "До";
 "s_date_after" = "После";
 
-"s_region" = "Губернiя";
-"s_city" = "Городъ";
-"s_native_city" = "Родной городъ";
-
 "s_main" = "Основное";
-"s_age" = "Возрастъ";
-"s_sex" = "Полъ";
-"s_wemen" = "Женскiй";
-"s_man" = "Мужской";
 
-"s_relationship" = "Семейное положенiе";
 "s_now_on_site" = "cейчас тутъ";
 "s_with_photo" = "с фотокарточкой";
 "s_only_in_names" = "только в имѣнахъ";
diff --git a/locales/ru_sov.strings b/locales/ru_sov.strings
index 3f40e51d..56b3cffe 100644
--- a/locales/ru_sov.strings
+++ b/locales/ru_sov.strings
@@ -965,17 +965,8 @@
 "s_date_before" = "До";
 "s_date_after" = "После";
 
-"s_region" = "Область";
-"s_city" = "Город";
-"s_native_city" = "Место рождения";
-
 "s_main" = "Паспорт";
-"s_age" = "Возраст";
-"s_sex" = "Пол";
-"s_wemen" = "Женский";
-"s_man" = "Мужской";
 
-"s_relationship" = "Семейное положение";
 "s_now_on_site" = "cейчас доступен";
 "s_with_photo" = "с фотокарточкой";
 "s_only_in_names" = "только в паспорте";