diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 008796e..209ac3b 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2390,6 +2390,27 @@ height: 695px; } +.menu_buttons.left::-webkit-scrollbar-track{ + background-color: #F6F6F6; + display: none; +} + +.menu_buttons.left::-webkit-scrollbar-thumb{ + background-color: #989898; + border-radius: 3px; + width: 3px; + display: none; +} + +.menu_buttons.left::-webkit-scrollbar{ + background-color:#FF613A; + width: 4px; + display: none; +} + + + + .menu_buttons{ /*background: #FFFFFF;*/ /*height: 100vh;*/ diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 5898ba1..be0c599 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -9,7 +9,6 @@ profile_tabs_f_static_map = new Map([ ['dashboard','dashboard'] ]) - function select_tab_profile (el,url,owner_type=null) { let data = {} let confirm_url = `/user_account/${url}/` @@ -80,6 +79,9 @@ function select_tab_profile (el,url,owner_type=null) { setStandartSettingsToBlockOverlay() } + if (window.location.href.includes("profile")){ + selectTabProfileIfHisNotSelected(url) + } }, error: function (data){ console.log(data) @@ -87,6 +89,13 @@ function select_tab_profile (el,url,owner_type=null) { } }); } + + +function selectTabProfileIfHisNotSelected (url) { + let el_f_select = document.querySelector(`[data-ajax-url=${url}]`) + el_f_select.classList.add('selected') +} + function clickONTHEAPROfileBTN (el) { let el_f_click = el.querySelector(".text_btn_profile") el_f_click.click() diff --git a/templates/blocks/profile/b_profile_first_page.html b/templates/blocks/profile/b_profile_first_page.html index 4482f52..1a26764 100644 --- a/templates/blocks/profile/b_profile_first_page.html +++ b/templates/blocks/profile/b_profile_first_page.html @@ -23,8 +23,6 @@
{% translate "Если у Вас возникнут вопросы Вы можете связаться с нами:" %} support@twb.com
{% blocktrans %}У Вас {{ unanswered_msgs_count }} новых сообщений{% endblocktrans %} - - - {% translate "Посмотреть" %} + {% translate "Посмотреть" %}
{#
{% translate "Хотите получать уведомление о появлении посылок?" %} {% translate "Заполните форму" %}
#} \ No newline at end of file diff --git a/templates/forms/f_find_route_form_main_find_routes.html b/templates/forms/f_find_route_form_main_find_routes.html index 25643dc..c820f44 100644 --- a/templates/forms/f_find_route_form_main_find_routes.html +++ b/templates/forms/f_find_route_form_main_find_routes.html @@ -78,13 +78,13 @@
{# #} - +
{# #} - +
diff --git a/templates/widgets/profile/w_button_for_profile_menu.html b/templates/widgets/profile/w_button_for_profile_menu.html index 879d611..41b442c 100644 --- a/templates/widgets/profile/w_button_for_profile_menu.html +++ b/templates/widgets/profile/w_button_for_profile_menu.html @@ -1,6 +1,6 @@