From 8f76b484ba20b303af33d3d06b89794d854c3664 Mon Sep 17 00:00:00 2001 From: SBD Date: Sat, 18 Nov 2023 16:30:27 +0300 Subject: [PATCH] 0.8.357 --- RoutesApp/views.py | 1 + static/css/mobile_styles.css | 14 ++++ static/css/styles(boris).css | 84 ++++++++++++++++++- static/js/filters_functions_find_route.js | 5 +- static/js/user_profile_2.js | 2 +- .../forms/f_find_route_filters_form.html | 34 +++++--- templates/tb_base.html | 11 +-- 7 files changed, 127 insertions(+), 24 deletions(-) diff --git a/RoutesApp/views.py b/RoutesApp/views.py index 98cdfe9..19fab4e 100644 --- a/RoutesApp/views.py +++ b/RoutesApp/views.py @@ -32,6 +32,7 @@ def route_search_results_View(request): 'show_filter_and_results': True, 'owner_type': data['owner_type'], 'last_el': routes_Dict['last_el'], + 'page_type': 'routes' } if 'from_address_point_txt' in routes_Dict: data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']}) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index f1bfe93..f3a11cb 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -534,6 +534,16 @@ position: absolute; width: 320px; } + .menu_buttons.left.close.filters{ + left: -347px; + transition: 200ms; + position: absolute; + width: 320px; + } + .block_w_paging.routes { + width: 100%; + float: right; + } .menu_buttons.left .handler_menu{ transform: rotate(90deg); left: -48px; @@ -618,6 +628,7 @@ .text_f_curtain{ display: inline-block; + font-size: 13px; } .menu_profile{ @@ -643,6 +654,9 @@ top: 0; right: 0; } + .block_overlay.show.routes{ + display: block; + } #customer>a, #mover>a{ left: 5%; } diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 78c93e9..af4b931 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2300,6 +2300,20 @@ position: absolute; width: 320px; } + +.menu_buttons.left.close.filters{ + width: 294px; + background: #FFFFFF; + border-radius: 10px; + max-height: 83vh; + left: 0; + padding: 13px; + transition: 200ms; + /* position: fixed; */ + float: left; + text-align: left; + top: 0; +} .menu_buttons.right.open{ right: 0; transition: 200ms; @@ -2326,15 +2340,16 @@ } .menu_buttons.left.open.filters{ - width: 300px; + width: 294px; background: #FFFFFF; border-radius: 10px; max-height: 83vh; left: 0; - padding: 10px; + padding: 13px; transition: 200ms; /* position: fixed; */ float: left; + text-align: left; } .support .menu_buttons.left.open{ @@ -2526,3 +2541,68 @@ padding-bottom: 20px; } +/* checkbox type transport*/ + +.checkbox_type_transport{ + width: 100%; + display: block; + margin-bottom: 25px; +} + + + +.input_f_checkbox_type_transport{ + display: none; +} + +.label_f_checkbox_type_transport{ + width: 100%; + display: block; +} + +.trigger_f_type_transport{ + width: 30px; + height: 30px; + border: 1px solid #E6E6E6; + float: left; + border-radius: 10px; +} + +.input_f_checkbox_type_transport:checked + label > .trigger_f_type_transport{ + background: #FF613A; +} + +.img_f_checkbox_type_transport{ + display: inline-block; + padding-top: 11px; + padding-left: 5px; + width: 12px; +} + +.span_f_checkbox_type_transport{ + color: #000000; + float: right; + display: block; + width: calc(100% - 55px); + padding-left: 5px; + padding-top: 5px; + +} + +.block_overlay.show.routes{ + display: none; +} + +.menu_buttons.left.close.filters{ + width: 294px; + background: #FFFFFF; + border-radius: 10px; + max-height: 83vh; + left: 0; + padding: 13px; + transition: 200ms; + /* position: fixed; */ + float: left; + text-align: left; + top: 0; +} \ No newline at end of file diff --git a/static/js/filters_functions_find_route.js b/static/js/filters_functions_find_route.js index 18d8683..66b3b56 100644 --- a/static/js/filters_functions_find_route.js +++ b/static/js/filters_functions_find_route.js @@ -92,12 +92,11 @@ function ajax_for_filter (data_d,get_url){ let new_page_routes = document.createElement("div") new_page_routes.classList.add("page_paging_elements_" + page_iterator) let insert_place_main = document.querySelector(".block-finded-routes") - if (insert_place_main){ + if (insert_place_main) { insert_place_main.innerHTML = '' insert_place_main.appendChild(new_page_routes) } - - // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); + // // $(new_page_routes).insertAfter(".page_pagingelements_" + old_page_iterator); // let line_separator = document.createElement("div") // line_separator.classList.add("line_separator_page_w_el") // $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 8cdcc8e..2c7d141 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -779,7 +779,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ handler_text.style.fontSize = '13px' } else { handler_text.innerHTML = curtain_name - handler_text.style.fontSize = '16px' + handler_text.style.fontSize = '13px' } if (!curtain.classList.contains('open')){ diff --git a/templates/forms/f_find_route_filters_form.html b/templates/forms/f_find_route_filters_form.html index 59f2d61..c9793f5 100644 --- a/templates/forms/f_find_route_filters_form.html +++ b/templates/forms/f_find_route_filters_form.html @@ -16,19 +16,27 @@ {# #} {% for item in route_form.fields.type_transport.choices %} {% if forloop.counter0 > 0 %} -
- - -
- {% if not page_type == 'profile' %} + {% if page_type == 'routes' %}
-
+
{% include "forms/f_find_route_filters_form.html" %}
-
Меню
+
Фильтры