From 09c74d8f8598050ec03bbe93638bc4e880eeae53 Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Mon, 6 Nov 2023 15:01:04 +0300
Subject: [PATCH] 0.0.328

---
 static/css/styles(boris).css                  | 23 +++++++++++--------
 static/css/styles.css                         |  3 ++-
 templates/blocks/b_header.html                |  2 +-
 .../profile/b_buttons_menu_profile.html       |  2 +-
 templates/blocks/profile/b_new_route.html     |  4 ++--
 templates/tb_base.html                        |  4 ++--
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index e9d77e9..c1b9183 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -28,23 +28,23 @@
 
 .block_overlay{
     height: 100vh;
-    width: 100vw;
+    /*width: 100vw;*/
     background: rgba(39, 53, 62, 0.7);
     backdrop-filter: blur(15px);
     z-index: 100;
-    position: fixed;
+    /*position: fixed;*/
     top: 86px;
     display: none;
 }
 
 .block_overlay.n_profile{
-    height: 100vh;
-    width: 100vw;
+    height: 100%;
+    width: 100%;
     background: rgba(39, 53, 62, 0.7);
     backdrop-filter: blur(15px);
     z-index: 100;
-    position: fixed;
-    top: 86px;
+    position: absolute;
+    top: -55px;
 }
 
 .block_overlay.n_profile.show{
@@ -2027,11 +2027,11 @@
 
 .line_f_header{
     position: sticky;
-    z-index: 1;
     height: 1px;
     background: #dad7d7;
     width: 100%;
     top: 60px;
+    z-index: 102;
 }
 
 /*profile block*/
@@ -2234,9 +2234,9 @@
     transition: 200ms;
     position: absolute;
     display: block;
-    padding-top: 10px;
+    /*padding-top: 10px;*/
     width: 320px;
-    top: 0;
+    top: -54px;
 }
 
 .menu_buttons.left.open{
@@ -2328,6 +2328,11 @@
 .menu_profile{
     width: 320px;
     text-align: -webkit-center;
+    padding: 14px 0;
+}
+
+.menu_profile.background{
+    background: #FFFFFF;
 }
 
 .menu_profile>div{
diff --git a/static/css/styles.css b/static/css/styles.css
index e5f755d..7f34125 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -222,9 +222,9 @@ header {
     margin-top: 20px;
     padding: 5px 40px;
     position: sticky;
-    z-index: 4;
     top: 0;
     background: #F8F8F8;
+    z-index: 102;
 }
 
 
@@ -475,6 +475,7 @@ footer>div {
 .wrapper_header_content{
     max-width: 1280px;
     margin: 0 auto;
+    position: relative;
 }
 
 header .header-first {
diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html
index 0ad9c1b..ce40fd4 100644
--- a/templates/blocks/b_header.html
+++ b/templates/blocks/b_header.html
@@ -60,7 +60,7 @@
             {% if user.is_authenticated %}
                 {# boris changed #}
                     <div class="cont_header_btn_profile">
-                        <div class="button_profile_header" {% if not page.type == 'profile' %}onclick="open_curtain(null,'right')"{% endif %} data-user-id="{{ user.id }}">
+                        <div class="button_profile_header" {% if not page_type == 'profile' %}onclick="open_curtain(null,'right')"{% endif %} data-user-id="{{ user.id }}">
 {#                        <div class="button_profile_header" onclick="open_curtain(null,'right')"  data-user-id="{{ user.id }}">#}
 
                             <span class="btn_profile_name">
diff --git a/templates/blocks/profile/b_buttons_menu_profile.html b/templates/blocks/profile/b_buttons_menu_profile.html
index 6f80964..0cf4b43 100644
--- a/templates/blocks/profile/b_buttons_menu_profile.html
+++ b/templates/blocks/profile/b_buttons_menu_profile.html
@@ -1,6 +1,6 @@
 {% load static %}
 {% csrf_token %}
-<div class="menu_profile">
+<div class="menu_profile {% if not page_type == 'profile' %}background{% endif %}">
     {% with title="Поиск посылки" img_path="/static/img/svg/MagnifyingGlass.svg"%}
         {% include "widgets/profile/w_button_for_profile_menu.html" %}
     {% endwith %}
diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index b5f2f7b..e351bff 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -72,7 +72,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 }}"{% endif %}/>
+            <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 %}/>
             <div id="displayRegervation"></div>
             {# end #}
 
@@ -94,7 +94,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 }}"{% endif %}/>
+            <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 %}/>
 
             <div id="displayRegervation"></div>
         {# end #}
diff --git a/templates/tb_base.html b/templates/tb_base.html
index caaabe6..65dd9d3 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -58,7 +58,7 @@
 
     {% include 'blocks/b_header.html' %}
     <div class="wrapper_content">
-        <div class="block_overlay hidden {% if not page.type == 'profile' %}n_profile{% endif %}" onclick="open_curtain()"></div>
+        <div class="block_overlay hidden {% if not page_type == 'profile' %}n_profile{% endif %}" onclick="open_curtain()"></div>
         <div class="menu_buttons curtain left close" data-name="Меню">
 {#            {% include "blocks/profile/b_buttons_menu_profile.html" %}#}
             <div class="handler_menu close" onclick="open_curtain('left')">
@@ -70,7 +70,7 @@
         </div>
         {% block content %}
         {% endblock %}
-        <div class="menu_buttons curtain right open" data-name="Меню кнопок">
+        <div class="menu_buttons curtain right {% if page_type == 'profile' %}open{% else %} close{% endif %}" data-name="Меню кнопок">
             {% include "blocks/profile/b_buttons_menu_profile.html" %}
             <div class="handler_menu close" onclick="open_curtain(null,'right')">
                 <img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">