Merge remote-tracking branch 'origin/main'

google180852ecd111cd7b.html

@@ -0,0 +1 @@
+google-site-verification: google180852ecd111cd7b.html

templates/blocks/b_header.html

@@ -134,5 +134,34 @@
         <div class="clear_both"></div>
     </div>
 
+    <!-- Yandex.Metrika counter -->
+<script type="text/javascript" >
+   (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+   m[i].l=1*new Date();
+   for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
+   k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
+   (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+   ym(97070898, "init", {
+        clickmap:true,
+        trackLinks:true,
+        accurateTrackBounce:true,
+        webvisor:true,
+        ecommerce:"dataLayer"
+   });
+</script>
+<noscript><div><img src="https://mc.yandex.ru/watch/97070898" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+<!-- /Yandex.Metrika counter -->
+
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-2WW2PTG5BM"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-2WW2PTG5BM');
+</script>
+
   </header>
 <div class="line_f_header"></div>

templates/blocks/profile/b_subscribe_current.html

@@ -53,8 +53,10 @@
     </div>
     <div class="clear_both"></div>
 </div>
-<div class="inf_about_tarif_plan_text"><div style="font-weight: 600;">{% translate "При отказе или досрочном изменении тарифного" %}</div> {% translate "плана оплаченный период действия текущей подписки не пересчитывается." %}</div>
-<div class="b_another_subscribes">
+<div class="inf_about_tarif_plan_text"><div style="font-weight: 600;">{% translate "При отказе или досрочном изменении тарифного" %}</div>
+    <div style="font-weight: 600;">{% translate "плана оплаченный период действия текущей подписки не пересчитывается." %}</div>
+    <br><br>
+    <div class="b_another_subscribes">
     {% for item in subscribes %}
         {% if item.id != subscribe_for_user.subscribe.id  %}
 

templates/widgets/w_carrier_card.html

@@ -7,7 +7,7 @@
         {% if departure_date_string < current_date %}
             <div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
         {% else %}
-            <div class="carrier-card {% if route.owner == user %}hide{% endif %}" data-number-of-route="{{ route.id }}">
+            <div class="carrier-card" data-number-of-route="{{ route.id }}">
         {% endif %}
    {% endwith %}
 
@@ -103,7 +103,7 @@
         <div name="form_carrier">
             {% if user.is_authenticated %}
                         <div class="inf_carrier">
-                            <img class="route_contact_avatar" {% if route.owner.user_profile.avatar %}
+                            <img class="route_contact_avatar {% if route.owner == user %} active{% endif %}" {% if route.owner.user_profile.avatar %}
                             src="{{ route.owner.user_profile.avatar.url }}"
                             {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>
 
@@ -118,13 +118,13 @@
 
                             <a class="phones_carrier" data-href="tel:{{ route.phone }}">
                                 <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
-                                <span class="phones_carrier_span el_for_open_el">{{ route.phone }}</span>
+                                <span class="phones_carrier_span el_for_open_el {% if route.owner == user %} active{% endif %}">{{ route.phone }}</span>
                 {#                <input value="{{ route.phone }}">#}
                                 <div class="clear_both"></div>
                             </a>
                             <a class="email_carrier" data-href="mailto:{{ route.owner.email }}">
                                 <img class="inf_carrier_icon" src="{% static "/img/svg/email.svg" %}">
-                                <span class="email_carrier_span el_for_open_el">{{ route.owner.email }}</span>
+                                <span class="email_carrier_span el_for_open_el {% if route.owner == user %} active{% endif %}">{{ route.owner.email }}</span>
                 {#                <input value="{{ route.owner.email }}">#}
                                 <div class="clear_both"></div>
             {#                    <div>{{ route.get_cargo_type_display }}</div>#}
@@ -166,6 +166,7 @@
             {% if  user.is_authenticated %}
                 <button
                     class="open_inf_carrier"
+                    {% if route.owner == user %} style="display: none;"{% endif %}
                     onclick="show_inf_carrier(this)"
                 >
                     {% translate "Открыть контакт"%}

yandex_e643f0a07c2bfc92.html

@@ -0,0 +1,6 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>Verification: e643f0a07c2bfc92</body>
+</html>