From b3c84f3a4462a22054109fc9697bccc66247ac10 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Sat, 6 Jan 2024 00:00:54 +0300
Subject: [PATCH] 0.4.43 title and description

---
 GeneralApp/models.py                       | 12 +++++++++---
 templates/blocks/b_sections_buttons.html   |  4 +++-
 templates/head_includes/fonts_include.html |  8 ++++++++
 templates/head_includes/meta_names.html    | 19 +++++++++++++++++++
 templates/tb_base.html                     |  8 +-------
 5 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 templates/head_includes/meta_names.html

diff --git a/GeneralApp/models.py b/GeneralApp/models.py
index 47db03c..01eb505 100644
--- a/GeneralApp/models.py
+++ b/GeneralApp/models.py
@@ -203,9 +203,15 @@ class Office(BaseModelViewPage):
     # footer_info = RichTextUploadingField(verbose_name=_('Информация в подвале'), null=True, blank=True)
 
     def __str__(self):
-        if self.name:
-            return self.name
-        return self.address
+        name_list = []
+        if self.city:
+            name_list.append(self.city)
+        if self.address:
+            name_list.append(self.address)
+        if name_list:
+            return ' '.join(name_list)
+
+        return self.id
 
     def save(self, *args, **kwargs):
         # self.order = 0
diff --git a/templates/blocks/b_sections_buttons.html b/templates/blocks/b_sections_buttons.html
index 2e4dbd5..d2fa395 100644
--- a/templates/blocks/b_sections_buttons.html
+++ b/templates/blocks/b_sections_buttons.html
@@ -6,7 +6,9 @@
                 <a href="{% url 'section_page' section.url %}" class="section_btn {% if section == cur_section or page == section %}open{% else %}close{% endif %} standart_txt pointer" data-url="{{ section.url }}">
                     <div class="txt_section standart_semi_bold_txt">{{ section.name }}</div>
                     <div class="description_sections_buttons">
-                        <div class="description_txt standart_txt">{{ section.description }}</div>
+                        {% if section.description %}
+                            <div class="description_txt standart_txt">{{ section.description }}</div>
+                        {% endif %}
                         <div class="standart_txt line_go_to_sections"><span class="orange">перейти в раздел</span> <img class="img_go_to_section" src="{% static "/images/arrow_right_for_sections.svg" %}"></div>
                     </div>
                 </a>
diff --git a/templates/head_includes/fonts_include.html b/templates/head_includes/fonts_include.html
index d2cec2a..3cc5cf2 100644
--- a/templates/head_includes/fonts_include.html
+++ b/templates/head_includes/fonts_include.html
@@ -1,4 +1,12 @@
 {% load static %}
+
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+
+{#        <link href="https://fonts.googleapis.com/css2?family=Verdana&display=swap" rel="stylesheet">#}
+<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
+{#        <link rel="stylesheet" href="{% static "fonts/fonts.css" %}">#}
+
 {#<link rel="stylesheet" href="{% static "fonts/Raleway-Black.ttf" %}">#}
 {#<link rel="stylesheet" href="{% static "fonts/Raleway-BlackItalic.ttf" %}">#}
 {#<link rel="stylesheet" href="{% static "fonts/Raleway-Bold.ttf" %}">#}
diff --git a/templates/head_includes/meta_names.html b/templates/head_includes/meta_names.html
new file mode 100644
index 0000000..7184830
--- /dev/null
+++ b/templates/head_includes/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/tb_base.html b/templates/tb_base.html
index 051bd5d..54fa3ce 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -4,15 +4,9 @@
 <html lang="{{ request.LANGUAGE_CODE }}">
     <head>
         <meta charset="UTF-8">
-        <title>AerBim</title>
+        {% include 'head_includes/meta_names.html' %}
         {% include 'head_includes/fonts_include.html' %}
 
-        <link rel="preconnect" href="https://fonts.googleapis.com">
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-        <link href="https://fonts.googleapis.com/css2?family=Verdana&display=swap" rel="stylesheet">
-        <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
-{#        <link rel="stylesheet" href="{% static "fonts/fonts.css" %}">#}
-
         <link rel="stylesheet" href="{% static "aerbimCSS.css" %}">
         <link rel="stylesheet" href="{% static "aerbimCSSMOBILE.css" %}">
         <script src="{% static "jquery_v3_6_4.js" %}"></script>