Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-12-03 14:38:29 +03:00
5 changed files with 35 additions and 7 deletions

View File

@@ -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;*/

View File

@@ -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()

View File

@@ -23,8 +23,6 @@
<div class="prof_first_line">{% translate "Если у Вас возникнут вопросы Вы можете связаться с нами:" %} <a href="mailto:support@twb.com">support@twb.com</a></div>
<div class="prof_second_line">
{% blocktrans %}У Вас {{ unanswered_msgs_count }} новых сообщений{% endblocktrans %}
<a href="#"></a>
<a href="#">{% translate "Посмотреть" %}</a>
<a onclick="select_tab_profile(this,'chats'{% if owner_type %},'{{ owner_type }}'{% endif %})"onclick="clickONTHEAPROfileBTN(this)">{% translate "Посмотреть" %}</a>
</div>
{# <div class="prof_third_line">{% translate "Хотите получать уведомление о появлении посылок?" %} <a href="#">{% translate "Заполните форму" %}</a></div>#}

View File

@@ -78,13 +78,13 @@
<div class="cont-el-form-search-carrier">
<label for="id_departure_DT">{% translate "Дата отправки" %}</label>
{# <input class="el_form_find_route" name="departure_DT" id="id_departure_DT" type="date" {% if route_form.fields.departure_DT.required %} {% endif %} {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %} >#}
<input class="el_form_find_route" type="text" id="id_departure_DT" name="departure_DT" placeholder="" {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %}/>
<input autocomplete="off" class="el_form_find_route" type="text" pattern="(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))" id="id_departure_DT" name="departure_DT" placeholder="" {% if route_form.initial.departure_DT %} value="{{ route_form.initial.departure_DT }}"{% endif %}/>
<div id="displayRegervation"></div>
</div>
<div class="cont-el-form-search-carrier">
<label for="id_arrival_DT">{% translate "Дата прибытия" %}</label>
{# <input class="el_form_find_route" name="arrival_DT" id="id_arrival_DT" type="date" {% if route_form.initial.arrival_DT %} value="{{ route_form.initial.arrival_DT }}"{% endif %}>#}
<input class="el_form_find_route" type="text" name="arrival_DT" id="id_arrival_DT" placeholder="" {% if route_form.initial.arrival_DT %} value="{{ route_form.initial.arrival_DT }}"{% endif %}/>
<input autocomplete="off" class="el_form_find_route" type="text" name="arrival_DT" id="id_arrival_DT" placeholder="" {% if route_form.initial.arrival_DT %} value="{{ route_form.initial.arrival_DT }}"{% endif %}/>
<div id="displayRegervation"></div>
</div>
<div class="cont-el-form-search-carrier last">

View File

@@ -1,6 +1,6 @@
<div
{% if dom_id %}id="{{ dom_id }}"{% endif %}
{% if ajax_url and page_type == 'profile' %}onclick="select_tab_profile(this,'{{ ajax_url }}'{% if owner_type %},'{{ owner_type }}'{% endif %})"{% else %}onclick="clickONTHEAPROfileBTN(this)"{% endif %}
{% if ajax_url and page_type == 'profile' %}data-ajax-url="{{ ajax_url }}" onclick="select_tab_profile(this,'{{ ajax_url }}'{% if owner_type %},'{{ owner_type }}'{% endif %})"{% else %}onclick="clickONTHEAPROfileBTN(this)"{% endif %}
{% if page_name == sel_page_name %}
class="selected"
{% endif %} >