Merge remote-tracking branch 'origin/main'

static/css/mobile_styles.css

@@ -618,6 +618,13 @@
         border-radius: 10px;
         display: block;
     }
+    .menu_buttons.curtain.left.open.first.filters{
+        left: -320px;
+    }
+
+    .menu_buttons.curtain.left.open.filters{
+        left: 0;
+    }
 
     .menu_buttons.left.open{
         left: 0;
@@ -708,9 +715,6 @@
         top: 0;
         right: 0;
     }
-    .block_overlay.show.routes{
-        display: block;
-    }
     #customer>a, #mover>a{
         left: 5%;
     }
@@ -1179,6 +1183,9 @@
     .block_overlay.show{
         display: block;
      }
+    .block_overlay.show.routes {
+        display: block;
+    }
     /*этот стиль перекрывал блок диалога в сообщения блюром*/
     .menu_buttons.right.open {
         right: 0;

static/css/styles(boris).css

@@ -2290,7 +2290,7 @@
     z-index: 998;
     top: 61px;
     float: right;
-    height: 695px;
+    /*height: 695px;*/
 }
 
 .cut_width_f_curtain.left{
@@ -2301,7 +2301,7 @@
     z-index: 998;
     top: 61px;
     float: left;
-    height: 695px;
+    /*height: 695px;*/
 }
 
 .menu_buttons{
@@ -2430,6 +2430,11 @@
     color: #000000;
     left: 272px;
 }
+.menu_buttons.left.open.first.filters .handler_menu{
+    background: #FF613A;
+    color: #FFFFFF;
+    left: -49px;
+}
 .menu_buttons.right.open .handler_menu{
     background: #FFFFFF;
     color: #000000;
@@ -2491,6 +2496,15 @@
     padding-left: 10px;
 }
 
+.menu_buttons.left.open.first.filters .btns_f_curtain{
+    transition: 200ms;
+    transform: rotate(270deg);
+    filter: brightness(0) saturate(100%) invert(100%) sepia(2%) saturate(0%) hue-rotate(162deg) brightness(104%) contrast(103%);
+    padding-left: 10px;
+    position: relative;
+    top: 10px;
+}
+
  .text_f_curtain{
      display: inline-block;
  }

static/js/user_profile_2.js

@@ -729,7 +729,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
     }
     if (close){
         // curtain = getOpenCurtain()
-
+        turnOffFirst(curtain)
         let handler_text = curtain.querySelector('.text_f_curtain')
 
         handler_text.innerHTML = curtain_name
@@ -747,56 +747,71 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
         }
     } else {
 
-        let user_type = getInfoAboutUser()
-        if (user_type === 'mobile' || !window.location.host.includes('profile') || user_type === 'laptop' ) {
-            curtain.classList.toggle("open")
-            curtain.classList.toggle("close")
-            newCurtainZIndex()
-            let curtain_check = getOpenCurtain()
-            if (curtain_check.length > 1){
-                let curtain_old = getCurtainWIncreaceZindex(curtain_check,'decreace')['increace']
-                curtain_old.classList.toggle("close")
-                curtain_old.classList.toggle("open")
+        if (curtain.classList.contains('first')){
+            turnOffFirst(curtain)
+            let overlay = document.querySelector('.block_overlay.show')
+            if (!overlay){
+                let overlay_clear = document.querySelector(".block_overlay")
+                overlay_clear.classList.toggle('show')
+                overlay_clear.classList.toggle('hidden')
             }
-            if (curtain_check.length > 0){
-                let overlay = document.querySelector('.block_overlay.show')
-                if (!overlay){
-                    let overlay_clear = document.querySelector(".block_overlay")
-                    overlay_clear.classList.toggle('show')
-                    overlay_clear.classList.toggle('hidden')
+        } else {
+            let user_type = getInfoAboutUser()
+            if (user_type === 'mobile' || !window.location.host.includes('profile') || user_type === 'laptop' ) {
+                curtain.classList.toggle("open")
+                curtain.classList.toggle("close")
+                newCurtainZIndex()
+                let curtain_check = getOpenCurtain()
+                if (curtain_check.length > 1){
+                    let curtain_old = getCurtainWIncreaceZindex(curtain_check,'decreace')['increace']
+                    curtain_old.classList.toggle("close")
+                    curtain_old.classList.toggle("open")
+                }
+                if (curtain_check.length > 0){
+                    let overlay = document.querySelector('.block_overlay.show')
+                    if (!overlay){
+                        let overlay_clear = document.querySelector(".block_overlay")
+                        overlay_clear.classList.toggle('show')
+                        overlay_clear.classList.toggle('hidden')
+                    }
+                } else {
+
+                    closeOverlay()
+
                 }
             } else {
-
-                closeOverlay()
-
+                if (!window.location.href.includes('profile')){
+                //
+                }
             }
-        } else {
-            if (!window.location.href.includes('profile')){
-            //
+
+
+            let handler_text = curtain.querySelector('.text_f_curtain')
+            if (curtain.classList.contains('open')){
+                handler_text.innerHTML = 'Закрыть'
+                handler_text.style.fontSize = '13px'
+            } else {
+                handler_text.innerHTML = curtain_name
+                handler_text.style.fontSize = '13px'
+            }
+
+            if (!curtain.classList.contains('open')){
+                body.style.overflowY = ''
+            } else {
+                body.style.overflowY = 'hidden'
             }
         }
-
-
-        let handler_text = curtain.querySelector('.text_f_curtain')
-        if (curtain.classList.contains('open')){
-            handler_text.innerHTML = 'Закрыть'
-            handler_text.style.fontSize = '13px'
-        } else {
-            handler_text.innerHTML = curtain_name
-            handler_text.style.fontSize = '13px'
-        }
-
-        if (!curtain.classList.contains('open')){
-            body.style.overflowY = ''
-        } else {
-            body.style.overflowY = 'hidden'
-        }
-
     }
 
 
 }
 
+function turnOffFirst (el) {
+    if (el.classList.contains('first')){
+        el.classList.remove('first')
+    }
+}
+
 function closeOverlay () {
     let curt = getOpenCurtain()
     if (curt.length > 1){

templates/tb_base.html

@@ -53,7 +53,7 @@
     {% endblock %}
 </head>
 <body {% if page_type == 'routes' %}onscroll="scroll_ev(event,this)" {% endif %}>
-<div class="block_overlay  {% if page_type == 'profile' %}show{% elif page_type == 'routes' %} show routes n_profile{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
+<div class="block_overlay  {% if page_type == 'profile' %}show{% elif page_type == 'routes' %} routes n_profile{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
 <div class="wrapper_main">
 
     {% include 'blocks/b_header.html' %}
@@ -72,7 +72,7 @@
         </div>
     {% if page_type == 'routes' %}
         <div class="cut_width_f_curtain left">
-            <div class="menu_buttons curtain left open filters" data-name="Фильтры">
+            <div class="menu_buttons curtain left open first filters" data-name="Фильтры">
 
                 {% include "forms/f_find_route_filters_form.html" %}
                 <div class="handler_menu close" onclick="open_curtain('left')">