sysadminix/Aerbim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.4.43 title and description

Browse Source
This commit is contained in:
SDE
2024-01-06 00:00:54 +03:00
parent 54a01d2a0e
commit b3c84f3a44
5 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
GeneralApp/models.py
View File

@@ -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

4
templates/blocks/b_sections_buttons.html
View File

@@ -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>

8
templates/head_includes/fonts_include.html
View File

@@ -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" %}">#}

19
templates/head_includes/meta_names.html Normal file
View File

@@ -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 %}

8
templates/tb_base.html
View File

@@ -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>