From cc3a5c4a4f05e4a0db947e994c0f32d45d7a1c68 Mon Sep 17 00:00:00 2001
From: SBD <strigevitch.boris@gmail.com>
Date: Sun, 19 Nov 2023 15:09:39 +0300
Subject: [PATCH] 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 @@
 
 
     <div class="previous_next_news">
-        {% for art in arts_top %}
+        {% for item in arts_top %}
 
-                    <a class="cont_one_news" href="{% url "article_one" art.url %}">
-                    <div class="cont_img_one_news">
-                        <img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
+                    <div class="news_item">
+                        <a href="{% url "article_one" item.url %}">
+                            <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
+                            <div class="news_header">{{ item.name }}</div>
+                            <div class="news_description">
+                                {{ item.description|truncatechars:100 }}
+                                <div class="news_gradient"></div>
+                            </div>
+                        </a>
                     </div>
-                    <div class="cont_content_one_news">
-                        <div class="container_name_one_news">
-                            {{ art.name|truncatechars:100 }}
-                        </div>
-                        <div class="container_descript_one_news">
-                            {{ art.description|truncatechars:100 }}
-                        </div>
-                    </div>
-                </a>
 
               {#<div>{{ art.text|safe }}</div>#}
             {% endfor %}
 
-         <a class="cont_one_news" href="{% url "article_one" art.url %}">
-                <div class="cont_img_one_news">
-                    <img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
-                </div>
-                <div class="cont_content_one_news">
-                    <div class="container_name_one_news">
-                        {{ art.name|truncatechars:100 }}
-                    </div>
-                    <div class="container_descript_one_news">
+        <div class="news_item">
+
+                    <div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
+                    <div class="news_header">{{ art.name }}</div>
+                    <div class="news_description">
                         {{ art.description|truncatechars:100 }}
+                        <div class="news_gradient"></div>
                     </div>
-                </div>
-            </a>
+
+            </div>
 
         {% for item in arts_down %}
 
-                    <a class="cont_one_news" href="{% url "article_one" art.url %}">
-                        <div class="cont_img_one_news">
-                            <img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
-                        </div>
-                        <div class="cont_content_one_news">
-                            <div class="container_name_one_news">
-                                {{ art.name|truncatechars:100 }}
+                    <div class="news_item">
+                        <a href="{% url "article_one" item.url %}">
+                            <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
+                            <div class="news_header">{{ item.name }}</div>
+                            <div class="news_description">
+                                {{ item.description|truncatechars:100 }}
+                                <div class="news_gradient"></div>
                             </div>
-                            <div class="container_descript_one_news">
-                                {{ art.description|truncatechars:100 }}
-                            </div>
-                        </div>
-                    </a>
+                        </a>
+                    </div>
 
               {#<div>{{ art.text|safe }}</div>#}
             {% 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 @@
     <div class="three_pinned_news">
         {% for art in articles %}
             {% if forloop.counter0 < 3 %}
-                <a class="cont_one_news" href="{% url "article_one" art.url %}">
-                    <div class="cont_img_one_news">
-                        <img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
-                    </div>
-                    <div class="cont_content_one_news">
-                        <div class="container_name_one_news">
-                            {{ art.name|truncatechars:100 }}
-                        </div>
-                        <div class="container_descript_one_news">
+                <div class="news_item">
+                    <a href="{% url "article_one" art.url %}">
+                        <div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
+                        <div class="news_header">{{ art.name }}</div>
+                        <div class="news_description">
                             {{ art.description|truncatechars:100 }}
+                            <div class="news_gradient"></div>
                         </div>
-                    </div>
-                </a>
+                    </a>
+                </div>
             {% endif %}
 
           {#<div>{{ art.text|safe }}</div>#}
@@ -35,12 +32,9 @@
 
     </div>
     <div class="block_w_paging">
-        <div class="news_block">
-            {% with from_el=3 %}
-                {% include 'blocks/articles/b_news_elements_content.html' %}
-            {% endwith %}
-
-        </div>
+        {% with from_el=3 %}
+            {% include 'blocks/articles/b_news_elements_content.html' %}
+        {% endwith %}
     {#    boris edited #}
         {% if last_block == False %}
             <div class="text-align-center">
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 %}
-{#    <div class="news_item_pagination">#}
-{#        <div class="pag_news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>#}
-{#        <div class="pag_news_item_text">#}
-{#             <div class="news_header">{{ art.name }}</div>#}
-{#             <div class="news_description">#}
-{#            {{ art.description|truncatechars:400 }}#}
+    <div class="news_item_pagination">
+        <div class="pag_news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
+        <div class="pag_news_item_text">
+             <div class="news_header">{{ art.name }}</div>
+             <div class="news_description">
+            {{ art.description|truncatechars:400 }}
     {#                    <div class="news_gradient"></div>#}
-{#        </div>#}
-{#        </div>#}
-{#        <div class="clear_both"></div>#}
-{##}
-{#    </div>#}
-    <a class="cont_one_news" href="{% url "article_one" art.url %}">
-        <div class="cont_img_one_news">
-            <img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
         </div>
-        <div class="cont_content_one_news">
-            <div class="container_name_one_news">
-                {{ art.name|truncatechars:100 }}
-            </div>
-            <div class="container_descript_one_news">
-                {{ art.description|truncatechars:100 }}
-            </div>
         </div>
-    </a>
+        <div class="clear_both"></div>
+
+    </div>
 {% endif %}
\ No newline at end of file