diff --git a/static/v2/css/blocks/b_search_routes.css b/static/v2/css/blocks/b_search_routes.css new file mode 100644 index 0000000..ed8ac11 --- /dev/null +++ b/static/v2/css/blocks/b_search_routes.css @@ -0,0 +1,27 @@ +.b_search_routes { + + --button-font-size: 18px; + form{ + display: grid; + grid-template-columns: repeat(3, calc(33.3% - 72px)) 215px; + align-items: end; + gap: 5px; + [data-type="location"] { + &:first-of-type{ + .w_select_country_header{--select-border-radius: 10px 0 0 10px!important;} + } + .w_select_country_header{--select-border-radius: 0!important;} + } + .w_daterangepicker{ + --range-picker-border-radius: 0 10px 10px 0!important; + } + } + button{ + padding: 17px 0; + background: #FF613A; + font-size: var(--button-font-size); + font-weight: 600; + margin: 0; + height: calc(100% - 27px); + } +} \ No newline at end of file diff --git a/static/v2/js/widgets/w_daterangepicker.js b/static/v2/js/widgets/w_daterangepicker.js index 7824c00..09c181f 100644 --- a/static/v2/js/widgets/w_daterangepicker.js +++ b/static/v2/js/widgets/w_daterangepicker.js @@ -44,7 +44,7 @@ function daterangepickerInit(el, callback, date) { $($datarangepicker).daterangepicker({ "autoapply": true, "linkedCalendars": false, - "singleDatePicker": true, + "singleDatePicker": !!el.dataset.range, "timePicker": false, "timePicker24Hour": false, "minDate": moment(date), @@ -57,6 +57,7 @@ function daterangepickerInit(el, callback, date) { if (last_opened_daterangepicker) $parent = last_opened_daterangepicker.closest('.w_daterangepicker'); let $input = $parent.querySelector(".date_range_input_cont input") $input.value = start.format('DD.MM.YYYY'); + if (end) $input.value = `${start.format('DD.MM.YYYY')} - ${end.format('DD.MM.YYYY')}` resetFieldError(el); if (callback) callback(el) }); @@ -68,3 +69,6 @@ function clickOnDateIconE(el){ $input.focus() } +$(document).ready(function () { + datarangepickerinitAll() +}) diff --git a/templates/tb_base.html b/templates/tb_base.html index 2aecbe2..a0eb2e0 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -201,16 +201,16 @@ function gtag_report_conversion(url) { {% if page_type == 'routes' %}
- #}
diff --git a/templates/v2/blocks/b_search_routes.html b/templates/v2/blocks/b_search_routes.html new file mode 100644 index 0000000..96dfadc --- /dev/null +++ b/templates/v2/blocks/b_search_routes.html @@ -0,0 +1,24 @@ +{% load static %} +{% load i18n %} + + +
+
+
+ + {% include 'v2/widgets/w_select_country.html' with name='from_city' placeholder='' initial=form.initial.from_city %} + {% if form.errors.from_city %}
{{ form.errors.from_city.0 }}
{% endif %} +
+
+ + {% include 'v2/widgets/w_select_country.html' with name='to_city' placeholder='' initial=form.initial.to_city %} + {% if form.errors.to_city %}
{{ form.errors.to_city.0 }}
{% endif %} +
+
+ + {% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' range='true' initial=form.initial.arrival_DT %} + {% if form.errors.arrival_DT %}
{{ form.errors.arrival_DT.0 }}
{% endif %} +
+ +
+
\ No newline at end of file diff --git a/templates/v2/pages/p_search_route_results.html b/templates/v2/pages/p_search_route_results.html index 8f21a7a..eea0cea 100644 --- a/templates/v2/pages/p_search_route_results.html +++ b/templates/v2/pages/p_search_route_results.html @@ -3,9 +3,14 @@ {% load i18n %} {% block meta %} - + + + + + + {% endblock %} {% block content %} -
HAHAHA!
+ {% include 'v2/blocks/b_search_routes.html' %} {% endblock %} \ No newline at end of file diff --git a/templates/v2/widgets/w_daterangepicker.html b/templates/v2/widgets/w_daterangepicker.html index c481cbb..d2e8fcb 100644 --- a/templates/v2/widgets/w_daterangepicker.html +++ b/templates/v2/widgets/w_daterangepicker.html @@ -3,7 +3,7 @@
- +
\ No newline at end of file