sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	templates/pages/p_articles.html
This commit is contained in:
SDE
2023-10-05 19:22:10 +03:00
parent b89b9ed017 0df3067416
commit 5f71eb5e0b
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
templates/blocks/static_pages_blocks/b_news_elements.html Normal file
View File

@@ -0,0 +1,19 @@
{% load i18n %}
<div class="news_block_pagination">
{% for art in articles %}
<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>
{#<div>{{ art.text|safe }}</div>#}
{% endfor %}
</div>

20
templates/pages/p_articles.html
View File

@@ -30,25 +30,7 @@
</div>
<div class="news_block_pagination">
{% for art in articles %}
{% if forloop.counter0 > 2 %}
<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>
{% endif %}
{#<div>{{ art.text|safe }}</div>#}
{% endfor %}
</div>
{% include 'blocks/static_pages_blocks/b_news_elements.html' %}
{% if last_block == False %}
<div class="text-align-center w-68 f-r">