diff --git a/cadpoint/templates/base.jinja2 b/cadpoint/templates/base.jinja2
index eb4195e..a3b71b2 100644
--- a/cadpoint/templates/base.jinja2
+++ b/cadpoint/templates/base.jinja2
@@ -1,5 +1,4 @@
-
-{% load static %}
+{% load static %}
@@ -15,7 +14,7 @@
-
+
CADPOINT.RU: {% block Title %}{% endblock %}
diff --git a/cadpoint/templates/index.jinja2 b/cadpoint/templates/index.jinja2
index 2f00fa3..59f5ec9 100644
--- a/cadpoint/templates/index.jinja2
+++ b/cadpoint/templates/index.jinja2
@@ -70,7 +70,30 @@
{{ i.szContentIntro|safe }}
Читать дальше →
- {% endfor %}
+ {% endfor %}{% if LENTA %}{# НАВИГАЦИЯ ПО СТРАНИЦАМ СО СПИСКАМИ КОНТЕНТА ИЗ ПРОИЗВОЛЬНОЙ КАТЕГОРИИ: НАЧАЛО #}
+
+
+
{# НАВИГАЦИЯ ПО СТРАНИЦАМ СО СПИСКАМИ КОНТЕНТА ИЗ ПРОИЗВОЛЬНОЙ КАТЕГОРИИ: КОНЕЦ #}{% endif %}
@@ -79,10 +102,7 @@
{% include "blocks/tags-cloud.jinja2" %}
{##}
- {##}
-
-
-{% endblock %}
+ {##}{% endblock %}
{% block Top_JS1 %}{% endblock %}
diff --git a/cadpoint/web/views.py b/cadpoint/web/views.py
index 3c84edc..da7f198 100644
--- a/cadpoint/web/views.py
+++ b/cadpoint/web/views.py
@@ -79,6 +79,15 @@ def index(request,
" tTotalInfo.NumTotal DESC" % (query,))
to_template.update({"LENTA": q_content, "TAGS_IN_PAGE": q_tags})
to_template.update({"PAGE_OF_LIST": int(ppage)})
+ query_count = "SELECT 1 AS id," \
+ " COUNT(web_tbcontent.id) AS tot_item " \
+ "FROM web_tbcontent " \
+ "WHERE (web_tbcontent.tdContentPublishDown IS NULL" \
+ " OR web_tbcontent.tdContentPublishDown > NOW())" \
+ " AND web_tbcontent.bContentPublish"
+ q_count = TbContent.objects.raw(query_count)
+ # print("--", (q_count[0].tot_item - 1) // 7, q_count[0].tot_item)
+ to_template.update({"TOTAL_PAGE": (q_count[0].tot_item - 1) // 7})
return render(request, template, to_template)
diff --git a/public/static/css/cadpoint.css b/public/static/css/cadpoint.css
index 2243333..8cccab3 100644
--- a/public/static/css/cadpoint.css
+++ b/public/static/css/cadpoint.css
@@ -114,14 +114,9 @@ div.lenta > div.row > div[class^="col"] > div.row > div[class^="col"] > p > ifra
border-bottom: solid white 12px;
border-image: url('/static/svgs/logo_cadpoint-2021-border.svg') 0 0 600 0 round;
}
-div.lenta > div.row > div[class^="col"] > div.row > div[class^="col"] > p.next > a {
- letter-spacing: 0.2ex;
-}
-div.lenta > div.row > div[class^="col"] > div.row {
- border-bottom: 1px gray dashed;
- margin-bottom: 1em;
- padding-bottom: 1em;
-}
+div.lenta > div.row > div[class^="col"] > div.row > div[class^="col"] > p.next > a { letter-spacing: 0.2ex; }
+div.lenta > div.row > div[class^="col"] > div.row { margin-bottom: 1em; padding-bottom: 1em; }
+div.lenta > div.row > div[class^="col"] > div.row:not(:last-child) { border-bottom: 1px gray dashed; }
@keyframes scaleUpDown {
0% { transform: scale(1); }