sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SBD
2023-11-24 16:49:19 +03:00
parent f09ff3f7df 4259f84764
commit f1775237fb
4 changed files with 54 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
static/css/styles(boris).css
View File

@@ -1041,45 +1041,6 @@
font-size: 14px;
}
.to_address_point_txt.post_route{
display: block;
border-left: 1px solid #E6E6E6;
border-top: 1px solid #E6E6E6;
border-right: 0;
border-bottom: 1px solid #E6E6E6;
color: #272424;
font-family: Inter;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 22px;
appearance: none;
margin-top: 10px;
height: 20px;
border-radius: 15px 0 0 15px;
padding: 20px 15.2px;
width: calc(100% - 95px);
}
.from_address_point_txt.post_route{
display: block;
border-left: 1px solid #E6E6E6;
border-top: 1px solid #E6E6E6;
border-right: 0;
border-bottom: 1px solid #E6E6E6;
color: #272424;
font-family: Inter;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 22px;
appearance: none;
margin-top: 10px;
height: 20px;
border-radius: 15px 0 0 15px;
padding: 20px 15.2px;
width: calc(100% - 95px);
}
.input_list.find_route{
width: 100%;

8
static/js/user_profile.js
View File

@@ -255,13 +255,13 @@ function loader_place_ins_boris (el,type=null){
function searchTown(el){
if (el.value.length > 0){
// el.style.background = 'white url("/static/img/svg/loader.svg") no-repeat calc(100% - 15px) center';
if (el.value.length > 2){
el.style.background = 'white url("/static/img/svg/loader.svg") no-repeat calc(100% - 15px) center';
}else {
// el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
}
if(el.value.length>=3){
@@ -294,7 +294,7 @@ function searchTown(el){
// enctype: 'json',
data: JSON.stringify(get_address_point),
success: function(data){
// el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
loader_place_ins_boris(el,"el")

145
templates/blocks/profile/b_new_route.html
View File

@@ -110,119 +110,68 @@
<div class="from_to_country">
<div class="from_country_container">
<label for="id_from_address_point_txt">{{ form.fields.from_address_point.label }}</label>
{# <input#}
{# type="number"#}
{# name="from_address_point"#}
{# id="id_from_address_point"#}
{# class="el_form_b_new_route"#}
{# hidden#}
{# {% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %}#}
{# />#}
{# <input#}
{# oninput="searchTown(this)"#}
{# onclick="showSearchList(this)"#}
{# onblur="onblurInputField(event, this)"#}
{# onFocus="this.select()"#}
{# autocomplete="off"#}
{# type="text"#}
{# minlength="3"#}
{##}
{# name="from_address_point_txt"#}
{# class="from_address_point_txt post_route el_form_b_new_route"#}
{# {% if form.fields.from_address_point.required %} required{% endif %}#}
{# id="id_from_address_point_txt"#}
{# {% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}#}
{# />#}
{# <datalist id="from_address_point">#}
{##}
{# </datalist>#}
{##}
{# <div class="input_list post_route" name="from_address_point_txt_list">#}
{##}
{# </div>#}
{# boris changed input#}
<div class="container_inp_w_abr">
<input
type="number"
name="from_address_point"
id="id_from_address_point"
class="el_form_b_new_route el_form_find_route"
hidden
class="disp-none"
{% if route_form.initial.from_address_point %}value="{{ route_form.initial.from_address_point}}"{% endif %}/>
<input
<input
type="number"
name="from_address_point"
id="id_from_address_point"
class="el_form_b_new_route"
hidden
{% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %}
/>
<input
oninput="searchTown(this)"
onclick="showSearchList(this)"
onblur="onblurInputField(event, this)"
onFocus="this.select()"
autocomplete="off"
type="text"
minlength="3"
name="from_address_point_txt"
{# {% if form.fields.to_address_point.required %} required{% endif %}#}
class="from_address_point_txt post_route el_form_b_new_route"
{% if form.fields.from_address_point.required %} required{% endif %}
id="id_from_address_point_txt"
class="from_address_point_txt post_route first"
{% if route_form.initial.from_address_point %}value="{{ route_form.initial.from_address_point }}"{% endif %}/>
<div class="abbreviation_airport_in_search post_route" onclick="focusOnInput(this)"></div>
<div class="input_list post_route" name="from_address_point_txt_list"></div>
{% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}
/>
<datalist id="from_address_point">
</datalist>
<div class="input_list post_route" name="from_address_point_txt_list">
</div>
{% if not errors_off and form.errors and form.errors.from_address_point %}
<span>{{ form.errors.from_address_point}}</span>
{% endif %}
</div>
<div>
<label for="id_from_address_point_txt">{{ form.fields.to_address_point.label }}</label>
{# <input#}
{# type="number"#}
{# name="to_address_point"#}
{# id="id_to_address_point"#}
{# class="el_form_b_new_route"#}
{# hidden#}
{# {% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}#}
{# />#}
{# <input#}
{# oninput="searchTown(this)"#}
{# onclick="showSearchList(this)"#}
{# onblur="onblurInputField(event, this)"#}
{##}
{# onFocus="this.select()"#}
{# autocomplete="off"#}
{# type="text"#}
{# name="to_address_point_txt"#}
{# {% if form.fields.to_address_point.required %} required{% endif %}#}
{# id="id_to_address_point_txt"#}
{# class="to_address_point_txt post_route el_form_b_new_route"#}
{# {% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}#}
{##}
{# />#}
{# <div class="input_list post_route" name="to_address_point_txt_list">#}
{##}
{# </div>#}
<div class="container_inp_w_abr">
<input
type="number"
name="to_address_point"
id="id_to_address_point"
class="el_form_b_new_route el_form_find_route"
hidden
class="disp-none"
{% if route_form.initial.to_address_point %}value="{{ route_form.initial.to_address_point}}"{% endif %}/>
<input
oninput="searchTown(this)"
onclick="showSearchList(this)"
onblur="onblurInputField(event, this)"
<label for="id_to_address_point_txt">{{ form.fields.to_address_point.label }}</label>
<input
type="number"
name="to_address_point"
id="id_to_address_point"
class="el_form_b_new_route"
hidden
{% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}
/>
<input
oninput="searchTown(this)"
onclick="showSearchList(this)"
onblur="onblurInputField(event, this)"
onFocus="this.select()"
autocomplete="off"
type="text"
name="to_address_point_txt"
{# {% if form.fields.to_address_point.required %} required{% endif %}#}
id="id_to_address_point_txt"
class="to_address_point_txt post_route"
{% if route_form.initial.to_address_point_txt %}value="{{ route_form.initial.to_address_point_txt}}"{% endif %}/>
<div class="abbreviation_airport_in_search" onclick="focusOnInput(this)"></div>
<div class="input_list post_route" name="to_address_point_txt_list"></div>
</div>
onFocus="this.select()"
autocomplete="off"
type="text"
name="to_address_point_txt"
{% if form.fields.to_address_point.required %} required{% endif %}
id="id_to_address_point_txt"
class="to_address_point_txt post_route el_form_b_new_route"
{% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}
/>
<div class="input_list post_route" name="to_address_point_txt_list">
</div>
{% if not errors_off and form.errors and form.errors.to_address_point %}
<span>{{ form.errors.to_address_point }}</span>
{% endif %}

6
templates/blocks/static_pages_blocks/b_advertisement.html
View File

@@ -19,7 +19,7 @@
<h2 id="title_static">{% translate "Почему это выгодно?" %}</h2>
<div class="benefit_img_about_service">
<figure>
<img src="/static/img/svg/cooperation_img.svg" alt="">
<img src="/static/img/svg/pc_img.svg" alt="">
<figcaption>{% translate "Полное брендирвоание страницы или раздела" %}</figcaption>
</figure>
<figure>
@@ -27,11 +27,11 @@
<figcaption>{% translate "Реклама для целевой аудитории" %}</figcaption>
</figure>
<figure>
<img src="/static/img/svg/build_logistics.svg" alt="">
<img src="/static/img/svg/offer_img.svg" alt="">
<figcaption>{% translate "Индивидуальное согласование цены при объеме" %}</figcaption>
</figure>
<figure>
<img src="/static/img/svg/using_service_img.svg" alt="">
<img src="/static/img/svg/uniq_user_img.svg" alt="">
<figcaption>{% translate "Более чем 10 000 уникальных посещений в день" %}</figcaption>
</figure>
<figure>