diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index 173495a..56dc0fa 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -740,14 +740,19 @@
/*padding: 20px;*/
margin-bottom: 5px;
border-radius: 3px;
+ position: relative;
}
.name_ticket > span{
padding: 10px;
font-size: 16px;
display: block;
- overflow: hidden;
text-overflow: ellipsis;
+ position: absolute;
+ left: 0;
+ text-wrap: nowrap;
+ overflow: hidden;
+ width: calc(100% - 18px);
}
.insert_users{
@@ -2605,10 +2610,10 @@
.menu_profile{
width: 320px;
text-align: -webkit-center;
- padding: 14px 0;
+ padding: 0;
overflow-y: auto;
height: calc(100vh - 120px);
- max-height: 667px;
+ max-height: 697px;
background: #F8F8F8;
}
@@ -2637,7 +2642,16 @@
/*font-size: 12px;*/
line-height: 13px;
}
-
+.menu_profile>div>.logout{
+ height: 100%;
+ top: 0;
+ left: 0;
+}
+.logout_span{
+ position: absolute;
+ top: 20px;
+ left: 42%;
+}
/*left panel of users*/
.menu_buttons.left.close .container_block_list_of_users{
diff --git a/static/css/styles.css b/static/css/styles.css
index 1a9e460..cc1193d 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -1181,6 +1181,7 @@ h2.title_new_route{
position: unset;
height: unset;
width: 274px;
+ padding-top: 24px;
}
/*.menu_profile>div>a {*/
diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js
index 5a98976..cf73848 100644
--- a/static/js/user_profile_2.js
+++ b/static/js/user_profile_2.js
@@ -22,7 +22,9 @@ function select_tab_profile (el,url,owner_type=null) {
} else if (url.includes('get_routes')){
confirm_url = `/routes/${url}/`
}
- document.querySelector(".info_profile").innerHTML = ''
+ if (window.location.href.includes("profile")){
+ document.querySelector(".info_profile").innerHTML = '
'
+ }
$.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: confirm_url,
@@ -706,7 +708,7 @@ function open_overlay (curtain) {
overlay.classList.toggle('hidden')
}
} else {
- if (document.querySelector(".menu_buttons.left.open") && curtain.classList.contains('open')){
+ if (!document.querySelector(".menu_buttons.left.first.open") && document.querySelector(".menu_buttons.left.open") && curtain.classList.contains('open')){
} else {
overlay.classList.toggle("show")
@@ -716,6 +718,7 @@ function open_overlay (curtain) {
}
+
function toggle_cut_width_curtain (el) {
let parent = el.parentNode
parent.classList.toggle('open')
@@ -763,11 +766,13 @@ function close_open_curtain (){
last_open_curtain.classList.toggle('open')
last_open_curtain.classList.toggle('close')
open_overlay(last_open_curtain)
+ toggle_cut_width_curtain(last_open_curtain)
} else if (window.location.href.includes('profile')) {
let curtain = document.querySelector('.menu_buttons.right')
curtain.classList.toggle('open')
curtain.classList.toggle('close')
open_overlay(curtain)
+ toggle_cut_width_curtain(curtain)
}
} else {
@@ -775,8 +780,19 @@ function close_open_curtain (){
curtain.classList.toggle("open")
curtain.classList.toggle("close")
open_overlay(curtain)
+ toggle_cut_width_curtain(curtain)
}
+
+}
+
+function reAdressClickOnbackrground (event,el) {
+ // let overlay = document.querySelector(".block_overlay")
+ let element_click = document.elementFromPoint(event.pageX, event.pageY)
+ if (!element_click || element_click === el){
+ element_click = document.querySelector(".block_overlay")
+ }
+ element_click.click()
}
// function show_header_list () {
diff --git a/templates/tb_base.html b/templates/tb_base.html
index 9569877..2d21efc 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -56,9 +56,9 @@