1.0.9 add title for news create_route_for_customer, create_route_for_mover

This commit is contained in:
2024-05-31 11:40:16 +03:00
parent 17024d7350
commit 4ae8f09430
8 changed files with 43 additions and 27 deletions

View File

@@ -85,8 +85,8 @@ def ArticlesPageView(request, year=None):
Dict = get_articles(art_kwargs=kwargs) Dict = get_articles(art_kwargs=kwargs)
Dict.update({ Dict.update({
'page': { 'page': {
'title': _('Страница списка новостей'), 'title': _('Новости сервиса доставки посылок | TWB'),
'description': _('Все новости сайта tripwb.com'), 'description': _('Обновления, полезные статьи и свежие новости от TWB ✓ Актуальные новости в мире доставок по всему СНГ ➡️ Следите за нашими новостями'),
'keywords': _('Все новости сайта tripwb.com'), 'keywords': _('Все новости сайта tripwb.com'),
} }
}) })

View File

@@ -62,15 +62,15 @@ def profile_page_View(request, page_name, id=None):
request.user.user_profile.save(update_fields=['mailing_on']) request.user.user_profile.save(update_fields=['mailing_on'])
del request.session['mailingSubscribeRequired'] del request.session['mailingSubscribeRequired']
title = _('Личный кабинет пользователя') + ' ' + request.user.first_name + ' ' + request.user.last_name # title = _('Личный кабинет пользователя') + ' ' + request.user.first_name + ' ' + request.user.last_name
#
Dict.update({ # Dict.update({
'page': { # 'page': {
'title': title, # 'title': title,
'description': title, # 'description': title,
'keywords': title, # 'keywords': title,
} # }
}) # })
# if request.GET and 'mobile' in request.GET and request.GET['mobile'] == 'true': # if request.GET and 'mobile' in request.GET and request.GET['mobile'] == 'true':
# Dict.update({ # Dict.update({

View File

@@ -39,12 +39,13 @@ msgid "Статьи"
msgstr "Articles" msgstr "Articles"
#: ArticlesApp/views.py:88 #: ArticlesApp/views.py:88
msgid "Страница списка новостей" msgid "Новости сервиса доставки посылок | TWB"
msgstr "News list page" msgstr "Parcel Delivery Service News | TWB"
#: ArticlesApp/views.py:89 ArticlesApp/views.py:90 #: ArticlesApp/views.py:89 ArticlesApp/views.py:90
msgid "Все новости сайта tripwb.com" msgid "Обновления, полезные статьи и свежие новости от TWB ✓ Актуальные новости в мире доставок по всему СНГ ➡️ Следите за нашими новостями"
msgstr "All website news on tripwb.com" msgstr "Updates, useful articles, and fresh news from TWB ✓ Current news in the world of deliveries throughout the CIS ➡️ Stay tuned for our updates"
#: AuthApp/admin.py:52 #: AuthApp/admin.py:52
msgid "Дополнительно" msgid "Дополнительно"

View File

@@ -18,12 +18,12 @@
<div class="wrapper_switch_cont"> <div class="wrapper_switch_cont">
<div class="width-100"> <div class="width-100">
<div class="label_toggle_switch_cont"> <div class="label_toggle_switch_cont">
<label for="id_paid_toggle">{% translate "Автопродление тарифного плана" %}</label> {# <label for="id_paid_toggle">{% translate "Автопродление тарифного плана" %}</label>#}
</div> </div>
<div class="toggle_switch_cont"> {# <div class="toggle_switch_cont">#}
<input class="input_toggle_switch" id="id_paid_toggle" name="paid_toggle" type="checkbox"> {# <input class="input_toggle_switch" id="id_paid_toggle" name="paid_toggle" type="checkbox">#}
<div class="input_toggle_switch_display"></div> {# <div class="input_toggle_switch_display"></div>#}
<div class="toggler_input_switch"></div> {# <div class="toggler_input_switch"></div>#}
</div> </div>
<div class="clear_both"></div> <div class="clear_both"></div>
</div> </div>

View File

@@ -3,8 +3,6 @@
{% 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>

View File

@@ -1,5 +1,14 @@
{% extends 'tb_base.html' %} {% extends 'tb_base.html' %}
{% load static %} {% load static %}
{% load i18n %}
{% block title %}
{% if page_name == 'create_route_for_customer' %}
{% trans 'Отправить посылку в другие города| TWB' %}
{% elif page_name == 'create_route_for_mover' %}
{% trans 'Перевезти посылку в другие города | TWB' %}
{% endif %}
{% endblock %}
{% block meta %} {% block meta %}
@@ -7,11 +16,9 @@
<script src='{% static "js/ion.rangeSlider.min.js" %}'> </script> <script src='{% static "js/ion.rangeSlider.min.js" %}'> </script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet">
<script src='{% static "js/user_profile.js" %}'> </script> <script src='{% static "js/user_profile.js" %}'> </script>
<title>123</title>
{# <script src='{% static "js/chat_sockets.js" %}'></script>#} {# <script src='{% static "js/chat_sockets.js" %}'></script>#}
<link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}"> <link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}">
<script src='{% static "js/user_profile_2.js" %}'> </script> <script src='{% static "js/user_profile_2.js" %}'> </script>
{% include "connect_ws_js.html" %} {% include "connect_ws_js.html" %}
@@ -19,10 +26,10 @@
<script defer src='{% static "js/check_new_messages.js" %}'></script> <script defer src='{% static "js/check_new_messages.js" %}'></script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% include 'blocks/b_user_profile.html' %} {% include 'blocks/b_user_profile.html' %}

View File

@@ -13,6 +13,15 @@
<meta name="vapid-key" content="{{ vapid_key }}"> <meta name="vapid-key" content="{{ vapid_key }}">
{% webpush_header %} {% webpush_header %}
<title>
{% if page.title %}
{{ page.title }}
{% else %}
{% block title %}{% endblock %}
{% endif %}
</title>
{% include "inter/meta_names.html" %} {% 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>#}

View File

@@ -4,6 +4,7 @@
{% load i18n %} {% load i18n %}
<div class="carrier-card" data-number-of-route="{{ route.id }}"> <div class="carrier-card" data-number-of-route="{{ route.id }}">
<div class="left-part-carrier-card"> <div class="left-part-carrier-card">
{# <div class="first-line-card-carrier">#} {# <div class="first-line-card-carrier">#}