From 7f502f39141ebb334681de62d8f2bf4c21234cb1 Mon Sep 17 00:00:00 2001 From: erjemin Date: Mon, 23 Aug 2021 20:17:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=B0=D0=B4=D0=B6=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D1=82=D0=BE=D1=80=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cadpoint/templates/base.jinja2 | 5 ++--- cadpoint/templates/index.jinja2 | 30 +++++++++++++++++++++++++----- cadpoint/web/views.py | 9 +++++++++ public/static/css/cadpoint.css | 11 +++-------- 4 files changed, 39 insertions(+), 16 deletions(-) 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); }