From 8f43ede3f0b032aad385f7192f471122bcdaf56e Mon Sep 17 00:00:00 2001 From: SBD Date: Fri, 10 Jan 2025 22:13:59 +0300 Subject: [PATCH] 0.0.08 form poster --- static/v2/css/blocks/b_make_poster_order.css | 4 ++++ static/v2/css/forms.css | 4 ++++ static/v2/css/forms/f_make_poster_order.css | 16 ++++++++++++++++ static/v2/css/widgets/w_additional_info.css | 1 + static/v2/js/forms.js | 2 +- static/v2/js/forms/f_make_poster_order.js | 2 ++ static/v2/js/widgets/w_daterangepicker.js | 8 +++++++- .../cw_w_radio_inputs_radio_input.html | 2 +- .../cw_w_select_w_for_select.html | 4 ++-- templates/v2/forms/f_make_poster_order.html | 6 +++--- templates/v2/widgets/w_daterangepicker.html | 2 +- templates/v2/widgets/w_select_country.html | 6 +++--- 12 files changed, 45 insertions(+), 12 deletions(-) diff --git a/static/v2/css/blocks/b_make_poster_order.css b/static/v2/css/blocks/b_make_poster_order.css index 563d3e9..3c32211 100644 --- a/static/v2/css/blocks/b_make_poster_order.css +++ b/static/v2/css/blocks/b_make_poster_order.css @@ -3,6 +3,10 @@ --title-font-weight: 700; --title-margin-bottom: 60px; + @media (max-width: 992px) { + --title-font-size: 32px; + } + .make_poster_order_title{ width: 100%; font-size: var(--title-font-size); diff --git a/static/v2/css/forms.css b/static/v2/css/forms.css index d8e53aa..8386aa5 100644 --- a/static/v2/css/forms.css +++ b/static/v2/css/forms.css @@ -59,6 +59,9 @@ padding: 0; border-radius: 0; } + &.half{ + width: 50%; + } &::placeholder{ font-size: var(--placeholder-font-size); color: var(--placeholder-color); @@ -87,6 +90,7 @@ border: 1px solid #E6E6E6; height: 30px; width: 30px; + min-width: 30px; border-radius: 10px; &:hover{ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12); diff --git a/static/v2/css/forms/f_make_poster_order.css b/static/v2/css/forms/f_make_poster_order.css index 77647ee..021d01c 100644 --- a/static/v2/css/forms/f_make_poster_order.css +++ b/static/v2/css/forms/f_make_poster_order.css @@ -2,8 +2,24 @@ .form_line{ padding: 40px 0; border-bottom: 1px solid #E6E6E6; + input.half{width: calc(100% - 40px)} + @media (max-width: 992px) { + &._50_grid{ + grid-template-columns: 1fr; + } + input.half{width: 100%} + } &:last-of-type{ border-bottom: none; } } + @media (max-width: 992px) { + .w_radio_inputs{ + grid-template-columns: repeat(2, 1fr); + } + } @media (max-width: 768px) { + .w_radio_inputs{ + grid-template-columns: repeat(1, 1fr); + } + } } \ No newline at end of file diff --git a/static/v2/css/widgets/w_additional_info.css b/static/v2/css/widgets/w_additional_info.css index f9ef691..e1644db 100644 --- a/static/v2/css/widgets/w_additional_info.css +++ b/static/v2/css/widgets/w_additional_info.css @@ -12,6 +12,7 @@ img{ width: 20px; height: 20px; + min-width: 20px; display: block; } .additional_info_modal{ diff --git a/static/v2/js/forms.js b/static/v2/js/forms.js index 1be0bc8..b8b4070 100644 --- a/static/v2/js/forms.js +++ b/static/v2/js/forms.js @@ -22,7 +22,7 @@ function getFormData(form) { let name = $parent ? $parent.dataset.name : ''; if (!name) name = el.name if (!name) name = el.dataset.name; - let value = el.value || '' + let value = el.querySelector('input')? el.querySelector('input').value : '' if (field_type) { if (default_element_types.indexOf(field_type) > -1) { diff --git a/static/v2/js/forms/f_make_poster_order.js b/static/v2/js/forms/f_make_poster_order.js index 3b4489d..fed8d28 100644 --- a/static/v2/js/forms/f_make_poster_order.js +++ b/static/v2/js/forms/f_make_poster_order.js @@ -22,6 +22,8 @@ function makePosterOrder(form) { $('body')[0].scrollIntoView({behavior: 'smooth', top: 0}); $(res.responseJSON.html).insertAfter($($title)) + + daterangepickerInit($('.w_daterangepicker'), daterangepickerInit) } }) diff --git a/static/v2/js/widgets/w_daterangepicker.js b/static/v2/js/widgets/w_daterangepicker.js index dd71a62..fe39f3b 100644 --- a/static/v2/js/widgets/w_daterangepicker.js +++ b/static/v2/js/widgets/w_daterangepicker.js @@ -29,7 +29,7 @@ function setLocalSets() { return locale_lang } -$(function (){daterangepickerInit($('.date_range_input_cont input'), daterangepickerInit)}) +$(function (){daterangepickerInit($('.w_daterangepicker'), daterangepickerInit)}) function daterangepickerInit(el, callback) { $('.date_range_input_cont input').daterangepicker({ @@ -49,3 +49,9 @@ function daterangepickerInit(el, callback) { }); } +function clickOnDateIconE(el){ + let $parent = el.closest('.date_range_input_cont') + let $input = $parent.querySelector("input") + $input.focus() +} + diff --git a/templates/v2/content_widgets/cw_w_radio_inputs_radio_input.html b/templates/v2/content_widgets/cw_w_radio_inputs_radio_input.html index 3c57ef3..3b3062f 100644 --- a/templates/v2/content_widgets/cw_w_radio_inputs_radio_input.html +++ b/templates/v2/content_widgets/cw_w_radio_inputs_radio_input.html @@ -2,6 +2,6 @@ {% load i18n %}
-
+
{{ item.1 }}
\ No newline at end of file diff --git a/templates/v2/content_widgets/cw_w_select_w_for_select.html b/templates/v2/content_widgets/cw_w_select_w_for_select.html index c69ae66..8c8c101 100644 --- a/templates/v2/content_widgets/cw_w_select_w_for_select.html +++ b/templates/v2/content_widgets/cw_w_select_w_for_select.html @@ -1,10 +1,10 @@ {% load static %} {% load i18n %} -
+
{{ country__short_code }}
-
{{ country__name }}/{{ name }}
+
{{ name }}/{{ country__name }}
\ No newline at end of file diff --git a/templates/v2/forms/f_make_poster_order.html b/templates/v2/forms/f_make_poster_order.html index 41c2da8..d1dbf1d 100644 --- a/templates/v2/forms/f_make_poster_order.html +++ b/templates/v2/forms/f_make_poster_order.html @@ -7,7 +7,7 @@
- {% include 'v2/widgets/w_select_country.html' with name='from_city' placeholder=placeholder_for_city %} + {% include 'v2/widgets/w_select_country.html' with name='from_city' placeholder=placeholder_for_city initial=form.initial.from_city %} {% if form.errors.from_city %}
{{ form.errors.from_city.0 }}
{% endif %}
@@ -19,7 +19,7 @@
- {% include 'v2/widgets/w_radio_inputs.html' with name='cargo_type' list=form.fields.cargo_type.choices %} + {% include 'v2/widgets/w_radio_inputs.html' with name='cargo_type' list=form.fields.cargo_type.choices initial=form.initial.cargo_type %} {% if form.errors.cargo_type %}
{{ form.errors.cargo_type.0 }}
{% endif %}
@@ -43,7 +43,7 @@
{% trans "Если вы оставите это поле пустым - перевозчики смогут только написать вам в личные сообщения на нашем сайте TripWB.com" as attention_phone %} - + {% include 'v2/widgets/w_pay_attention.html' with text=attention_phone %} {% if form.errors.phone %}
{{ form.errors.phone.0 }}
{% endif %}
diff --git a/templates/v2/widgets/w_daterangepicker.html b/templates/v2/widgets/w_daterangepicker.html index 6304b45..cccf15d 100644 --- a/templates/v2/widgets/w_daterangepicker.html +++ b/templates/v2/widgets/w_daterangepicker.html @@ -4,6 +4,6 @@
- +
\ No newline at end of file diff --git a/templates/v2/widgets/w_select_country.html b/templates/v2/widgets/w_select_country.html index a6b7d1f..fcdfed1 100644 --- a/templates/v2/widgets/w_select_country.html +++ b/templates/v2/widgets/w_select_country.html @@ -5,10 +5,10 @@
- -
+ +
{% if initial.country.short_code %}{{ initial.country.short_code }}{% endif %}
- +