Merge remote-tracking branch 'origin/v2' into v2

static/v2/css/blocks/b_login_modal.css

@@ -8,7 +8,8 @@
 
     --modal-width: 690px;
     --modal-height: 492px;
-    --modal-padding: 28px 28.7px 40px 52px;
+    --modal-padding: 28px 28.7px;
+    --modal-inf-padding: 8px 24px 0 24px;
 
     box-sizing: border-box;
 
@@ -89,7 +90,6 @@
         position: relative;
         background: #E1E1E1;
         border-radius: 39px;
-        margin-top: 8px;
         width: 140px;
         height: 140px;
         img{
@@ -128,4 +128,14 @@
         text-decoration: none;
         display: block;
     }
+
+    .b_login_modal_inf{
+        padding: var(--modal-inf-padding);
+        .primary_btn{
+            --width: 360px;
+            @media (max-width: 460px) {
+                --width: 100%;
+            }
+        }
+    }
 }

templates/v2/blocks/b_login_modal.html

@@ -7,6 +7,7 @@
     <div class="b_login_modal_container_content">
         <div class="b_login_modal_content">
             <img onclick="closeModal(this)" class="xmark" src="{% static "v2/icons/service/modal/xmark.svg" %}" alt="">
+            <div class="b_login_modal_inf">
                 <div class="lock_img_container">
                     <img src="{% static "v2/icons/blocks/b_login_modal/lock.png" %}" alt="">
                 </div>
@@ -17,3 +18,4 @@
             </div>
         </div>
     </div>
+</div>

templates/v2/content_widgets/w_route_card/route_card_actions_container_for_search.html

@@ -4,7 +4,13 @@
 <div class="respond_route_cont mobile" style="display: none;margin-top: 23px;">
     <div class="route_btn unhovered" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 11px;">
         <img src="{% static "v2/icons/widgets/w_route_card/phone.svg" %}" alt="">
-        <div class="route_btn_title big">{{ route.phone|truncatechars:20 }}</div>
+        <div class="route_btn_title big">
+            {% if route.phone %}
+                {{ route.phone|truncatechars:20 }}
+            {% else %}
+                {% trans "Номер не указан" %}
+            {% endif %}
+        </div>
     </div>
     <div class="chat_btn">
         <img src="{% static "v2/icons/widgets/w_route_card/chat.png" %}" alt="">

templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html

@@ -15,7 +15,13 @@
         <div class="respond_route_cont" style="display: none;">
             <div class="route_btn unhovered" style="--route-btn-width: max-content;--route-btn-height: min-content;--route-btn-padding: 7.5px 11px;">
                 <img src="{% static "v2/icons/widgets/w_route_card/phone.svg" %}" alt="">
-                <div class="route_btn_title big">{{ route.phone|truncatechars:20 }}</div>
+                <div class="route_btn_title big">
+                    {% if route.phone %}
+                        {{ route.phone|truncatechars:20 }}
+                    {% else %}
+                        {% trans "Номер не указан" %}
+                    {% endif %}
+                </div>
             </div>
             <div class="chat_btn">
                 <img src="{% static "v2/icons/widgets/w_route_card/chat.png" %}" alt="">
@@ -25,7 +31,7 @@
             <div class="route_btn_title big">{% trans "Откликнуться" %}</div>
         </div>
     </div>
-    <div class="route_card_text_container{% if not user.if_authenticated %} msg{% endif %}">
+    <div class="route_card_text_container{% if not user.is_authenticated %} msg{% endif %}">
         <div class="route_card_text_container_txt">
             {% if route.comment %}
                 {{ route.comment|linebreaksbr }}
@@ -33,7 +39,7 @@
                 {% trans "Комментарий отсутствует" %}
             {% endif %}
         </div>
-        {% if not user.if_authenticated %}
+        {% if not user.is_authenticated %}
             <div class="route_msg_for_unregistered_user" onclick="clickedUnregisteredMsgRoute(this)">
                 <img src="{% static "v2/icons/widgets/w_route_card/unregistered.svg" %}" alt="">
                 <div>{% trans "Текст сообщения доступен только авторизированным пользователям." %}</div>
@@ -57,7 +63,7 @@
         </div>
     </div>
     <div class="card_owner_name">{{ route.owner }}</div>
-    <div class="route_card_text_container{% if not user.if_authenticated %} msg{% endif %}">
+    <div class="route_card_text_container{% if not user.is_authenticated %} msg{% endif %}">
         <div class="route_card_text_container_txt">
             {% if route.comment %}
                 {{ route.comment|linebreaksbr }}
@@ -65,7 +71,7 @@
                 {% trans "Комментарий отсутствует" %}
             {% endif %}
         </div>
-        {% if not user.if_authenticated %}
+        {% if not user.is_authenticated %}
             <div class="route_msg_for_unregistered_user" onclick="clickedUnregisteredMsgRoute(this)">
                 <img src="{% static "v2/icons/widgets/w_route_card/unregistered.svg" %}" alt="">
                 <div>{% trans "Текст сообщения доступен только авторизированным пользователям." %}</div>