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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SDE
2023-12-03 17:12:49 +03:00
parent 92b92f2d65 66d7183278
commit 71e8f0f465
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/user_profile_2.js
View File

@@ -92,8 +92,10 @@ function select_tab_profile (el,url,owner_type=null) {
function selectTabProfileIfHisNotSelected (url) {
let el_f_select = document.querySelector(`[data-ajax-url=${url}]`)
el_f_select.classList.add('selected')
if (url !== 'new_route_view') {
let el_f_select = document.querySelector(`[data-ajax-url=${url}]`)
el_f_select.classList.add('selected')
}
}
function clickONTHEAPROfileBTN (el) {

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

@@ -60,7 +60,7 @@
<hr>
<div class="departure_arrival">
<div class="wrap_left">
<label for="id_departure_DT">{{ form.fields.departure_DT.label }}</label>
<label for="id_departure_DT">{% if form.initial.type_transport == 'road' %}Дата и время выезда{% elif form.initial.type_transport == 'avia' %}Дата и время вылета{% endif %}</label>
{# <input#}
@@ -84,7 +84,7 @@
</div>
<div id="arrival_div">
<label for="id_arrival_DT">{{ form.fields.arrival_DT.label }}</label>
<label for="id_arrival_DT">Дата и время прибытия</label>
{# <input#}
{# type="datetime-local"#}
{# min= {% now "Y-m-d" %}T{% now "H:i" %}#}
@@ -109,7 +109,7 @@
<hr>
<div class="from_to_country">
<div class="from_country_container">
<label for="id_from_address_point_txt">{{ form.fields.from_address_point.label }}</label>
<label for="id_from_address_point_txt">{% if form.initial.type_transport == 'avia' %}Пункт вылета{% elif form.initial.type_transport == 'road' %}Пункт выезда{% endif %}</label>
<input
type="number"
name="from_address_point"
@@ -131,6 +131,7 @@
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"
placeholder="{% translate "Выберите страну и город" %}"
{% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}
/>
<datalist id="from_address_point">
@@ -145,7 +146,7 @@
{% endif %}
</div>
<div class="wrap_right">
<label for="id_to_address_point_txt">{{ form.fields.to_address_point.label }}</label>
<label for="id_to_address_point_txt">{% if form.initial.type_transport == 'avia' %}Пункт прилета{% elif form.initial.type_transport == 'road' %}Пункт приезда{% endif %}</label>
<input
type="number"
name="to_address_point"
@@ -166,6 +167,7 @@
{% 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"
placeholder="{% translate "Выберите страну и город" %}"
{% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}
/>

2
templates/blocks/profile/b_profile.html
View File

@@ -41,7 +41,7 @@
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_email">{% if profileForm.fields.email.required %}<span class="orange-text">*</span>{% endif %} E-mail</label>
<input class="input_f_profile" type="text" id="id_email" name="email" {% if profileForm.initial.email %}value="{{ profileForm.initial.email }}" {% endif %} {% if profileForm.initial.email %}data-initial-value="{{ profileForm.initial.email }}"{% else %}data-initial-value=""{% endif %}>
<input class="input_f_profile" type="text" id="id_email" name="email" readonly {% if profileForm.initial.email %}value="{{ profileForm.initial.email }}" {% endif %} {% if profileForm.initial.email %}data-initial-value="{{ profileForm.initial.email }}"{% else %}data-initial-value=""{% endif %}>
{% if profileForm.errors.email %}<div class="error_form_profile">{{ profileForm.errors.email }}</div>{% endif %}
</div>
<div class="container_el_form_profile">