diff --git a/static/v2/css/widgets/w_route_card.css b/static/v2/css/widgets/w_route_card.css index af7bcd6..6f5356d 100644 --- a/static/v2/css/widgets/w_route_card.css +++ b/static/v2/css/widgets/w_route_card.css @@ -345,16 +345,19 @@ } } .place_title{ - --max-width: calc(var(--from-to-place-data-width) - 45.3px); + --gradient_100: var(--max-width); + --max-width: calc(var(--from-to-place-data-width) - 52.3px); font-size: var(--big-font-size); font-weight: 800; max-width: var(--max-width); overflow: hidden; white-space: nowrap; - color: transparent; - background-clip: text; - -webkit-background-clip: text; - background-image: linear-gradient(90deg, rgb(0 0 0) 0%, #FFFFFF calc(var(--max-width) - 30px)); + &.gradient{ + color: transparent; + background-clip: text; + -webkit-background-clip: text; + background-image: linear-gradient(90deg, rgb(0 0 0) 0%, #FFFFFF var(--gradient_100)); + } } } } diff --git a/static/v2/js/blocks/b_search_routes.js b/static/v2/js/blocks/b_search_routes.js index 09d812d..59fc6e6 100644 --- a/static/v2/js/blocks/b_search_routes.js +++ b/static/v2/js/blocks/b_search_routes.js @@ -1,8 +1,9 @@ -function searchRoutes (form) { +function searchRoutes (form=undefined) { event.preventDefault() let $filter_form = $('.b_filter_routes form')[0]; + let $search_form = $('.b_search_routes form')[0]; - let formData = getFormData(form); + let formData = getFormData($search_form); formData = getFormData($filter_form, formData); formData.append('owner_type', 'customer'); diff --git a/static/v2/js/forms.js b/static/v2/js/forms.js index ad2edd9..d167bea 100644 --- a/static/v2/js/forms.js +++ b/static/v2/js/forms.js @@ -1,4 +1,4 @@ -function chooseCheckbox(el) { +function chooseCheckbox(el, callback) { if (!el) return; resetFieldError(el); @@ -6,6 +6,7 @@ function chooseCheckbox(el) { let $checkbox = $parent.querySelector('.checkbox') $checkbox.classList.toggle("checked"); + if (callback) callback($checkbox.classList.contains('checked')); } function getFormData(form, formData=new FormData()) { diff --git a/templates/v2/blocks/b_filter_routes.html b/templates/v2/blocks/b_filter_routes.html index 5d839b7..79ecfb8 100644 --- a/templates/v2/blocks/b_filter_routes.html +++ b/templates/v2/blocks/b_filter_routes.html @@ -16,18 +16,18 @@
{% trans "Способ перевозки" %}
-
-
{% trans "Автоперевозка" %}
+
+
{% trans "Автоперевозка" %}
{% if route_form.errors.type_transport %}
{{ route_form.errors.type_transport.0 }}
{% endif %}
-
-
{% trans "Авиатранспорт" %}
+
+
{% trans "Авиатранспорт" %}
{% if route_form.errors.type_transport %}
{{ route_form.errors.type_transport.0 }}
{% endif %}
- {% for cargo_type in route_form.fields.cargo_type.choices %} diff --git a/templates/v2/content_widgets/w_route_card/route_card_route_data.html b/templates/v2/content_widgets/w_route_card/route_card_route_data.html index 3873c4e..a636763 100644 --- a/templates/v2/content_widgets/w_route_card/route_card_route_data.html +++ b/templates/v2/content_widgets/w_route_card/route_card_route_data.html @@ -11,7 +11,7 @@
{{ route.from_city.country.code }}
-
+
{{ route.from_city.name }}
@@ -48,7 +48,7 @@
{{ route.to_city.country.code }}
-
+
{{ route.to_city.name }}
@@ -62,7 +62,7 @@ {% endif %} {% if route.owner_type == 'mover' %} -
+
{% trans "Прибытие:" %}
{{ route.arrival_DT|date:'j E Y' }}
@@ -86,8 +86,8 @@
{{ route.from_city.country.code }}
-
- {{ route.from_city.name }}/{{ route.from_city.country.name }} +
+ {{ route.from_city.name }}
@@ -127,8 +127,8 @@
{{ route.to_city.country.code }}
-
- {{ route.to_city.name }}/{{ route.to_city.country.name }} +
+ {{ route.to_city.name }}