0.7.16

connect form on static_pages

GeneralApp/views.py

@@ -64,7 +64,7 @@ def StaticPageView(request, url):
 
     if url == '':
         return MainPage(request)
-    elif url in ('customer_search', 'mover_search'):
+    elif url in ('for_movers', 'for_customers'):
         Dict.update({'route_form': RouteForm(),})
     # elif  url == 'works':
     #     return WorksPage(request)

templates/blocks/b_find_route_form.html

@@ -1,18 +1,20 @@
 {% load static %}
 
-<form name="find_route">
-    {% csrf_token %}
+{% if route_form %}
+    <form name="find_route">
+        {% csrf_token %}
 
-    {% include "forms/f_find_route_form_main_find_routes.html" %}
+        {% include "forms/f_find_route_form_main_find_routes.html" %}
 
-    {% if show_filter_and_results %}
-        <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>
-    {% endif %}
-</form>
+                <div class="clear_both"></div>
+            </div>
+        {% endif %}
+    </form>
+{% endif %}

templates/blocks/static_pages_blocks/b_customer_search.html

@@ -0,0 +1,3 @@
+<div class="cut-width">
+    {% include "blocks/b_find_route_form.html" %}
+</div>

templates/forms/f_find_route_form_main_find_routes.html

@@ -98,7 +98,7 @@
         <label style="opacity: 0">test</label>
         {% if show_filter_and_results %}
             <button onclick="filters_func_find_route_main(this,{{ owner_type }})">Найти</button>
-            {% else %}
+        {% else %}
             <button onclick="filters_func_find_route_main(this,'{{ owner_type }}','{% url "route_search_results_View" %}')">Найти</button>
         {% endif %}
     </div>

templates/pages/p_static_page.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    {% if page.url == 'customer_search' %}
+    {% if page.url == 'for_movers' or page.url == 'for_customers' %}
         {% include "blocks/static_pages_blocks/b_customer_search.html" %}
     {% endif %}
     {% if page.url == 'advertisement' %}