From 7b70052ff1024f2d64522c46a989b62f04b22d9f Mon Sep 17 00:00:00 2001 From: ArtemB Date: Sun, 3 Dec 2023 15:26:08 +0300 Subject: [PATCH 1/2] 0.0.303 --- .../blocks/articles/b_news_elements.html | 2 +- templates/pages/p_article.html | 97 ++++++++++--------- templates/pages/p_articles.html | 2 +- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/templates/blocks/articles/b_news_elements.html b/templates/blocks/articles/b_news_elements.html index 4b57a0e..7c5d901 100644 --- a/templates/blocks/articles/b_news_elements.html +++ b/templates/blocks/articles/b_news_elements.html @@ -1,6 +1,6 @@ {% load static %} -{% for art in articles %} +{% for art in forloop_for %} {% include "widgets/w_news_element_item.html" %} {#
{{ art.text|safe }}
#} {% endfor %} \ No newline at end of file diff --git a/templates/pages/p_article.html b/templates/pages/p_article.html index b650eef..7ceea01 100644 --- a/templates/pages/p_article.html +++ b/templates/pages/p_article.html @@ -12,6 +12,7 @@ +
{{ page.name }}
@@ -29,54 +30,62 @@ -
- {% for item in arts_top %} - - - - -
{{ art.text|safe }}
- {% endfor %} - -
- -
-
{{ page.name }}
-
- {{ page.description|truncatechars:100 }} -
-
- -
- - {% for item in arts_down %} - - - -
{{ art.text|safe }}
- {% endfor %} +
+ {% with from_el=3 forloop_for=breadcrumbs_arts %} + {% include 'blocks/articles/b_news_elements_content.html' %} + {% endwith %}
+{#
#} +{# {% for item in arts_top %}#} +{##} +{##} +{# #} +{##} +{#
{{ art.text|safe }}
#} +{# {% endfor %}#} +{##} +{#
#} +{##} +{#
#} +{#
{{ page.name }}
#} +{#
#} +{# {{ page.description|truncatechars:100 }}#} +{#
#} +{#
#} +{##} +{#
#} +{##} +{# {% for item in arts_down %}#} +{##} +{# #} +{##} +{#
{{ art.text|safe }}
#} +{# {% endfor %}#} +{##} +{#
#} + + diff --git a/templates/pages/p_articles.html b/templates/pages/p_articles.html index ada10c8..db7fc25 100644 --- a/templates/pages/p_articles.html +++ b/templates/pages/p_articles.html @@ -32,7 +32,7 @@
- {% with from_el=3 %} + {% with from_el=3 forloop_for=articles %} {% include 'blocks/articles/b_news_elements_content.html' %} {% endwith %} {# boris edited #} From 747091c744608175ef24500018d2a3322fadfdf1 Mon Sep 17 00:00:00 2001 From: SDE Date: Sun, 3 Dec 2023 15:39:52 +0300 Subject: [PATCH 2/2] 0.8.27 one article breadcrumbs --- templates/blocks/articles/b_news_elements.html | 2 +- templates/pages/p_article.html | 2 +- templates/pages/p_articles.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/blocks/articles/b_news_elements.html b/templates/blocks/articles/b_news_elements.html index 7c5d901..4b57a0e 100644 --- a/templates/blocks/articles/b_news_elements.html +++ b/templates/blocks/articles/b_news_elements.html @@ -1,6 +1,6 @@ {% load static %} -{% for art in forloop_for %} +{% for art in articles %} {% include "widgets/w_news_element_item.html" %} {#
{{ art.text|safe }}
#} {% endfor %} \ No newline at end of file diff --git a/templates/pages/p_article.html b/templates/pages/p_article.html index 7ceea01..a002e5c 100644 --- a/templates/pages/p_article.html +++ b/templates/pages/p_article.html @@ -31,7 +31,7 @@
- {% with from_el=3 forloop_for=breadcrumbs_arts %} + {% with from_el=0 articles=breadcrumbs_arts last_el=0 elements_on_page=3 %} {% include 'blocks/articles/b_news_elements_content.html' %} {% endwith %} diff --git a/templates/pages/p_articles.html b/templates/pages/p_articles.html index db7fc25..ada10c8 100644 --- a/templates/pages/p_articles.html +++ b/templates/pages/p_articles.html @@ -32,7 +32,7 @@
- {% with from_el=3 forloop_for=articles %} + {% with from_el=3 %} {% include 'blocks/articles/b_news_elements_content.html' %} {% endwith %} {# boris edited #}