diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 568e3e4..1062214 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1079,6 +1079,10 @@ border-left: 0; } +.abbreviation_airport_in_search.hide{ + display: none; +} + .abbreviation_airport_in_search > text{ margin-top: 39%; diff --git a/static/js/find_route.js b/static/js/find_route.js index 08f9b22..aa38874 100644 --- a/static/js/find_route.js +++ b/static/js/find_route.js @@ -53,3 +53,9 @@ function open_chat (user_id){ window.location.replace(href) } +function changeWidthEL (el){ + let parent = el.offsetParent + let loader_place = parent.querySelector('.abbreviation_airport_in_search') + loader_place.classList.toggle('hide') + el.classList.toggle('width-100') +} \ No newline at end of file diff --git a/static/js/global_js.js b/static/js/global_js.js index 2606013..a3a4943 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -78,7 +78,7 @@ function scroll_ev (event,el){ let user_type = getInfoAboutUser() let ch = el.scrollY let top = 293 - ch + 20 - if (user_type !== 'mobile' || user_type !== 'laptop'){ + if (user_type !== 'mobile' && user_type !== 'laptop'){ if (el.scrollY === 300){ curtain.style.top = `${top}px` } else if (el.scrollY < 300) { diff --git a/static/js/user_profile.js b/static/js/user_profile.js index d89be7f..5d9397a 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -245,6 +245,7 @@ function loader_place_ins_boris (el,type=null){ } } } + changeWidthEL(el) } } diff --git a/templates/pages/p_article.html b/templates/pages/p_article.html index d88b3af..aee4620 100644 --- a/templates/pages/p_article.html +++ b/templates/pages/p_article.html @@ -22,45 +22,54 @@
- {% for item in arts_top %} + {% for art in arts_top %} -
- -
-
{{ item.name }}
-
- {{ item.description|truncatechars:100 }} -
-
-
+ +
+
+
+
+ {{ art.name|truncatechars:100 }} +
+
+ {{ art.description|truncatechars:100 }} +
+
+
{#
{{ art.text|safe }}
#} {% endfor %} -
- -
-
{{ art.name }}
- + {% for item in arts_down %} -
- -
-
{{ item.name }}
-
+ {#
{{ art.text|safe }}
#} {% endfor %} diff --git a/templates/pages/p_articles.html b/templates/pages/p_articles.html index 8cabb6a..44b328f 100644 --- a/templates/pages/p_articles.html +++ b/templates/pages/p_articles.html @@ -15,16 +15,19 @@
{% for art in articles %} {% if forloop.counter0 < 3 %} -
- -
-
{{ art.name }}
-
+ {% endif %} {#
{{ art.text|safe }}
#} @@ -32,9 +35,12 @@
- {% 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 67baebc..159dffb 100644 --- a/templates/widgets/w_news_element_item.html +++ b/templates/widgets/w_news_element_item.html @@ -1,16 +1,29 @@ {% 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