From 16e7ea3109755e1efbe1b48d663ed0dae5991192 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Wed, 29 Nov 2023 17:50:59 +0300
Subject: [PATCH] 0.7.93 meta names

---
 ArticlesApp/views.py             |  4 +--
 GeneralApp/admin.py              |  6 ++++
 templates/inter/meta_names.html  | 19 ++++++++++
 templates/pages/p_article.html   | 62 ++++++++++++++++----------------
 templates/pages/p_main.html      | 25 +++++++------
 templates/pages/p_user_page.html |  8 ++---
 templates/tb_base.html           |  3 +-
 7 files changed, 78 insertions(+), 49 deletions(-)
 create mode 100644 templates/inter/meta_names.html

diff --git a/ArticlesApp/views.py b/ArticlesApp/views.py
index ea4f70c..dbed331 100644
--- a/ArticlesApp/views.py
+++ b/ArticlesApp/views.py
@@ -108,7 +108,7 @@ def UserPageView(request, page_url):
     # print('article_breadcrumbs',article_breadcrumbs)
 
     Dict = {
-        'art' : art,
+        'page' : art,
         'user_page' : True,
         # 'service' : service,
         # 'article_breadcrumbs' : article_breadcrumbs
@@ -139,7 +139,7 @@ def ArticlesOnePageView(request, art_url):
     # print('article_breadcrumbs',article_breadcrumbs)
 
     Dict = {
-        'art' : art,
+        'page' : art,
     }
 
     Dict.update(get_article_breadcrumbs(request, art))
diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py
index daa9135..e724391 100644
--- a/GeneralApp/admin.py
+++ b/GeneralApp/admin.py
@@ -14,6 +14,12 @@ class Admin_StaticPage(Admin_Trans_BaseModelViewPage):
                        'order',
                        )
         }),
