From 22932459cc9207f32ceceef5ebe6636a3d93bf51 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Sat, 2 Sep 2023 18:53:21 +0300
Subject: [PATCH] 0.7.13 find_routes block change

---
 RoutesApp/views.py                      |  3 ++-
 templates/blocks/b_find_route_form.html | 12 +++++++-----
 templates/blocks/b_header.html          |  2 +-
 templates/pages/p_main.html             |  5 ++++-
 templates/tb_base.html                  |  1 +
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/RoutesApp/views.py b/RoutesApp/views.py
index 5a947c7..bc6dc03 100644
--- a/RoutesApp/views.py
+++ b/RoutesApp/views.py
@@ -29,7 +29,8 @@ def route_search_results_View(request):
         Dict = {
             'routes': routes_Dict['routes'],
             'form': RouteForm(initial=data),
-            'last_block_routes': routes_Dict['last_block_routes']
+            'last_block_routes': routes_Dict['last_block_routes'],
+            'show_filter_and_results': True
         }
 
     t = loader.get_template('pages/p_results_find_route.html')
diff --git a/templates/blocks/b_find_route_form.html b/templates/blocks/b_find_route_form.html
index 6718bab..5035129 100644
--- a/templates/blocks/b_find_route_form.html
+++ b/templates/blocks/b_find_route_form.html
@@ -5,12 +5,14 @@
 
     {% include "forms/f_find_route_form_main_find_routes.html" %}
 
-    <div class="block-find-route">
+    {% if show_filter_and_results %}
+        <div class="block-find-route">
 
-        {% include "forms/f_find_route_filters_form.html" %}
+            {% include "forms/f_find_route_filters_form.html" %}
 
-        {% include "blocks/b_finded_routes.html" %}
+            {% include "blocks/b_finded_routes.html" %}
 
-        <div class="clear_both"></div>
-    </div>
+            <div class="clear_both"></div>
+        </div>
+    {% endif %}
 </form>
\ No newline at end of file
diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html
index 7bcf6ab..8f22a3b 100644
--- a/templates/blocks/b_header.html
+++ b/templates/blocks/b_header.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <header>
     <div class="header-first">
-      <div><a href="/routes/route_search_results/"><img class="svg" src="/static/img/svg/Logo.svg"></a></div>
+      <div><a href="/"><img class="svg" src="/static/img/svg/Logo.svg"></a></div>
       <div onclick="showMenu(this, event)"  class="dropdown">
           <img class="dropbtn" src="/static/img/svg/Menu.svg">
           <div
diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html
index 2eac33c..4f7254b 100644
--- a/templates/pages/p_main.html
+++ b/templates/pages/p_main.html
@@ -1,2 +1,5 @@
 {% extends 'tb_base.html' %}
-<a href="http://127.0.0.1:8016/en/routes/route_search_results/">Результат поиска поссылки переход</a>
\ No newline at end of file
+
+{% block content %}
+    {% include "blocks/b_find_route_form.html" %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tb_base.html b/templates/tb_base.html
index fe2ac5b..623c26b 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -43,6 +43,7 @@
 
     {% include 'blocks/b_header.html' %}
 
+
     {% block content %}
     {% endblock %}