Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-11-29 16:55:24 +03:00
10 changed files with 45 additions and 20 deletions

View File

@@ -19,9 +19,9 @@
<div class="clear_both"></div>
{% if last_block == False %}
{% if last_block == False and next_page_els_count %}
<div class="text-align-center">
<button class="button-find-more-routes" id="{{ last_el }}" onclick="load_routes(this)">{% trans "Показать ещё 10" %}</button>
<button class="button-find-more-routes" id="{{ last_el }}" onclick="load_routes(this,null,{{ next_page_els_count }})">{% trans "Показать ещё" %}<span class="col_vo_els_f_load"> {{ next_page_els_count }}</span></button>
<div class="width-100 text-align-center mb-10">
<img class="loader_f_loading_routes" src="{% static "img/svg/loader.svg" %}">
</div>

View File

@@ -36,10 +36,10 @@
{% include 'blocks/articles/b_news_elements_content.html' %}
{% endwith %}
{# boris edited #}
{% if last_block == False %}
{% if last_block == False and next_page_els_count %}
<div class="text-align-center">
{% csrf_token %}
<button class="button-find-more-routes" id="{{ last_el }}" onclick="load_routes(this,'news')">{% trans "Показать ещё 2" %}</button>
<button class="button-find-more-routes" id="{{ last_el }}" onclick="load_routes(this,'news',{{ next_page_els_count }})">{% trans "Показать ещё" %}<span class="col_vo_els_f_load"> {{ next_page_els_count }}</span></button>
<div class="width-100 text-align-center mb-10">
<img class="loader_f_loading_routes" src="{% static "img/svg/loader.svg" %}">
</div>