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

0.0.328 fix bug in lalble b_new_route.html | upd style title for routes on main page | commented out the code in b_chats.html for i icon

Browse Source
This commit is contained in:
ArtemB
2023-12-20 14:03:59 +03:00
parent 14df8969c2
commit 410733211b
4 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@
<a href="tel:{{ cur_receiver.user_profile.phone }}">
<img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">
</a>
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
{# <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">#}
</div>
</div>
<div class="bottom_part_of_chats">

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

@@ -56,7 +56,16 @@
{% endif %}
</div>
<input id="hide_owner_type" type="hidden" value="{{ form.initial.owner_type }}">
{# <input id="hide_owner_type" type="hidden" value="{{ form.initial.owner_type }}">#}
<input
id="hide_owner_type"
type="hidden"
{% if form.initial.owner_type %}
value="{{ form.initial.owner_type }}"
{% elif form.data.owner_type %}
value="{{ form.data.owner_type }}"
{% endif %}
>
{% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
<hr>
@@ -64,11 +73,11 @@
<div class="wrap_left">
<label for="id_departure_DT">
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% translate "Дата и время выезда" %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% translate "Дата и время вылета" %}
{% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' or form.initial.type_transport == 'avia' %}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
{% translate "Дата и время отправки" %}
{% endif %}
@@ -107,13 +116,9 @@
<div id="arrival_div">
<label for="id_arrival_DT">
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover'%}
{% translate "Дата и время прибытия" %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% translate "Дата и время прибытия" %}
{% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'avia' %}
{% translate "Дата и время доставки посылки" %}
{% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' %}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
{% translate "Дата и время доставки посылки" %}
{% endif %}
@@ -151,11 +156,11 @@
<div class="from_to_country">
<div class="from_country_container">
<label for="id_from_address_point_txt">
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% translate "Пункт вылета" %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% translate "Пункт выезда" %}
{% elif form.initial.owner_type == 'customer' %}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
{% translate "Пункт отправки" %}
{% endif %}
</label>
@@ -196,11 +201,11 @@
</div>
<div class="wrap_right">
<label for="id_to_address_point_txt">
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' or form.data.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
{% translate "Пункт прилета" %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' or form.data.owner_type == 'mover' and form.initial.type_transport == 'road' %}
{% translate "Пункт приезда" %}
{% elif form.initial.owner_type == 'customer'%}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer'%}
{% translate "Пункт прибытия" %}
{% endif %}
</label>
@@ -249,9 +254,9 @@
<div class="from_to_place">
<div class="wrap_left">
<label for="id_from_place">
{% if form.initial.owner_type == 'mover' %}
{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover' %}
{% translate "Откуда можете забрать?" %}
{% elif form.initial.owner_type == 'customer' %}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
{% translate "Откуда нужно забрать посылку?" %}
{% endif %}
</label>
@@ -274,9 +279,9 @@
</div>
<div class="wrap_right">
<label for="id_to_place">
{% if form.initial.owner_type == 'mover' %}
{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover' %}
{% translate "Куда можете доставить?" %}
{% elif form.initial.owner_type == 'customer' %}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
{% translate "Куда нужно доставить посылку?" %}
{% endif %}
</label>
@@ -302,9 +307,9 @@
<hr>
<div>
<label>{% if form.initial.owner_type == 'mover' %}
<label>{% if form.initial.owner_type == 'mover' or form.data.owner_type == 'mover' %}
{% translate "Могу перевезти:" %}
{% elif form.initial.owner_type == 'customer' %}
{% elif form.initial.owner_type == 'customer' or form.data.owner_type == 'customer' %}
{% translate "Что нужно перевезти?" %}
{% endif %}
</label>