+        ('Настройки', {
+            'classes': ['wide', 'collapse'],
+            'fields': (
+                'FAQ_title',
+            )
+        }),
         ('SEO', {
             'classes': ['wide', 'collapse'],
             'fields': (
diff --git a/templates/inter/meta_names.html b/templates/inter/meta_names.html
new file mode 100644
index 0000000..7184830
--- /dev/null
+++ b/templates/inter/meta_names.html
@@ -0,0 +1,19 @@
+{% if page.seo_title %}
+    <title>{{ page.seo_title }}</title>
+{% elif page.title %}
+    <title>{{ page.title }}</title>
+{% elif page.name %}
+    <title>{{ page.name }}</title>
+{% endif %}
+
+{% if page.seo_description %}
+    <meta name="description" content="{{ page.seo_description }}"/>
+{% elif page.description %}
+    <meta name="description" content="{{ page.description }}"/>
+{% endif %}
+
+{% if page.seo_keywords %}
+    <meta name="keywords" content="{{ page.seo_keywords }}"/>
+{% elif page.description %}
+    <meta name="keywords" content="{{ page.description }}"/>
+{% endif %}
\ No newline at end of file
diff --git a/templates/pages/p_article.html b/templates/pages/p_article.html
index f649ecc..b91d222 100644
--- a/templates/pages/p_article.html
+++ b/templates/pages/p_article.html
@@ -11,10 +11,10 @@
     </div>
     <div class="self_news">
 
-        <div class="self_news_header">{{ art.name }}</div>
-        <div><img class="self_news_img" src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
-        <div class="self_news_description">{{ art.description }}</div>
-        <div class="self_news_text">{{ art.text|safe }}</div>
+        <div class="self_news_header">{{ page.name }}</div>
+        <div><img class="self_news_img" src="{{ MEDIA_URL }}{{ page.picture }}" /></div>
+        <div class="self_news_description">{{ page.description }}</div>
+        <div class="self_news_text">{{ page.text|safe }}</div>
     </div>
 
 
@@ -28,46 +28,46 @@
         {% for item in arts_top %}
 
 
-                    <div class="news_item">
-                        <a href="{% url "article_one" item.url %}">
-                            <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
-                            <div class="news_header">{{ item.name }}</div>
-                            <div class="news_description">
-                                {{ item.description|truncatechars:100 }}
-                                <div class="news_gradient"></div>
-                            </div>
-                        </a>
+            <div class="news_item">
+                <a href="{% url "article_one" item.url %}">
+                    <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
+                    <div class="news_header">{{ item.name }}</div>
+                    <div class="news_description">
+                        {{ item.description|truncatechars:100 }}
+                        <div class="news_gradient"></div>
                     </div>
+                </a>
+            </div>
 
               {#<div>{{ art.text|safe }}</div>#}
         {% endfor %}
 
         <div class="news_item_static">
 
-                    <div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
-                    <div class="news_header">{{ art.name }}</div>
-                    <div class="news_description">
-                        {{ art.description|truncatechars:100 }}
-                        <div class="news_gradient"></div>
-                    </div>
-
+            <div class="news_img"><img src="{{ MEDIA_URL }} {{ page.picture }}" /></div>
+            <div class="news_header">{{ page.name }}</div>
+            <div class="news_description">
+                {{ page.description|truncatechars:100 }}
+                <div class="news_gradient"></div>
             </div>
 
+        </div>
+
         {% for item in arts_down %}
 
-                    <div class="news_item">
-                        <a href="{% url "article_one" item.url %}">
-                            <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
-                            <div class="news_header">{{ item.name }}</div>
-                            <div class="news_description">
-                                {{ item.description|truncatechars:100 }}
-                                <div class="news_gradient"></div>
-                            </div>
-                        </a>
+            <div class="news_item">
+                <a href="{% url "article_one" item.url %}">
+                    <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
+                    <div class="news_header">{{ item.name }}</div>
+                    <div class="news_description">
+                        {{ item.description|truncatechars:100 }}
+                        <div class="news_gradient"></div>
                     </div>
+                </a>
+            </div>
 
-              {#<div>{{ art.text|safe }}</div>#}
-            {% endfor %}
+          {#<div>{{ art.text|safe }}</div>#}
+        {% endfor %}
 
     </div>
 
diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html
index bb2deac..4d0d160 100644
--- a/templates/pages/p_main.html
+++ b/templates/pages/p_main.html
@@ -3,6 +3,8 @@
 {% load i18n %}
 
 {% block meta %}
+
+
     <script src='{% static "js/find_route.js" %}'></script>
     <script src="{% static "js/filters_functions_find_route.js" %}"></script>
     <script src="{% static "js/dynamic_loading_routes.js" %}"></script>
@@ -209,16 +211,19 @@
 
     </div>
 
-    <div class="faq_main_page">
-        <h2 id=title_static>
-            {% if page.FAQ_title %}{{ page.FAQ_title }}{% else %}{% translate "Частые вопросы" %}{% endif %}
-        </h2>
-        {% for faq_item in page.get_FAQ_items %}
-            <details>
-                <summary>{{ faq_item.question }}</summary>
-                <p>{{ faq_item.answer }}</p>
-            </details>
-        {% endfor %}
+
+    {% if page.get_FAQ_items %}
+        <div class="faq_main_page">
+            <h2 id=title_static>
+                {% if page.FAQ_title %}{{ page.FAQ_title }}{% else %}{% translate "Частые вопросы" %}{% endif %}
+            </h2>
+            {% for faq_item in page.get_FAQ_items %}
+                <details>
+                    <summary>{{ faq_item.question }}</summary>
+                    <p>{{ faq_item.answer }}</p>
+                </details>
+            {% endfor %}
+    {% endif %}
 
 
 
diff --git a/templates/pages/p_user_page.html b/templates/pages/p_user_page.html
index 4761e10..8af54ac 100644
--- a/templates/pages/p_user_page.html
+++ b/templates/pages/p_user_page.html
@@ -1,9 +1,9 @@
 {% extends "tb_base.html" %}
 
 {% block content %}
-    <div class="wrapper_name_art">{{ art.name }}</div>
-    {% if art.description != none %}
-        <div>{{ art.description }}</div>
+    <div class="wrapper_name_art">{{ page.name }}</div>
+    {% if page.description != none %}
+        <div>{{ page.description }}</div>
     {% endif %}
-    <div class="wrapper_text_art">{{ art.text|safe }}</div>
+    <div class="wrapper_text_art">{{ page.text|safe }}</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/tb_base.html b/templates/tb_base.html
index bb4b30e..c58cb51 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -6,9 +6,8 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">
-    <title>Title</title>
-
 
+    {% include "inter/meta_names.html" %}
 {#    <script src='{% static "js/jquery_v3_6_4.js" %}'> </script>#}
     <script type="text/javascript" src="{% static "js/jquery_3_2_1.js" %}"></script>
     <script type="text/javascript" src="{% static "js/moment_js.js" %}"></script>