From 3aa4b774bd9df52dbf6aa0a0c3105144ec4a019e Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Mon, 6 Nov 2023 14:10:17 +0300
Subject: [PATCH] 0.0.327

---
 static/css/styles(boris).css | 24 ++++++++++++++++++++++--
 static/css/styles.css        |  4 ++--
 static/js/range_calendar.js  |  2 +-
 static/js/user_profile.js    |  3 ++-
 static/js/user_profile_2.js  |  8 ++++++++
 templates/tb_base.html       |  8 +++++---
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index 89f48de..e9d77e9 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -20,7 +20,7 @@
     width: 100%;
 
 }
-.text-align-left{
+.text-align-left {
     text-align: -webkit-left;
     width: 100%;
 
@@ -37,10 +37,29 @@
     display: none;
 }
 
+.block_overlay.n_profile{
+    height: 100vh;
+    width: 100vw;
+    background: rgba(39, 53, 62, 0.7);
+    backdrop-filter: blur(15px);
+    z-index: 100;
+    position: fixed;
+    top: 86px;
+}
+
+.block_overlay.n_profile.show{
+    display: block;
+}
+
 .block_overlay.hidden{
     display: none;
 }
 
+.block_overlay.n_profile.hidden{
+    display: none;
+}
+
+
 .w-68{
     width: 68%;
 }
@@ -2213,10 +2232,11 @@
 .menu_buttons.right.open{
     right: 0;
     transition: 200ms;
-    position: unset;
+    position: absolute;
     display: block;
     padding-top: 10px;
     width: 320px;
+    top: 0;
 }
 
 .menu_buttons.left.open{
diff --git a/static/css/styles.css b/static/css/styles.css
index 52d7a6e..e5f755d 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -142,7 +142,7 @@ html, body{
 .wrapper_content {
     margin: 55px auto;
     max-width: 1280px;
-
+    position: relative;
 }
 
 /*.wrapper_main{*/
@@ -1119,7 +1119,7 @@ h2.title_new_route{
 .menu_profile {
     width: 31%;
     /*margin-right: 40px;*/
-    float: left;
+    /*float: left;*/
 }
 
 .menu_profile>div {
diff --git a/static/js/range_calendar.js b/static/js/range_calendar.js
index 5ea2651..8639baf 100644
--- a/static/js/range_calendar.js
+++ b/static/js/range_calendar.js
@@ -43,7 +43,7 @@
 //             });
 //         }
 // });
-function init_arrival_DT (date,single=true,hour=true){
+function init_arrival_DT (date=null,single=true,hour=true){
     let minDate = null
     if (date){
         minDate = date
diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index 76f4314..256c3b3 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -699,7 +699,8 @@ function editRoute(id) {
                 changeTextButton.innerText = 'Сохранить изменения'
 
             }
-
+            init_departure_DT()
+            init_arrival_DT()
             sliderInit();
 
 
diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js
index aabc672..f8236be 100644
--- a/static/js/user_profile_2.js
+++ b/static/js/user_profile_2.js
@@ -58,6 +58,10 @@ function select_tab_profile (el,url,owner_type=null) {
             let user_type = getInfoAboutUser()
             if (user_type === 'mobile') {
                 closeCurtain()
+            } else {
+                if (!window.location.href.includes('profile')){
+                    closeCurtain()
+                }
             }
 
         },
@@ -659,6 +663,7 @@ function closeCurtain () {
 
 
 function open_curtain (left=null,right=null,overlay=null,close=null){
+    let page_profile = true
     let curtain_name = ''
     let curtain = ''
     if (left || right){
@@ -686,13 +691,16 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
         curtain.classList.add("close")
         let overlay = document.querySelector(".block_overlay")
         overlay.classList.add('hidden')
+        overlay.classList.remove('show')
     } else {
         if (overlay){
             overlay.classList.toggle("hidden")
+            overlay.classList.toggle("show")
         } else {
             let overlay = document.querySelector(".block_overlay")
             if (overlay){
                 overlay.classList.toggle("hidden")
+                overlay.classList.toggle("show")
             }
         }
 
diff --git a/templates/tb_base.html b/templates/tb_base.html
index 1ae2392..caaabe6 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -53,10 +53,12 @@
 </head>
 <body>
 
-<div class="block_overlay hidden" onclick="open_curtain()"></div>
+
 <div class="wrapper_main">
+
     {% 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="menu_buttons curtain left close" data-name="Меню">
 {#            {% include "blocks/profile/b_buttons_menu_profile.html" %}#}
             <div class="handler_menu close" onclick="open_curtain('left')">
@@ -68,11 +70,11 @@
         </div>
         {% block content %}
         {% endblock %}
-        <div class="menu_buttons curtain right open" data-name="Пользователи">
+        <div class="menu_buttons curtain right open" 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' %}">
-                <div class="text_f_curtain left">Пользователи</div>
+                <div class="text_f_curtain left">Меню кнопок</div>
                 <img class="btns_f_curtain close right"  src="{% static 'img/svg/arrow_f_curtain.svg' %}">
                 <div class="clear_both"></div>
             </div>