From 01f34e4fb2555d0fe136762433aa81e3f38cc258 Mon Sep 17 00:00:00 2001
From: AK Delfin <ak@argumenti.ru>
Date: Sun, 30 Oct 2022 23:47:30 +0300
Subject: [PATCH] add filters search

---
 blocks/header.php |  2 +-
 functions.php     |  6 ++++--
 header.php        |  2 +-
 search.php        | 48 +++++++++++++++++++++++++++++++++--------------
 style.css         | 22 +++++++++++++++++++++-
 5 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/blocks/header.php b/blocks/header.php
index 12f35a2..05bc5f2 100644
--- a/blocks/header.php
+++ b/blocks/header.php
@@ -40,7 +40,7 @@
             </div>
 
            <ul id="header_icons">
-                <a href="<?=get_site_url()?>?s="><li class="btn_search"></li></a>
+                <a href="<?=get_site_url()?>?s=ВиЖ"><li class="btn_search"></li></a>
                 <a href="<?=get_site_url()?>/rss/news.xml"><li class="btn_rss"></li></a>
                 <li class="toggle-nav" id="toggle-nav"></li>
                 <a href="<?=get_site_url().vij_lang('btn_lan_link', LANG_VERSION)?>"><li class="btn_lan"><nobr><?=vij_lang('btn_lan', LANG_VERSION)?></nobr></li></a>     
diff --git a/functions.php b/functions.php
index 07953ce..af98ac2 100644
--- a/functions.php
+++ b/functions.php
@@ -173,8 +173,10 @@ add_filter( 'single_template', function ( $single_template ) {
 #search
 function my_search_order( $query ) {
     if ($query->is_search) {
-  $query->set( 'order', 'DESC' );
-        $query->set( 'orderby', 'date' );
+        if (!isset($_GET['search_type']) OR $_GET['search_type'] == 'date'){
+            $query->set( 'order', 'DESC' );
+            $query->set( 'orderby', 'date' );
+        }    
     };
     return $query;
 };
diff --git a/header.php b/header.php
index ff6e257..d4f8cf1 100644
--- a/header.php
+++ b/header.php
@@ -10,7 +10,7 @@
         <?if (defined('TESTMODE') and TESTMODE == 1):?>
             <link rel="stylesheet" href="<?php echo get_template_directory_uri();?>/style-test.css?ver=3">
         <?else:?>    
-            <link rel="stylesheet" href="<?php echo get_stylesheet_uri();?>?ver=283">
+            <link rel="stylesheet" href="<?php echo get_stylesheet_uri();?>?ver=315">
         <?endif?>   
         <link href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" rel="stylesheet">
         <!--<link href="<?php echo get_stylesheet_directory_uri()?>/pub/fontawesome.css" rel="stylesheet">-->
diff --git a/search.php b/search.php
index 0a3035f..5a5515c 100644
--- a/search.php
+++ b/search.php
@@ -7,6 +7,16 @@
 get_header();?>
 
 
+<?if (trim($s) !== ''):?>
+
+<?$params = [
+    'post_type'   => 'post',
+    's' => $s,
+    'post_status' => 'publish',
+    'posts_per_page' => 20
+]?>   
+
+
 
 <div id="content">    
 
@@ -16,21 +26,11 @@ get_header();?>
 
 <div id="search-form">
 	<form action="<?php bloginfo( 'url' ); ?>" method="get">
-        <input class="search-text" type="text" name="s" placeholder="<?=$s?>" value=""/>
+        <input class="search-text" type="text" name="s" placeholder="Найти" value="<?=$s?>"/>
         <input class="search_submit" type="submit" value="Найти"/>
-    </form>
-</div>	
 
-<?if (trim($s) !== ''):?>
-
- <?$params = [
-     'post_type'   => 'post',
-     's' => $s,
-     'post_status' => 'publish',
-     'posts_per_page' => 20
- ]?>   
-
-<p class="search-result">По запросу «<?php
+        <div class="search-result">
+        По запросу «<?php
 $allsearch = new WP_Query($params);
 $key = esc_html($s, 1);
 $count = $allsearch->post_count; _e('');
@@ -45,7 +45,27 @@ else:
   echo $count . ' '; _e('результата');
  endif;
 endif;
-//wp_reset_query(); ?></p>
+//wp_reset_query(); ?>
+
+        </div>
+
+        <div id="find_panel">
+            <select class="search-select" id="search_type" name="search_type">
+                <option value="date">По дате</option>
+                <option value="revel" <?if($_GET['search_type'] == 'revel'):?> selected<?endif?>>По релевантности</option>
+            </select>  
+            <select class="search-select" id="search_date" name="search_date">
+                <option value="all" selected>За все время</option>
+            </select>  
+        </div>    
+    </form>
+</div>	
+
+
+
+
+
+
 
 <?php if(have_posts()) :?>
 <div class="search-card-box">
diff --git a/style.css b/style.css
index 206e1a0..b0b7ff6 100644
--- a/style.css
+++ b/style.css
@@ -270,6 +270,25 @@ a{
     height: 50px;
   }  
 
+  #find_panel{
+    margin-top: 28px;
+    margin-bottom: 32px;
+    padding-top: 22px;
+    padding-bottom: 22px;
+    border-top: 1px solid #E9EAEB;
+    border-bottom: 1px solid #E9EAEB;
+  }
+
+  .search-select{
+    width: 155px;
+    border: 0px;
+    background:none;
+    font-size: 14px;
+    line-height: 12px;
+    padding-left: 8px;
+    }
+
+
   .search-text{
     width: 60%;
     height: 50px;
@@ -284,7 +303,8 @@ a{
   .search-result{
     font-size: 14px;
     line-height: 160%;
-    padding-bottom: 12px;
+    padding-top: 24px;
+    padding-bottom: 8px;
   }  
 
   .search-card-box{