sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.0.183 media 360px v.3.1

Browse Source
This commit is contained in:
ArtemB
2023-10-26 16:26:29 +03:00
parent 31833000bb
commit d3fd7b7428
7 changed files with 104 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
static/css/mobile_styles.css
View File

@@ -20,10 +20,26 @@
display: none;
}
.container_form_search_carrier{
margin: 10px;
.container_form_search_carrier{
flex-direction: column;
width: unset;
margin: 170px 10px 10px 10px;
}
#abbreviation_airport_in_search{
float: left;
height: 95%;
border-radius: 0 10px 0 0;
border-top: 2px solid #E6E6E6;
border-right: 2px solid #E6E6E6;
border-bottom: 2px solid #E6E6E6;
}
.from_address_point_txt.find_route.first{
border-radius: 10px 0 0 0;
border-top: 2px solid #E6E6E6;
border-bottom: 2px solid #E6E6E6;
border-left: 2px solid #E6E6E6;
}
.button_profile_header{
display: none;
@@ -128,11 +144,7 @@
.news_item {
margin-bottom: 20px;
}
.container_form_search_carrier{
flex-direction: column;
margin-top: 170px;
width: unset;
}
.header-second-item,
.header_btn_sender,

11
static/css/styles.css
View File

@@ -361,16 +361,16 @@ footer>div {
color: #272424;
}
.sf_1-column{
.sf_1_column{
padding-left: 80px;
padding-right: 230px;
}
.sf_2-column,
.sf_3-column
.sf_2_column,
.sf_3_column
{
padding-right: 40px;
}
.sf_4-column{
.sf_4_column{
display: inline-block;
}
@@ -604,7 +604,8 @@ header .header-second {
.header-second-item,
.cont_header_btn_profile{
.cont_header_btn_profile,
.header-second-item-lang{
display: inline-block;
vertical-align: middle;
}

16
static/js/global_js.js
View File

@@ -51,21 +51,7 @@ window.addEventListener('scroll', () => {
// Действия при изменении URL
// function changeImgLang(el) {
//
// let img = document.getElementById('dropbtn_lang')
//
// if (el.innerText === 'RU'){
// img.style.background = "url('/static/img/png/ru.png') no-repeat left center;"
// }
// else if(el.innerText === 'EN'){
// img.style.background = "url('/static/img/png/en.png')"
// img.style.backgroundRepeat = "no-repeat"
// img.style.backgroundPosition = "left center"
//
// }
//
// }

75
static/js/user_profile.js
View File

@@ -15,12 +15,22 @@ function writeMessage(el){
document.querySelector(".info_profile").innerHTML = data.html;
let list_div = document.querySelectorAll('.menu_profile div');
let ru_lang = document.getElementById('ru_lang');
let en_lang = document.getElementById('en_lang');
ru_lang.pathname = "/ru/profile/page/chat/";
en_lang.pathname = "/en/profile/page/chat/";
list_div.forEach(el=>{ el.classList.remove('selected'); });
el.classList.add('selected')
let body = document.querySelector("body")
body.style.overflow = "hidden"
//updating the url without reloading
window.history.pushState(null, null, '/ru/profile/page/chat/')
if (window.location.href.indexOf("/ru/") > -1) {
window.history.pushState(null, null, '/ru/profile/page/chat/')
} else if(window.location.href.indexOf("/en/") > -1){
window.history.pushState(null, null, '/en/profile/page/chat/')
}
middleWareJS()
},
@@ -33,6 +43,7 @@ function writeMessage(el){
function technicalSupport(el){
console.log(el)
$.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: '/user_account/support_tickets/',
@@ -50,11 +61,20 @@ function technicalSupport(el){
document.querySelector(".info_profile").innerHTML = data.html;
let list_div = document.querySelectorAll('.menu_profile div');
let ru_lang = document.getElementById('ru_lang');
let en_lang = document.getElementById('en_lang');
ru_lang.pathname = "/ru/profile/page/support/";
en_lang.pathname = "/en/profile/page/support/";
list_div.forEach(el=>{ el.classList.remove('selected'); });
el.classList.add('selected')
//updating the url without reloading
window.history.pushState(null, null, '/ru/profile/page/support/')
if (window.location.href.indexOf("/ru/") > -1) {
window.history.pushState(null, null, '/ru/profile/page/support/')
} else if(window.location.href.indexOf("/en/") > -1){
window.history.pushState(null, null, '/en/profile/page/support/')
}
middleWareJS()
},
@@ -82,13 +102,21 @@ function mySubscription(el){
// location.href = '/profile'
// document.querySelector(".info_profile").innerHTML = data.html;
let ru_lang = document.getElementById('ru_lang');
let en_lang = document.getElementById('en_lang');
ru_lang.pathname = "/ru/profile/page/my_subscribe/";
en_lang.pathname = "/en/profile/page/my_subscribe/";
let list_div = document.querySelectorAll('.menu_profile div');
list_div.forEach(el=>{ el.classList.remove('selected'); });
el.classList.add('selected')
//updating the url without reloading
window.history.pushState(null, null, '/ru/profile/page/my_subscribe/')
if (window.location.href.indexOf("/ru/") > -1) {
window.history.pushState(null, null, '/ru/profile/page/my_subscribe/')
} else if(window.location.href.indexOf("/en/") > -1){
window.history.pushState(null, null, '/en/profile/page/my_subscribe/')
}
middleWareJS()
},
@@ -114,13 +142,21 @@ function myProfile(el){
// location.href = '/profile'
document.querySelector(".info_profile").innerHTML = data.html;
let ru_lang = document.getElementById('ru_lang');
let en_lang = document.getElementById('en_lang');
ru_lang.pathname = "/ru/profile/page/change_profile/";
en_lang.pathname = "/en/profile/page/change_profile/";
let list_div = document.querySelectorAll('.menu_profile div');
list_div.forEach(el=>{ el.classList.remove('selected'); });
el.classList.add('selected')
//updating the url without reloading
window.history.pushState(null, null, '/ru/profile/page/change_profile/')
if (window.location.href.indexOf("/ru/") > -1) {
window.history.pushState(null, null, '/ru/profile/page/change_profile/')
} else if(window.location.href.indexOf("/en/") > -1){
window.history.pushState(null, null, '/en/profile/page/change_profile/')
}
middleWareJS()
},
@@ -608,14 +644,22 @@ function createRoute(el, owner_type){
document.querySelector(".info_profile").innerHTML = data.html
let list_div = document.querySelectorAll('.menu_profile div');
let ru_lang = document.getElementById('ru_lang');
let en_lang = document.getElementById('en_lang');
list_div.forEach(el=>{ el.classList.remove('selected'); });
el.classList.add('selected')
//updating the url without reloading
if(el.id == 'customer'){
// updating the url without reload
if(el.id === 'customer'){
window.history.pushState(null, null, '/ru/profile/page/create_route_for_customer/')
ru_lang.pathname = "/ru/profile/page/create_route_for_customer/";
en_lang.pathname = "/en/profile/page/create_route_for_customer/";
} else {
window.history.pushState(null, null, '/ru/profile/page/create_route_for_mover/')
ru_lang.pathname = "/ru/profile/page/create_route_for_mover/";
en_lang.pathname = "/en/profile/page/create_route_for_mover/";
}
middleWareJS()
@@ -657,13 +701,26 @@ function getRoute(el){
// location.href = '/profile'
document.querySelector(".info_profile").innerHTML = data.html;
let ru_lang = document.getElementById('ru_lang');
let en_lang = document.getElementById('en_lang');
ru_lang.pathname = "/ru/profile/page/my_routes/";
en_lang.pathname = "/en/profile/page/my_routes/";
let list_div = document.querySelectorAll('.menu_profile div');
list_div.forEach(el=>{ el.classList.remove('selected'); });
el.classList.add('selected')
window.history.pushState(null, null, '/ru/profile/page/my_routes/')
if (window.location.href.indexOf("/ru/") > -1) {
window.history.pushState(null, null, '/ru/profile/page/my_routes/')
} else if(window.location.href.indexOf("/en/") > -1){
window.history.pushState(null, null, '/en/profile/page/my_routes/')
}
middleWareJS()

14
templates/blocks/b_footer.html
View File

@@ -68,14 +68,16 @@
<div class="second-footer">
<div>
<div class="sf_1-column">Copyright © 2023. Все права защищены.</div>
<div class="sf_2-column">
<div class="sf_1_column">Copyright © 2023. Все права защищены.</div>
<div class="sf_2_column">
<a href="/ru/info_page/publichnaya-oferta/">Публичная оферта</a>
</div>
<div class="sf_3-column">
<a href="/ru/info_page/politika-konfidencialnosti/">Политика конфиденциальности</a></div>
<div class="sf_4-column">
<a href="/ru/info_page/pravila-polzovaniya-servisom/">Правила пользования сервисом</a></div>
<div class="sf_3_column">
<a href="/ru/info_page/politika-konfidencialnosti/">Политика конфиденциальности</a>
</div>
<div class="sf_4_column">
<a href="/ru/info_page/pravila-polzovaniya-servisom/">Правила пользования сервисом</a>
</div>
</div>

6
templates/blocks/b_header.html
View File

@@ -39,12 +39,12 @@
</div>
<div class="header-second">
<div class="header-second-item">
<div class="header-second-item-lang">
<div class="dropdown_lang">
<div id="dropbtn_lang" class="dropbtn_lang">RU</div>
<div class="dropdown-content-lang">
<a onclick="changeImgLang(this)" href="/ru{{ request.path|del_lang_from_path }}">RU</a>
<a onclick="changeImgLang(this)" href="/en{{ request.path|del_lang_from_path }}">EN</a>
<a id="ru_lang" href="/ru{{ request.path|del_lang_from_path }}">RU</a>
<a id="en_lang" href="/en{{ request.path|del_lang_from_path }}">EN</a>
</div>
</div>
</div>

2
templates/forms/f_find_route_form_main_find_routes.html
View File

@@ -32,7 +32,7 @@
id="id_from_address_point_txt"
{% if route_form.initial.from_address_point_txt %}value="{{ route_form.initial.from_address_point_txt }}"{% endif %}
/>
<div class="abbreviation_airport_in_search"></div>
<div id="abbreviation_airport_in_search" class="abbreviation_airport_in_search"></div>
<div class="input_list find_route" name="from_address_point_txt_list">
</div>