diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 3a087f5..fce4614 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -3,7 +3,7 @@ @media (max-width: 1280px){ .remove_route{ - width: 100%; + text-align: center; } diff --git a/static/css/styles.css b/static/css/styles.css index 6729723..727aa96 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1980,7 +1980,7 @@ input#id_extra_phone display: inline-block; } -button#edit_route { +button#raise_route { display: block; height: 44px; width: 100%; @@ -1994,7 +1994,18 @@ button#edit_route { line-height: 26px; border-radius: 10px; text-align: center; - margin-bottom: 5px; + margin-bottom: 10px; +} + +.edit_route{ + width: 68%; + height: 44px; + border-radius: 10px; + background: #E6E6E6; + +} +.edit_route.hide{ + display: none; } .button_remove_route { @@ -2006,7 +2017,7 @@ button#edit_route { .remove_route { height: 44px; - width: 285px; + width: 30%; color: rgba(39, 36, 36, 0.60); } .remove_route.hide{ diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 9ec9751..dcaf17e 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -191,7 +191,9 @@ function removeRoute(el,route_id ) { function cancelRemove(route_id) { let confirm_remove = document.getElementById('confirm_remove_'+ route_id); let cancel_remove = document.getElementById('cancel_remove_'+ route_id); + let hide_edit_button = document.getElementById('edit_route_'+ route_id) + hide_edit_button.classList.toggle('hide') confirm_remove.classList.remove('show'); cancel_remove.classList.remove('show'); @@ -238,8 +240,11 @@ function hideBlock(el) { function confirmRemove(el, route_id) { + + let hide_edit_button = document.getElementById('edit_route_'+ route_id); let confirm_remove = document.getElementById('confirm_remove_'+ route_id); let cancel_remove = document.getElementById('cancel_remove_'+ route_id); + hide_edit_button.classList.toggle('hide') confirm_remove.classList.add('show'); cancel_remove.classList.add('show'); diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index b78c79c..ab6b4f7 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -95,6 +95,10 @@ function select_tab_profile (el,url,owner_type=null) { } } } + if(window.location.href.includes("my_subscribe") && data.check_orders_required === true) { + select_tab_profile() + } + setCokie(365,'twb_new_messages','false') }, error: function (data){ diff --git a/templates/blocks/profile/b_subscribe_current.html b/templates/blocks/profile/b_subscribe_current.html index e268cd6..66f33b9 100644 --- a/templates/blocks/profile/b_subscribe_current.html +++ b/templates/blocks/profile/b_subscribe_current.html @@ -4,6 +4,8 @@ {#