diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index bca9edf..0f13938 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -1018,7 +1018,9 @@ margin: unset; } .cargo_type_trans{ - float: right; + display: block; + margin-bottom: 15px; + float: unset; } .from-to-country-container-carrier{ diff --git a/static/css/styles.css b/static/css/styles.css index f8ccd82..11ef580 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -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; diff --git a/templates/widgets/w_carrier_card.html b/templates/widgets/w_carrier_card.html index 8f316ca..2d63394 100644 --- a/templates/widgets/w_carrier_card.html +++ b/templates/widgets/w_carrier_card.html @@ -2,21 +2,48 @@ {% load i18n %}
-
-
- {% translate "Перевозчик:" %} -
-
- {% if route.type_transport == 'road' %} - - {% elif route.type_transport == 'avia'%} - - {% endif %} - {{ route.get_type_transport_display }} + {% if route.owner_type == 'mover' %} +
+
+ {% translate "Перевозчик:" %} +
+ +
+ {% if route.type_transport == 'road' %} + + {% elif route.type_transport == 'avia'%} + + {% endif %} + {{ route.get_type_transport_display }} +
+
+ {% endif %} + {% if route.owner_type == 'customer' %} +
+ + {% translate "Тип: " %}{{ route.get_cargo_type_display }} + + + + {% translate "Вес: " %}{{ route.weight }} {% translate "кг" %} + + + + + {% if route.type_transport == 'road' %} + + {% elif route.type_transport == 'avia'%} + + {% endif %} + + {{ route.get_type_transport_display }} +
-
+ +
+ {% endif %}
{{ route.from_country_n_city_str }} @@ -31,7 +58,16 @@
{#
#}
-
{% translate "Контакты отправителия:" %}
+
+ {% translate 'Контакты' %} + {% if route.owner_type == 'mover' %} + {% translate "перевозчика" %} + + {% elif route.owner_type == 'customer'%} + {% translate "отправителя" %} + + {% endif %} +
{{ route.owner.last_name }} {{ route.owner.first_name }} diff --git a/templates/widgets/w_route_info.html b/templates/widgets/w_route_info.html index 0730e19..5c110e9 100644 --- a/templates/widgets/w_route_info.html +++ b/templates/widgets/w_route_info.html @@ -15,13 +15,13 @@ {#
#} {#
#} {#
#} -
+
- {% translate "Тип:" %}{{ route.get_cargo_type_display }} + {% translate "Тип: " %}{{ route.get_cargo_type_display }} - {% translate "Вес:" %}{{ route.weight }} {% translate "кг" %} + {% translate "Вес: " %}{{ route.weight }} {% translate "кг" %}