Merge remote-tracking branch 'origin/main'

templates/blocks/b_header.html

@@ -9,7 +9,29 @@
     <div>
       <div><a href="#"><img src="/static/img/png/ru.png" alt=""></a></div>
       <div><img class="svg" src="/static/img/svg/Helpdesk_%20Icon.svg"><a href="#">Служба поддержки</a></div>
-      <a href="{% url "registration_page" %}">Регистрация</a>
-      <a href="{% url "login_profile" %}">Войти</a>
+        {% if user.is_authenticated %}
+            <a
+
+              href="{% url "user_profile" %}">
+              Профиль
+            </a>
+
+        {% endif %}
+
+        {% if not user.is_authenticated %}
+            <a
+              class="registration_button"
+              href="{% url "registration_page" %}">
+              Регистрация
+            </a>
+
+            <a
+              class="enter_button"
+              href="{% url "login_profile" %}">
+              Войти
+            </a>
+
+        {% endif %}
+
     </div>
   </header>

templates/blocks/profile/b_new_route.html

@@ -182,8 +182,11 @@
   </div>
 
 <div class="checkbox_cargo_type">
+
             {% for item in form.fields.cargo_type.choices  %}
-                <input
+                <div>
+                    <input
+                        class="custom-checkbox"
                         type="checkbox"
                         name="cargo_type"   
                         id="id_cargo_type_{{ forloop.counter }}"
@@ -191,12 +194,16 @@
                         value="{{ item.0 }}"
                         {% if form.initial.cargo_type == item.0 %}
                         checked="checked"
-                        {% endif %}/>
-                        <label for="id_cargo_type_{{ forloop.counter }}" >
-                            {{ item.1 }}
-                        </label>
+                        {% endif %}
+                    />
+
+                    <label for="id_cargo_type_{{ forloop.counter }}" >
+                        {{ item.1 }}
+                    </label>
+                </div>
             {% endfor %}
 
+
 {#            <lable for="">#}
 {##}
 {#            </lable>#}