Merge remote-tracking branch 'origin/main'

templates/blocks/b_header.html

@@ -68,6 +68,7 @@
                             <span class="btn_profile_name">
                                 {{ user.first_name }} {{ user.last_name }}
                             </span>
+                            <span id="placeholder1"></span>
                             <div class="icon_unread_messages" style="padding-top: 2px;padding-right: 13px;">
                               <div class="cost-messages-in-user-tab-messenger" style="background: #FFFFFF;">
                                   <span class="unredmessages_value_text" style="padding-top: 2px;padding-left: 0; color: #000000;"></span>

templates/blocks/profile/b_new_route.html

@@ -75,7 +75,7 @@
 {#                   {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#}
 {#           />#}
           {# boris change input #}
-            <input class="el_form_b_new_route" type="text" id="id_departure_DT" name="departure_DT"  placeholder="" {% if form.initial.departure_DT %} value="{{ form.initial.departure_DT|date:"y.m.d H:m" }}"{% endif %}/>
+            <input class="el_form_b_new_route" type="text" id="id_departure_DT" name="departure_DT"  placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %} value="{{ form.initial.departure_DT|date:"y.m.d H:m" }}"{% endif %}/>
             <div id="displayRegervation"></div>
 
           {% if not errors_off and form.errors and form.errors.departure_DT %}
@@ -96,7 +96,7 @@
 {#                  {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
 {#          />#}
         {# boris change input #}
-            <input class="el_form_b_new_route" type="text" id="id_arrival_DT" name="arrival_DT"  placeholder="" {% if form.initial.arrival_DT %} value="{{ form.initial.arrival_DT|date:"y.m.d H:m" }}"{% endif %}/>
+            <input class="el_form_b_new_route" type="text" id="id_arrival_DT" name="arrival_DT"  placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %} value="{{ form.initial.arrival_DT|date:"y.m.d H:m" }}"{% endif %}/>
 
             <div id="displayRegervation"></div>
         {# end #}
@@ -146,7 +146,7 @@
                     type="number"
                     name="from_address_point"
                     id="id_from_address_point"
-                    class="el_form_find_route"
+                    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 %}/>
@@ -203,7 +203,7 @@
                     type="number"
                     name="to_address_point"
                     id="id_to_address_point"
-                    class="el_form_find_route"
+                    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 %}/>
@@ -407,7 +407,7 @@
   <div>
 
     <input type="checkbox" name="receive_msg_by_email" class="custom-checkbox" id="id_receive_msg_by_email">
-    <label for="id_receive_msg_by_email">s
+    <label for="id_receive_msg_by_email">
         <div class="receive_msg_by_email">{{ form.fields.receive_msg_by_email.label }}</div>
 
         <img id="img_msg_by_email"

templates/forms/f_find_route_filters_form.html

@@ -36,7 +36,7 @@
                     <input class="input_f_checkbox_type_transport el_form_find_route" type="checkbox" value="{{ item.0 }}" name="type_transport" id="id_cargo_type_car_{{ forloop.counter }}" onchange="filters_func_find_route_main(this,'{{ owner_type }}')">
                     <label for="id_cargo_type_car_{{ forloop.counter }}" class="label_f_checkbox_type_transport">
                         <div class="trigger_f_type_transport"></div>
-                        <img class="img_f_checkbox_type_transport" src="{% static "img/svg/Car.svg" %}">
+                        <img class="img_f_checkbox_type_transport" {% if forloop.counter|divisibleby:2 %}src="{% static "img/svg/Airplane.svg" %}" {% else %}src="{% static "img/svg/Car.svg" %}"{% endif %} >
                         <span class="span_f_checkbox_type_transport">{{ item.1 }}</span>
                     </label>
                 </div>

templates/widgets/w_carrier_card.html

@@ -6,7 +6,13 @@
             <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>

templates/widgets/w_route_info.html

@@ -26,6 +26,12 @@
 
                     <span>
 
+                        {% 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>