diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index 17aebe0..6667168 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -43,7 +43,7 @@
}
.block_overlay.n_profile{
- height: 100%;
+ height: 105%;
width: 100%;
/*background: rgba(39, 53, 62, 0.7);*/
backdrop-filter: blur(6px);
@@ -978,11 +978,32 @@
width: calc(100% - 35px);
}
+.to_address_point_txt.post_route.w_100{
+ border: 1px solid #E6E6E6;
+ width: calc(100% - 35px);
+ border-radius: 15px;
+}
+
.from_address_point_txt.find_route.first.w_100{
width: calc(100% - 35px);
border-right: 1px solid #E6E6E6;
}
+.from_address_point_txt.post_route.first.w_100{
+ width: calc(100% - 35px);
+ border-right: 1px solid #E6E6E6;
+}
+
+.to_address_point_txt.post_route.first.w_100{
+ width: calc(100% - 35px);
+ border-right: 1px solid #E6E6E6;
+}
+
+.to_address_point_txt.post_route.first.w_100{
+ width: calc(100% - 35px);
+ border-right: 1px solid #E6E6E6;
+}
+
.to_address_point_txt.find_route.w_100{
border: 1px solid #E6E6E6;
width: calc(100% - 35px);
@@ -1009,6 +1030,46 @@
font-size: 14px;
}
+.to_address_point_txt.post_route{
+ display: block;
+ border-left: 1px solid #E6E6E6;
+ border-top: 1px solid #E6E6E6;
+ border-right: 0;
+ border-bottom: 1px solid #E6E6E6;
+ color: #272424;
+ font-family: Inter;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 22px;
+ appearance: none;
+ margin-top: 10px;
+ height: 20px;
+ border-radius: 15px 0 0 15px;
+ padding: 20px 15.2px;
+ width: calc(100% - 95px);
+}
+
+.from_address_point_txt.post_route{
+ display: block;
+ border-left: 1px solid #E6E6E6;
+ border-top: 1px solid #E6E6E6;
+ border-right: 0;
+ border-bottom: 1px solid #E6E6E6;
+ color: #272424;
+ font-family: Inter;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 22px;
+ appearance: none;
+ margin-top: 10px;
+ height: 20px;
+ border-radius: 15px 0 0 15px;
+ padding: 20px 15.2px;
+ width: calc(100% - 95px);
+}
+
.input_list.find_route{
width: 100%;
/* display: block; */
@@ -1112,6 +1173,10 @@
cursor: text;
}
+.abbreviation_airport_in_search.post_route{
+ float: right;
+}
+
.abbreviation_airport_in_search.hide{
display: none;
}
@@ -2293,6 +2358,20 @@
height: 695px;
}
+.cut_width_f_curtain.n_profile{
+ position: fixed;
+ min-width: 1280px;
+}
+
+.cut_width_f_curtain.close{
+ z-index: -1;
+}
+
+.cut_width_f_curtain.open{
+ z-index: 101;
+}
+
+
.cut_width_f_curtain.left{
max-width: 1280px;
text-align: -webkit-right;
@@ -2391,6 +2470,7 @@
}
+
.menu_buttons.left.open{
left: 0;
transition: 200ms;
@@ -2679,9 +2759,9 @@
}
-.block_overlay.show.routes{
- display: none;
-}
+/*.block_overlay.show.routes{*/
+/* display: none;*/
+/*}*/
.menu_buttons.left.close.filters{
width: 294px;
diff --git a/static/js/global_js.js b/static/js/global_js.js
index d67455f..8f6369b 100644
--- a/static/js/global_js.js
+++ b/static/js/global_js.js
@@ -5,6 +5,32 @@
// window.onfocus = function () {
// getSocketState()
// }
+let map_of_words_en = new Map([
+ ['закрыть'],['Close']
+])
+let map_of_words_ru = new Map([
+ ['close'],['Закрыть']
+])
+function translate_words (word,lang){
+ let corr_word = word.toLowersCase()
+ let trans_word = null
+ if (lang === 'ru'){
+ trans_word = map_of_words_ru.get(`${corr_word}`)
+
+ } else if (lang === 'en') {
+ trans_word = map_of_words_en.get(`${corr_word}`)
+ }
+
+}
+
+function check_return_trans_word (str) {
+ if (!str === undefined && str === '' && str){
+ return str
+ } else {
+ console.log(`error! str = ${str}`)
+ }
+}
+
window.onload = function (){
middleWareJS()
}
diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index cf42b84..23ee4dd 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -232,32 +232,36 @@ function confirmRemove(el) {
function loader_place_ins_boris (el,type=null){
if (el){
+
let loader_place = document.querySelector(".abbreviation_airport_in_search")
let cur_loader_place = el.nextElementSibling
if (type){
cur_loader_place.innerHTML = ""
} else {
if (loader_place){
+
if (cur_loader_place.innerHTML === ''){
cur_loader_place.innerHTML = ""
} else {
cur_loader_place.innerHTML = "
"
}
+ changeWidthEL(el)
}
}
- changeWidthEL(el)
+
+
}
}
function searchTown(el){
if (el.value.length > 0){
- el.style.background = 'white url("/static/img/svg/loader.svg") no-repeat calc(100% - 15px) center';
+ // el.style.background = 'white url("/static/img/svg/loader.svg") no-repeat calc(100% - 15px) center';
}else {
- el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
+ // el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
}
if(el.value.length>=3){
@@ -290,7 +294,7 @@ function searchTown(el){
// enctype: 'json',
data: JSON.stringify(get_address_point),
success: function(data){
- el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
+ // el.style.background = 'white url("/static/img/png/icon-arrow.svg") no-repeat calc(100% - 15px) center';
loader_place_ins_boris(el,"el")
diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js
index 5171e19..2fdd88c 100644
--- a/static/js/user_profile_2.js
+++ b/static/js/user_profile_2.js
@@ -691,7 +691,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
let curtain = ''
let left_curtain = document.querySelector(".menu_buttons.left")
let right_curtain = document.querySelector(".menu_buttons.right")
-
+ let container_curtain = document.querySelector(".cut_width_f_curtain")
if (left || right){
if (left){
if (left_curtain){
@@ -738,12 +738,17 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
if (user_type === 'mobile' || user_type === 'laptop') {
curtain.classList.remove("open")
curtain.classList.add("close")
+ container_curtain.classList.remove("open")
+ container_curtain.classList.add("close")
+
closeOverlay()
} else if (!window.location.href.includes('profile')){
//
} else {
curtain.classList.remove("open")
curtain.classList.add("close")
+ container_curtain.classList.remove("open")
+ container_curtain.classList.add("close")
}
} else {
@@ -760,12 +765,14 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
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')
@@ -800,6 +807,8 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
} else {
body.style.overflowY = 'hidden'
}
+ container_curtain.classList.toggle("close")
+ container_curtain.classList.toggle("open")
}
}
diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index 6fa6c20..bde77fb 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -77,7 +77,6 @@
{# boris change input #}