Merge remote-tracking branch 'origin/main'

templates/blocks/b_header.html

@@ -135,4 +135,7 @@
         </div>
         
         <div class="clear_both"></div>
-    </div>
+    </div>
+
+  </header>
+<div class="line_f_header"></div>

templates/inter/meta_names.html

@@ -1,11 +1,11 @@
-<title>{{ page.get_title }}</title>
+{#<title>{{ page.get_title }}</title>#}
 
-{% if page.get_description %}
-    <meta name="description" content="{{ page.get_description }}"/>
-{% endif %}
+{#{% if page.get_description %}#}
+{#    <meta name="description" content="{{ page.get_description }}"/>#}
+{#{% endif %}#}
 
-{% if page.seo_keywords %}
-    <meta name="keywords" content="{{ page.seo_keywords }}"/>
-{% elif page.get_description %}
-    <meta name="keywords" content="{{ page.get_description }}"/>
-{% endif %}
+{#{% if page.seo_keywords %}#}
+{#    <meta name="keywords" content="{{ page.seo_keywords }}"/>#}
+{#{% elif page.get_description %}#}
+{#    <meta name="keywords" content="{{ page.get_description }}"/>#}
+{#{% endif %}#}

templates/tb_base.html

@@ -48,8 +48,8 @@
   gtag('config', 'G-2WW2PTG5BM');
 </script>
 
-  </header>
-<div class="line_f_header"></div>
+{#  </header>#}
+{#<div class="line_f_header"></div>#}
 
 
  <title>

templates/widgets/routes/w_my_route.html

@@ -2,7 +2,8 @@
 {% load i18n %}
 
 
-<div class="carrier-card"{% if route.highlight_color %} style="border: 5px solid {{ route.highlight_color }};"{% endif %} data-number-of-route="{{ route.id }}">
+<div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
+{#<div class="carrier-card"{% if route.highlight_color %} style="border: 5px solid {{ route.highlight_color }};"{% endif %} data-number-of-route="{{ route.id }}">#}
     <div class="left-part-carrier-card">
 {#        <div class="first-line-card-carrier">#}
 {#            <div class="carrier-title">#}
@@ -67,9 +68,7 @@
                             <div class="label_text">{% trans "Поднять объявление" %}</div>
                         </label>
                  </div>
-                 <div class="sub_label_text">{% trans "Осталось поднятий " %} <span
-                         id="remains_route_rising_count"
-                 >{% if form.data.remainsRisingCount  %}{{ form.data.remainsRisingCount }}{% else %}{{ remains_route_rising_count }}{% endif %}</span></div>
+                 <div class="sub_label_text">{% trans "Осталось поднятий " %} <span id="remains_route_rising_count">{% if form.data.remains_route_rising_count  %}{{ form.data.remains_route_rising_count }}{% else %}{{ remains_route_rising_count }}{% endif %}</span></div>
 
                  <div class="checkbox_wrapper">
                         <input type="radio"
@@ -148,7 +147,7 @@
                 <div class="button_remove_route">
                      <button
                          onclick="editRoute({{ route.id }})"
-                         class="edit_route"
+                         class="edit_route {% if route.highlight_color %} highlight-color {% endif %}"
                          id="edit_route_{{ route.id }}">
                         {% translate "Редактировать" %}
                      </button>

templates/widgets/w_carrier_card.html

@@ -176,7 +176,8 @@
             {% endif %}
 
 
-            {% if not user.is_authenticated and show_contacts_allow %}
+            {% if not user.is_authenticated %}
+{#            {% if not user.is_authenticated and show_contacts_allow %}#}
                 <div class="show_contact_wrapper">
                     <a class="open_inf_carrier" href='{% url "login_profile" %}'>
                                 {% translate "Открыть контакт"%}