diff --git a/GeneralApp/views.py b/GeneralApp/views.py index e11c7a4..7819794 100644 --- a/GeneralApp/views.py +++ b/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) diff --git a/templates/blocks/b_find_route_form.html b/templates/blocks/b_find_route_form.html index 5035129..3250b10 100644 --- a/templates/blocks/b_find_route_form.html +++ b/templates/blocks/b_find_route_form.html @@ -1,18 +1,20 @@ {% load static %} -
- {% csrf_token %} +{% if route_form %} + + {% 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 %} -
+ {% if show_filter_and_results %} +
- {% 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" %} -
-
- {% endif %} - \ No newline at end of file +
+
+ {% endif %} + +{% endif %} \ No newline at end of file diff --git a/templates/blocks/static_pages_blocks/b_customer_search.html b/templates/blocks/static_pages_blocks/b_customer_search.html index e69de29..ac5c32f 100644 --- a/templates/blocks/static_pages_blocks/b_customer_search.html +++ b/templates/blocks/static_pages_blocks/b_customer_search.html @@ -0,0 +1,3 @@ +
+ {% include "blocks/b_find_route_form.html" %} +
\ No newline at end of file diff --git a/templates/forms/f_find_route_form_main_find_routes.html b/templates/forms/f_find_route_form_main_find_routes.html index 8eb3cd2..6fac1d9 100644 --- a/templates/forms/f_find_route_form_main_find_routes.html +++ b/templates/forms/f_find_route_form_main_find_routes.html @@ -98,7 +98,7 @@ {% if show_filter_and_results %} - {% else %} + {% else %} {% endif %} diff --git a/templates/pages/p_static_page.html b/templates/pages/p_static_page.html index 8907ba8..8018b52 100644 --- a/templates/pages/p_static_page.html +++ b/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' %}