diff --git a/oknardia/templates/blog/blog_post.html b/oknardia/templates/blog/blog_post.html
index 660d8c5..6f54d73 100755
--- a/oknardia/templates/blog/blog_post.html
+++ b/oknardia/templates/blog/blog_post.html
@@ -1,57 +1,103 @@
{% extends "base.html" %}{% load static %}
-{% block Title %}Блог :: {{ HEADER|striptags }}{% endblock %}
+{% block Title %}{{ HEADER|striptags }}{% endblock %}
{% block Add_Body_Attribute %} style="padding-top:70px;"{% endblock %}
-{% block Description %}{{ TIZER|striptags|truncatewords:25 }}{% endblock %}
+{% block Description %}{% if META_DESC %}{{ META_DESC }}{% else %}{{ TIZER|striptags|truncatewords:25 }}{% endif %}{% endblock %}
-{% block Keywords %}oknardia, окнардия, blog, блог, публикация, {{ HEADER|striptags }}{% endblock %}
+{% block Keywords %}{% if META_KW %}{{ META_KW }}{% else %}oknardia, окнардия, блог, публикация, {{ HEADER|striptags }}{% endif %}{% endblock %}
{% block Date4Meta %}{% if PUB_DAT %}{{ PUB_DAT|date:"Y-m-d" }}{% else %}{% now "c" %}{% endif %}{% endblock %}
{% block Last4Meta %}{% if PUB_DAT %}{{ PUB_DAT|date:"Y-m-d" }}{% else %}{% now "c" %}{% endif %}{% endblock %}
-{% block Author4Meta %}: {{ USERNAME }}{% if NAME1 != "" or NAME2 != "" %} ({{ NAME1 }}{% if NAME2 != "" %} {{ NAME2 }}{% endif %}){% endif %}{% endblock %}
+{% block Author4Meta %}{{ NAME1 }}{% if NAME2 %} {{ NAME2 }}{% endif %} ({{ USERNAME }}) в Блоге Окнардия{% endblock %}
-{% block CopyrightAuthor4Meta %}: Блоги{% endblock %}
+{% block CopyrightAuthor4Meta %}Окнардия — Блог{% endblock %}
-{% block Top_Meta1 %}
- {# #}{% if NAME1 != '' or NAME2 != '' %}
- {% endif %}
-
-
-
-
-
-
-
-
-
- {# #}
-
-
-
- {# #}
-
-
+{% block Top_Meta1 %}{# #}
+ {% if not BACK_DISABLE %}
+ {% endif %}{% if not FORW_DISABLE %}
+ {% endif %}
+ {# #}
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
- {% endblock %}
+
+
+
+{# #}{% endblock %}
{% block Top_JS3%}
{% endblock %}
+{% block ADD_TO_HEAD %}{# #}
+
+{# #}{% endblock %}
+
{% block Main_Content %}
{% if not IS_ARCHIVE %}
@@ -78,7 +124,7 @@
{# Листалка: НАЧАЛО #}
-
+
+
{# Листалка: КОНЕЦ #}
{# --- Баннер: НАЧАЛО --- #}
{% include "ad/bannet-wide.html" %}
@@ -102,5 +148,4 @@
{% block Top_Nav_Bar %}
{# ОТЛАДКА, ГАСИМ ВЕРХНЕЕ МЕНЮ #}
{% endblock %}
-{% endcomment %}
-
+{% endcomment %}
\ No newline at end of file
diff --git a/oknardia/web/blog.py b/oknardia/web/blog.py
index 20343ac..6719d96 100644
--- a/oknardia/web/blog.py
+++ b/oknardia/web/blog.py
@@ -183,22 +183,27 @@ def blog_post(request: HttpRequest, post_id: str = "0", page_back: str = None) -
'ID': q.id})
if PATH_FOR_IMG_BLOG in q.sImgForBlogSocial.name:
to_template.update({'IMG_FOR_BLOG': q.sImgForBlogSocial})
- to_template.update({'PUB_DAT': q.dPostDataBegin,
- 'PUB_MODIFY': q.dPostDataModify,
- 'HEADER': q.sPostHeader,
- 'HEADER_T': sanitize_slug(q.sPostHeader).lower(),
- 'USER_STATUS': q.kBlogAuthorUser.get_sUserStatus_display(),
- 'USER_AVATAR': q.kBlogAuthorUser.sUserAvatarImg,
- 'USER_TITLE': q.kBlogAuthorUser.sUserJobTitle,
- 'USER_FROM_ID_OFFICE': q.kBlogAuthorUser.kMerchantOffice,
- 'CONTENT': re.sub(r'', '', q.sPostContent, 0, re.IGNORECASE)})
+ to_template.update({
+ 'PUB_DAT': q.dPostDataBegin,
+ 'PUB_MODIFY': q.dPostDataModify,
+ 'HEADER': safe_html_spec_symbols(q.sPostHeader),
+ 'HEADER_T': sanitize_slug(q.sPostHeader),
+ 'USER_STATUS': q.kBlogAuthorUser.get_sUserStatus_display(),
+ 'USER_AVATAR': q.kBlogAuthorUser.sUserAvatarImg,
+ 'USER_TITLE': q.kBlogAuthorUser.sUserJobTitle,
+ 'USER_FROM_ID_OFFICE': q.kBlogAuthorUser.kMerchantOffice,
+ 'CONTENT': re.sub(r'', '', q.sPostContent, 0, re.IGNORECASE),
+ 'MOD_DAT': q.dPostDataModify,
+ 'META_DESC': q.sMetaDescription,
+ 'META_KW': q.sMetaKeywords
+ })
content = to_template.get('CONTENT', '')
- to_template.update({'TIZER': sanitize_slug(str(content))})
+ to_template.update({'TIZER': safe_html_spec_symbols(str(content))})
# получаем следующую по дате запись
try:
q1 = BlogPosts.objects.filter(dPostDataBegin__gt=q.dPostDataBegin, dPostDataBegin__lt=timezone.now(),
bPublished=True, bArchive=False).order_by('dPostDataBegin')[0]
- to_template.update({'FORW_HEADER_T': sanitize_slug(q1.sPostHeader).lower(),
+ to_template.update({'FORW_HEADER_T': sanitize_slug(q1.sPostHeader),
'FORW_ID': q1.id})
except(IndexError, ObjectDoesNotExist, BlogPosts.DoesNotExist):
to_template.update({'FORW_DISABLE': True})
@@ -206,7 +211,7 @@ def blog_post(request: HttpRequest, post_id: str = "0", page_back: str = None) -
try:
q1 = BlogPosts.objects.filter(dPostDataBegin__lt=q.dPostDataBegin, bPublished=True,
bArchive=False).order_by('-dPostDataBegin')[0]
- to_template.update({'BACK_HEADER_T': sanitize_slug(q1.sPostHeader).lower(),
+ to_template.update({'BACK_HEADER_T': sanitize_slug(q1.sPostHeader),
'BACK_ID': q1.id})
except(IndexError, ObjectDoesNotExist, BlogPosts.DoesNotExist):
to_template.update({'BACK_DISABLE': True})