0.0.277 upd carrier_card

This commit is contained in:
2023-11-30 14:43:39 +03:00
parent dcfd66324e
commit ec76d336f3
4 changed files with 60 additions and 18 deletions

View File

@@ -1018,7 +1018,9 @@
margin: unset;
}
.cargo_type_trans{
float: right;
display: block;
margin-bottom: 15px;
float: unset;
}
.from-to-country-container-carrier{

View File

@@ -1774,6 +1774,7 @@ input#id_extra_phone
}
.route_info_about{
margin-bottom: 30px;
font-size: 15px;
}
.route_info_point {
@@ -1825,10 +1826,13 @@ input#id_extra_phone
.cargo_type_disp{
background: url("/static/img/png/Tag.png") left center no-repeat;
margin: 0 20px 0 20px;
margin-right: 20px;
padding-left: 15px;
}
.cargo_type_trans{
float: right;
}
.cargo_weight{
background: url("/static/img/png/Scales.png") left center no-repeat;
padding-left: 20px;

View File

@@ -2,21 +2,48 @@
{% load i18n %}
<div class="carrier-card" data-number-of-route="{{ route.id }}">
<div class="left-part-carrier-card">
<div class="first-line-card-carrier">
<div class="carrier-title">
{% translate "Перевозчик:" %}
</div>
<div class="type_transportation_carrier">
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
{% elif route.type_transport == 'avia'%}
<img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
{% endif %}
{{ route.get_type_transport_display }}
{% if route.owner_type == 'mover' %}
<div class="first-line-card-carrier">
<div class="carrier-title">
{% translate "Перевозчик:" %}
</div>
<div class="type_transportation_carrier">
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
{% elif route.type_transport == 'avia'%}
<img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
{% endif %}
{{ route.get_type_transport_display }}
</div>
<div class="clear_both"></div>
</div>
{% endif %}
{% if route.owner_type == 'customer' %}
<div class="route_info_about">
<span class="cargo_type_disp">
{% translate "Тип: " %}{{ route.get_cargo_type_display }}
</span>
<span class="cargo_weight">
{% translate "Вес: " %}{{ route.weight }} {% translate "кг" %}
</span>
<span class="cargo_type_trans">
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
{% elif route.type_transport == 'avia'%}
<img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
{% endif %}
{{ route.get_type_transport_display }}
</span>
<div class="clear_both"></div>
</div>
</div>
{% endif %}
<div class="from-to-country-container-carrier">
<div class="from-to-country-text left fl-left txt-al-right" title="{{ route.from_country_n_city_str }}">
{{ route.from_country_n_city_str }}
@@ -31,7 +58,16 @@
</div>
{# <div class="splliter-left-right-part-carrier-card"></div>#}
<div class="inf_carrier_container">
<div class="title_container_inf_carrier">{% translate "Контакты отправителия:" %}</div>
<div class="title_container_inf_carrier">
{% translate 'Контакты' %}
{% if route.owner_type == 'mover' %}
{% translate "перевозчика" %}
<img class="inf_carrier_icon" src="{% static "/img/svg/mover.svg" %}"/>
{% elif route.owner_type == 'customer'%}
{% translate "отправителя" %}
<img class="inf_carrier_icon" src="{% static "/img/svg/cargo.svg" %}"/>
{% endif %}
</div>
<div>
<img src="{% static "/delete_later/Avatar.png" %}">
<span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>

View File

@@ -15,13 +15,13 @@
{# </div>#}
{# <div class="clear_both"></div>#}
{# </div>#}
<div class="route_info_about">
<div class="route_info_about">
<span class="cargo_type_disp">
{% translate "Тип:" %}{{ route.get_cargo_type_display }}
{% translate "Тип: " %}{{ route.get_cargo_type_display }}
</span>
<span class="cargo_weight">
{% translate "Вес:" %}{{ route.weight }} {% translate "кг" %}
{% translate "Вес: " %}{{ route.weight }} {% translate "кг" %}
</span>
<span class="cargo_type_trans">