From 6f06f96a946c700f389f65c84618e170f64baa34 Mon Sep 17 00:00:00 2001 From: SBD Date: Sun, 19 Nov 2023 14:52:52 +0300 Subject: [PATCH 1/5] 0.8.369 --- static/css/styles(boris).css | 1 + static/js/find_route.js | 6 ++++++ templates/forms/f_find_route_form_main_find_routes.html | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 71970b2..9cb99bc 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1102,6 +1102,7 @@ border-right: 1px solid #E6E6E6; border-bottom: 1px solid #E6E6E6; border-left: 0; + cursor: text; } .abbreviation_airport_in_search.hide{ diff --git a/static/js/find_route.js b/static/js/find_route.js index 758076a..1d588ec 100644 --- a/static/js/find_route.js +++ b/static/js/find_route.js @@ -64,4 +64,10 @@ function changeWidthEL (el){ el.classList.add('w_100') } +} + +function focusOnInput (el) { + let parent = el.offsetParent + let input = parent.querySelector('.find_route') + input.focus() } \ 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 7a8f041..4f9e3cd 100644 --- a/templates/forms/f_find_route_form_main_find_routes.html +++ b/templates/forms/f_find_route_form_main_find_routes.html @@ -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 %} /> - +
@@ -69,7 +69,7 @@ id="id_to_address_point_txt" class="to_address_point_txt find_route" {% if route_form.initial.to_address_point_txt %}value="{{ route_form.initial.to_address_point_txt}}"{% endif %}/> -
+
From f7af979b7e2cc9c1d9cbb307009dadc79b4baadf Mon Sep 17 00:00:00 2001 From: SBD Date: Sun, 19 Nov 2023 14:58:02 +0300 Subject: [PATCH 2/5] 0.8.370 --- static/css/mobile_styles.css | 1 + static/css/styles(boris).css | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 052c92e..1d73003 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -566,6 +566,7 @@ .menu_buttons.left.open.filters{ max-height: 91vh; top: 0; + left: 0; } .block_w_paging.routes { width: 100%; diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 9cb99bc..bb98b5b 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1020,10 +1020,14 @@ .container_inp_w_abr{ height: 66%; - width: 98%; + width: 100%; position: relative; } +.block-find-route{ + min-height: 695px; +} + .cont-el-form-search-carrier > button{ width: 99%; border-radius: 10px; @@ -1146,7 +1150,7 @@ overflow-y: auto; } .block_w_paging.routes{ - width: 73%; + width: 71%; float: right; } @@ -2384,7 +2388,7 @@ background: #FFFFFF; border-radius: 10px; max-height: 83vh; - left: 0; + left: 19px; padding: 13px; /* position: fixed; */ float: left; From cc3a5c4a4f05e4a0db947e994c0f32d45d7a1c68 Mon Sep 17 00:00:00 2001 From: SBD Date: Sun, 19 Nov 2023 15:09:39 +0300 Subject: [PATCH 3/5] 0.8.371 --- static/js/user_profile_2.js | 5 +- templates/pages/p_article.html | 63 ++++++++++------------ templates/pages/p_articles.html | 28 ++++------ templates/widgets/w_news_element_item.html | 31 ++++------- 4 files changed, 50 insertions(+), 77 deletions(-) diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index c57b9ee..e2c14fa 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -53,8 +53,9 @@ function select_tab_profile (el,url,owner_type=null) { } document.querySelector("#ru_lang").href = confirm_url_f_lang_ru document.querySelector("#en_lang").href = confirm_url_f_lang_en - - + let header = document.querySelector("header") + header.scrollIntoView({ + behavior: "smooth", block: "end", inline: "nearest" }) middleWareJS() let user_type = getInfoAboutUser() if (user_type === 'mobile') { diff --git a/templates/pages/p_article.html b/templates/pages/p_article.html index aee4620..d88b3af 100644 --- a/templates/pages/p_article.html +++ b/templates/pages/p_article.html @@ -22,54 +22,45 @@
- {% for art in arts_top %} + {% for item in arts_top %} - -
- +
+ +
+
{{ item.name }}
+
+ {{ item.description|truncatechars:100 }} +
+
+
-
-
- {{ art.name|truncatechars:100 }} -
-
- {{ art.description|truncatechars:100 }} -
-
- {#
{{ art.text|safe }}
#} {% endfor %} - -
- -
-
-
- {{ art.name|truncatechars:100 }} -
-
+
+ +
+
{{ art.name }}
+
{{ art.description|truncatechars:100 }} +
-
- + +
{% for item in arts_down %} - -
- -
-
-
- {{ art.name|truncatechars:100 }} +
+ +
+
{{ item.name }}
+
+ {{ item.description|truncatechars:100 }} +
-
- {{ art.description|truncatechars:100 }} -
-
- + +
{#
{{ art.text|safe }}
#} {% endfor %} diff --git a/templates/pages/p_articles.html b/templates/pages/p_articles.html index 44b328f..8cabb6a 100644 --- a/templates/pages/p_articles.html +++ b/templates/pages/p_articles.html @@ -15,19 +15,16 @@
{% for art in articles %} {% if forloop.counter0 < 3 %} - -
- -
-
-
- {{ art.name|truncatechars:100 }} -
-
+
+ +
+
{{ art.name }}
+
{{ art.description|truncatechars:100 }} +
-
- + +
{% endif %} {#
{{ art.text|safe }}
#} @@ -35,12 +32,9 @@
-
- {% with from_el=3 %} - {% include 'blocks/articles/b_news_elements_content.html' %} - {% endwith %} - -
+ {% with from_el=3 %} + {% include 'blocks/articles/b_news_elements_content.html' %} + {% endwith %} {# boris edited #} {% if last_block == False %}
diff --git a/templates/widgets/w_news_element_item.html b/templates/widgets/w_news_element_item.html index 159dffb..67baebc 100644 --- a/templates/widgets/w_news_element_item.html +++ b/templates/widgets/w_news_element_item.html @@ -1,29 +1,16 @@ {% load static %} {% if not from_el or forloop.counter > from_el %} -{#
#} -{#
#} -{#
#} -{#
{{ art.name }}
#} -{#
#} -{# {{ art.description|truncatechars:400 }}#} +
+
+
+
{{ art.name }}
+
+ {{ art.description|truncatechars:400 }} {#
#} -{#
#} -{#
#} -{#
#} -{##} -{#
#} - -
-
-
-
- {{ art.name|truncatechars:100 }} -
-
- {{ art.description|truncatechars:100 }} -
- +
+ +
{% endif %} \ No newline at end of file From 49ad367a70eacd00c363c8aa45e4d2c8df9123c6 Mon Sep 17 00:00:00 2001 From: SBD Date: Sun, 19 Nov 2023 15:26:55 +0300 Subject: [PATCH 4/5] 0.8.372 --- static/css/styles(boris).css | 4 ++-- static/js/user_profile_2.js | 7 +++++-- templates/widgets/w_chat_right_panel_tickets.html | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index bb98b5b..dc6c783 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -428,7 +428,7 @@ .block-chat{ width: 66%; - height: 88vh; + height: calc(100vh - 120px); border-radius: 10px; border: 1px solid #E6E6E6; background: #ffffff; @@ -2379,7 +2379,7 @@ width: 33%; background: #FFFFFF; border-radius: 10px; - max-height: 83vh; + max-height: calc(100vh - 125px); } diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index e2c14fa..ce9401f 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -55,7 +55,10 @@ function select_tab_profile (el,url,owner_type=null) { document.querySelector("#en_lang").href = confirm_url_f_lang_en let header = document.querySelector("header") header.scrollIntoView({ - behavior: "smooth", block: "end", inline: "nearest" }) + behavior: "smooth", + block: "end", + inline: "nearest" + }) middleWareJS() let user_type = getInfoAboutUser() if (user_type === 'mobile') { @@ -431,7 +434,7 @@ function createTicket (el) { } -function selectedUserMessenger (ticket_id=null,user_id=null){ +function selectedUserMessenger (ticket_id=null,user_id=null,el){ let loader = document.querySelector(".loader_chat_f_sw_chats") let block_chat = document.querySelector(".block-chat") if (loader){ diff --git a/templates/widgets/w_chat_right_panel_tickets.html b/templates/widgets/w_chat_right_panel_tickets.html index 5d002ec..79a3fe5 100644 --- a/templates/widgets/w_chat_right_panel_tickets.html +++ b/templates/widgets/w_chat_right_panel_tickets.html @@ -1,5 +1,5 @@ {% load static %} -
+
From 3311ab5b3742e65186c896b88bd2cd70055a0b95 Mon Sep 17 00:00:00 2001 From: SBD Date: Sun, 19 Nov 2023 15:49:39 +0300 Subject: [PATCH 5/5] 0.8.373 --- static/css/styles(boris).css | 24 +++++++++++++++----- static/css/styles.css | 11 +++++++++ static/js/user_profile_2.js | 6 +++++ templates/blocks/profile/b_support_chat.html | 2 +- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index dc6c783..e88d4b8 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -423,7 +423,10 @@ .container-messenger{ width: 100%; height: 100%; - margin-bottom: 30px; +} + +.container-messenger.margin{ + margin-top: 25px } .block-chat{ @@ -438,7 +441,7 @@ } .block-chat.support{ - height: 86vh; + height: calc(100vh - 154px); } .block-list-of-users{ @@ -2370,6 +2373,7 @@ padding-top: 8px; } + .menu_buttons.left.open{ left: 0; transition: 200ms; @@ -2383,6 +2387,18 @@ } +.support .menu_buttons.left.open{ + max-height: calc(100vh - 140px); + +} + +.support .menu_buttons.left.open.margin{ + margin-top: 49px; + max-height: calc(100vh - 215px); +} + + + .menu_buttons.left.open.filters{ width: 294px; background: #FFFFFF; @@ -2398,9 +2414,6 @@ transition: 0ms; } -.support .menu_buttons.left.open{ - margin-top: 49px; -} .handler_menu.left.close{ background: #FF613A; @@ -2490,7 +2503,6 @@ height: calc(100vh - 120px); max-height: 667px; background: #F8F8F8; - direction: rtl; } .menu_profile.background{ diff --git a/static/css/styles.css b/static/css/styles.css index 091c36e..eb5ec91 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1147,6 +1147,17 @@ h2.title_new_route{ padding: 10px; text-align: center; position: relative; + height: 15px; +} +.menu_profile>div:first-of-type { + border-radius: 10px; + background:none; + /* Shadow 1 */ + box-shadow: none; + margin-bottom: 10px; + padding: 10px; + text-align: center; + position: relative; height: 40px; } diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index ce9401f..9bf98f5 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -475,6 +475,12 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){ document.querySelector(".info_profile").innerHTML = data.html; document.querySelector(".enter-message-inp").focus() document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth",block:'nearest',inline:'nearest'}); + let menu = document.querySelector(".menu_buttons.curtain.left") + let container_user_messenger = document.querySelector(".container-messenger") + if (!container_user_messenger.classList.contains('margin') || !menu.classList.contains('margin')){ + container_user_messenger.classList.add('margin') + menu.classList.add('margin') + } let user_type = getInfoAboutUser() let curt_f_close = getCurtainWIncreaceZindex(document.querySelectorAll('.curtain')) diff --git a/templates/blocks/profile/b_support_chat.html b/templates/blocks/profile/b_support_chat.html index b92136a..f1604cd 100644 --- a/templates/blocks/profile/b_support_chat.html +++ b/templates/blocks/profile/b_support_chat.html @@ -11,7 +11,7 @@ {#
#} loader {% if user.is_staff %} -
+
{% include 'blocks/profile/b_list_of_tickets_support_chat.html' %}