From 9b4e1c743a5926a73d4b4d248f2df9242273e18d Mon Sep 17 00:00:00 2001
From: lalka2016 <99399973+lalka2016@users.noreply.github.com>
Date: Wed, 24 May 2023 16:49:10 +0300
Subject: [PATCH] Small improvements

---
 Web/Presenters/templates/@layout.xml      |  6 ++---
 Web/Presenters/templates/Search/Index.xml | 29 ++++++++++++-----------
 Web/static/css/main.css                   | 13 ++++++++--
 Web/static/js/openvk.cls.js               | 22 ++++++++++++++++-
 locales/en.strings                        |  3 ++-
 locales/ru.strings                        |  3 ++-
 6 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index ed593490..cee07a9c 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -88,8 +88,8 @@
                             <div class="link dec">
                                 <a href="/logout?hash={urlencode($csrfToken)}">{_header_log_out}</a>
                             </div>
-                            <div class="link">
-                                {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")}
+                            {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")}
+                            <div class="{if $atSearch}nodivider{else}link{/if}">
 
                                 {if !$atSearch}
                                     <form action="/search" method="get" id="searcher">
@@ -105,7 +105,7 @@
                                     </form>
                                 {else}
                                     <form action="/search" method="get" id="searcher">
-                                        <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: 548px;" title="{_header_search} [Alt+Shift+F]" accesskey="f" />
+                                        <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>
                                             <option value="groups"   {if str_contains($_SERVER['REQUEST_URI'], "type=groups")}selected{/if}>{_s_by_groups}</option>
diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml
index 7bae1c7f..c638b71d 100644
--- a/Web/Presenters/templates/Search/Index.xml
+++ b/Web/Presenters/templates/Search/Index.xml
@@ -122,6 +122,12 @@
 {/block}
 
 {block content}
+    <style>
+    .comment, .post-divider 
+    {
+        border:none;
+    }
+    </style>
     <div style="margin-top:-7px">
     {include "../components/paginator.xml", conf => (object) [
         "page"     => $page,
@@ -138,7 +144,7 @@
     {include searchOptions}
 
     {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
-    <div class="container_gray" style="float:left;width:68%;border-top:1px solid #E5E7E6">
+    <div class="container_gray" style="float:left;width:70%;border-top:1px solid #E5E7E6">
         {if sizeof($data) > 0}
             {if $type == "users" || $type == "groups" || $type == "apps"}
                 <div class="content" n:foreach="$data as $dat">
@@ -171,16 +177,9 @@
                     </table>
                 </div>
             {elseif $type == "posts"}
-                {foreach $data as $dat}
-                    {if $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()}
-                        {php continue;}
-                        {* костыль но я по-другому не придумал *}
-                    {else}
-                        <div class="content">
-                            {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true}
-                        </div>
-                    {/if}
-                {/foreach}
+                <div n:foreach="$data as $dat" class="content">
+                {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true}
+                </div>
             {elseif $type == "comments"}
                 <div n:foreach="$data as $dat" class="content">
                 {include "../components/comment.xml", comment => $dat, linkW => true}
@@ -230,7 +229,7 @@
         <div class="searchOption">
             <div class="searchOptionName" id="n_sort" onclick="hideParams('sort')"><img src="/assets/packages/static/openvk/img/hide.png" class="searchHide">{_s_order_by}</div>
             <div class="searchOptionBlock" id="s_sort">
-                <select name="sort" form="searcher">
+                <select name="sort" form="searcher" id="sortyor" onchange="this.value == 'random' ? document.getElementById('invertor').setAttribute('hidden', 'hidden') : document.getElementById('invertor').removeAttribute('hidden')">
                     <option value="id" {if $_GET["sort"] == "name"}selected{/if}>{_s_order_by_id}</option>
                     <option value="random" {if $_GET["sort"] == "random"}selected{/if}>{_s_order_by_random}</option>
                     {if $type == "users"}
@@ -240,7 +239,9 @@
                         {/if}
                     {/if}
                 </select>
+                <div id="invertor" {if $_GET["sort"] == "random"}hidden{/if}>
                 <input type="checkbox" name="invert" value="1" form="searcher" {if !is_null($_GET['invert']) && $_GET['invert'] == "1"}checked{/if}>{_s_order_invert}
+                </div>
             </div>
         </div>
 
@@ -275,6 +276,7 @@
                 <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 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>
 
@@ -330,10 +332,9 @@
                 <input type="text" value="{if !is_null($_GET['fav_quote'])}{$_GET['fav_quote']}{/if}" form="searcher" placeholder="{_favorite_quotes}"  name="fav_quote">
             </div>
         </div>
-
-        <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}
         <!--<input name="with_photo" type="checkbox" {if !is_null($_GET['with_photo']) && $_GET['with_photo'] == "on"}checked{/if} form="searcher">{_s_with_photo}-->
         {/if}
+        <input class="button" type="button" id="dnt" value="{_reset}" onclick="resetSearch()">
     </div>
 
 {/block}
\ No newline at end of file
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index caa0e022..da6dc236 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -97,6 +97,14 @@ h1 {
     background-size: 1.5px 41px;
 }
 
+.header_navigation .nodivider {
+    display: inline-block;
+    height: 29px;
+    padding: 11px 4px 0 7px;
+    background: none;
+    background-size: 1.5px 41px;
+}
+
 .header_navigation .link a {
     color: #D7D7D7;
     text-decoration: none;
@@ -670,6 +678,7 @@ select {
     font-family: tahoma, verdana, arial, sans-serif;
     width: 100%;
     box-sizing: border-box;
+    outline:none;
 }
 
 .header2 {
@@ -2306,10 +2315,9 @@ a.poll-retract-vote {
     overflow-y: hidden;
     background:#F7F7F7;
     overflow-x:hidden;
-    width:29.2%;
+    width:28.8%;
     border-top:1px solid #E5E7E6;
     float:right;
-    padding-left:9.6px;
     scrollbar-width: none;
     font-size:12px;
     background-color:#f7f7f7;
@@ -2339,6 +2347,7 @@ a.poll-retract-vote {
 .searchList
 {
     list-style: none;
+    user-select: none;
     padding-left:0px;
 }
 
diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js
index 5eb4318d..77b2e3ed 100644
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@@ -579,7 +579,7 @@ function expandSearch()
     
     document.querySelector(".whatFind").style.display = "block";
     document.querySelector(".whatFind").style.marginRight = "-80px";
-    document.getElementById("searchInput").style.width = "650px";
+    document.getElementById("searchInput").style.width = "627px";
 }
 
 async function decreaseSearch()
@@ -612,6 +612,26 @@ function hideParams(name)
     }
 }
 
+function resetSearch()
+{
+    let inputs = document.querySelectorAll("input")
+    let selects = document.querySelectorAll("select")
+
+    for(const input of inputs)
+    {
+        if(input != dnt) {
+            input.value = ""
+        }
+    }
+
+    for(const select of selects)
+    {
+        if(select != sortyor) {
+            select.value = 0
+        }
+    }
+}
+
 $(document).on("scroll", () => {
     if($(document).scrollTop() > $(".sidebar").height() + 50) {
         $(".floating_sidebar")[0].classList.add("show");
diff --git a/locales/en.strings b/locales/en.strings
index a2b3e1aa..891d9664 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -1505,4 +1505,5 @@
 "s_with_photo" = "with photo";
 "s_only_in_names" = "only in names";
 
-"s_any" = "any";
\ No newline at end of file
+"s_any" = "any";
+"reset" = "Reset";
\ No newline at end of file
diff --git a/locales/ru.strings b/locales/ru.strings
index f6f1bef8..24d0f078 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -1399,4 +1399,5 @@
 "s_with_photo" = "с фото";
 "s_only_in_names" = "только в именах";
 
-"s_any" = "любой";
\ No newline at end of file
+"s_any" = "любой";
+"reset" = "Сброс";
\ No newline at end of file