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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-11-29 17:52:55 +03:00
parent c97aa44723 de6bd9682e
commit 426071fe15
7 changed files with 78 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArticlesApp/views.py
View File

@@ -108,7 +108,7 @@ def UserPageView(request, page_url):
# print('article_breadcrumbs',article_breadcrumbs) # print('article_breadcrumbs',article_breadcrumbs)
Dict = { Dict = {
'art' : art, 'page' : art,
'user_page' : True, 'user_page' : True,
# 'service' : service, # 'service' : service,
# 'article_breadcrumbs' : article_breadcrumbs # 'article_breadcrumbs' : article_breadcrumbs
@@ -139,7 +139,7 @@ def ArticlesOnePageView(request, art_url):
# print('article_breadcrumbs',article_breadcrumbs) # print('article_breadcrumbs',article_breadcrumbs)
Dict = { Dict = {
'art' : art, 'page' : art,
} }
Dict.update(get_article_breadcrumbs(request, art)) Dict.update(get_article_breadcrumbs(request, art))

6
GeneralApp/admin.py
View File

@@ -14,6 +14,12 @@ class Admin_StaticPage(Admin_Trans_BaseModelViewPage):
'order', 'order',
) )
}), }),
('Настройки', {
'classes': ['wide', 'collapse'],
'fields': (
'FAQ_title',
)
}),
('SEO', { ('SEO', {
'classes': ['wide', 'collapse'], 'classes': ['wide', 'collapse'],
'fields': ( 'fields': (

19
templates/inter/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 %}

62
templates/pages/p_article.html
View File

@@ -11,10 +11,10 @@
</div> </div>
<div class="self_news"> <div class="self_news">
<div class="self_news_header">{{ art.name }}</div> <div class="self_news_header">{{ page.name }}</div>
<div><img class="self_news_img" src="{{ MEDIA_URL }}{{ art.picture }}" /></div> <div><img class="self_news_img" src="{{ MEDIA_URL }}{{ page.picture }}" /></div>
<div class="self_news_description">{{ art.description }}</div> <div class="self_news_description">{{ page.description }}</div>
<div class="self_news_text">{{ art.text|safe }}</div> <div class="self_news_text">{{ page.text|safe }}</div>
</div> </div>
@@ -28,46 +28,46 @@
{% for item in arts_top %} {% for item in arts_top %}
<div class="news_item"> <div class="news_item">
<a href="{% url "article_one" item.url %}"> <a href="{% url "article_one" item.url %}">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div> <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
<div class="news_header">{{ item.name }}</div> <div class="news_header">{{ item.name }}</div>
<div class="news_description"> <div class="news_description">
{{ item.description|truncatechars:100 }} {{ item.description|truncatechars:100 }}
<div class="news_gradient"></div> <div class="news_gradient"></div>
</div>
</a>
</div> </div>
</a>
</div>
{#<div>{{ art.text|safe }}</div>#} {#<div>{{ art.text|safe }}</div>#}
{% endfor %} {% endfor %}
<div class="news_item_static"> <div class="news_item_static">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div> <div class="news_img"><img src="{{ MEDIA_URL }} {{ page.picture }}" /></div>
<div class="news_header">{{ art.name }}</div> <div class="news_header">{{ page.name }}</div>
<div class="news_description"> <div class="news_description">
{{ art.description|truncatechars:100 }} {{ page.description|truncatechars:100 }}
<div class="news_gradient"></div> <div class="news_gradient"></div>
</div>
</div> </div>
</div>
{% for item in arts_down %} {% for item in arts_down %}
<div class="news_item"> <div class="news_item">
<a href="{% url "article_one" item.url %}"> <a href="{% url "article_one" item.url %}">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div> <div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
<div class="news_header">{{ item.name }}</div> <div class="news_header">{{ item.name }}</div>
<div class="news_description"> <div class="news_description">
{{ item.description|truncatechars:100 }} {{ item.description|truncatechars:100 }}
<div class="news_gradient"></div> <div class="news_gradient"></div>
</div>
</a>
</div> </div>
</a>
</div>
{#<div>{{ art.text|safe }}</div>#} {#<div>{{ art.text|safe }}</div>#}
{% endfor %} {% endfor %}
</div> </div>

25
templates/pages/p_main.html
View File

@@ -3,6 +3,8 @@
{% load i18n %} {% load i18n %}
{% block meta %} {% block meta %}
<script src='{% static "js/find_route.js" %}'></script> <script src='{% static "js/find_route.js" %}'></script>
<script src="{% static "js/filters_functions_find_route.js" %}"></script> <script src="{% static "js/filters_functions_find_route.js" %}"></script>
<script src="{% static "js/dynamic_loading_routes.js" %}"></script> <script src="{% static "js/dynamic_loading_routes.js" %}"></script>
@@ -209,16 +211,19 @@
</div> </div>
<div class="faq_main_page">
<h2 id=title_static> {% if page.get_FAQ_items %}
{% if page.FAQ_title %}{{ page.FAQ_title }}{% else %}{% translate "Частые вопросы" %}{% endif %} <div class="faq_main_page">
</h2> <h2 id=title_static>
{% for faq_item in page.get_FAQ_items %} {% if page.FAQ_title %}{{ page.FAQ_title }}{% else %}{% translate "Частые вопросы" %}{% endif %}
<details> </h2>
<summary>{{ faq_item.question }}</summary> {% for faq_item in page.get_FAQ_items %}
<p>{{ faq_item.answer }}</p> <details>
</details> <summary>{{ faq_item.question }}</summary>
{% endfor %} <p>{{ faq_item.answer }}</p>
</details>
{% endfor %}
{% endif %}

8
templates/pages/p_user_page.html
View File

@@ -1,9 +1,9 @@
{% extends "tb_base.html" %} {% extends "tb_base.html" %}
{% block content %} {% block content %}
<div class="wrapper_name_art">{{ art.name }}</div> <div class="wrapper_name_art">{{ page.name }}</div>
{% if art.description != none %} {% if page.description != none %}
<div>{{ art.description }}</div> <div>{{ page.description }}</div>
{% endif %} {% endif %}
<div class="wrapper_text_art">{{ art.text|safe }}</div> <div class="wrapper_text_art">{{ page.text|safe }}</div>
{% endblock %} {% endblock %}

3
templates/tb_base.html
View File

@@ -6,9 +6,8 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1"> <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 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/jquery_3_2_1.js" %}"></script>
<script type="text/javascript" src="{% static "js/moment_js.js" %}"></script> <script type="text/javascript" src="{% static "js/moment_js.js" %}"></script>