Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-11-30 14:43:46 +03:00
27 changed files with 342 additions and 128 deletions

View File

@@ -40,7 +40,7 @@
{% if profileForm.errors.tel %}<div class="error_form_profile">{{ profileForm.errors.tel }}</div>{% endif %}
</div>
<div class="container_el_form_profile">
<label class="label_f_profile" for="id_email">{% if profileForm.fields.email.required %}<span class="orange-text">*</span>{% endif %} Е-mail</label>
<label class="label_f_profile" for="id_email">{% if profileForm.fields.email.required %}<span class="orange-text">*</span>{% endif %} E-mail</label>
<input class="input_f_profile" type="text" id="id_email" name="email" {% if profileForm.initial.email %}value="{{ profileForm.initial.email }}" {% endif %} {% if profileForm.initial.email %}data-initial-value="{{ profileForm.initial.email }}"{% else %}data-initial-value=""{% endif %}>
{% if profileForm.errors.email %}<div class="error_form_profile">{{ profileForm.errors.email }}</div>{% endif %}
</div>

View File

@@ -8,7 +8,9 @@
<div>
<div class="state_subscribe">
{% translate "У вас" %} <a>{% translate "не оформлена подписка" %}</a>
{% blocktranslate %}
У вас <a>не оформлена подписка</a>
{% endblocktranslate %}
</div>
<div class="state_subscribe">

View File

@@ -8,9 +8,9 @@
<h2 id=title_static>{{ page.title }}</h2>
<span id="sub_title_static">{{ page.description }}</span>
<div class="button_container">
<button
onclick="document.location='#scroll_to_form'"
id="more_button">{% translate "Узнать подробнее" %}</button>
<a class="btn_a_anchor partners" href="#scroll_to_form" id="how_it_work_b">
<div class="text_in_btn_a_anchor">{% translate "Узнать подробнее" %}</div>
</a>
</div>
</div>
</div>
@@ -42,7 +42,7 @@
</div>
<div class="bottom_block_static" id="scroll_to_form">
<div class="bottom_block_static anchor" id="scroll_to_form">
<h2 id=title_static>{% translate "Стоимость" %}</h2>
<span id="sub_title_static">{% translate "Оставьте заявку и получите персональное коммерческое предложение" %}</span>

View File

@@ -26,10 +26,9 @@
id="more_button">{% translate "Перевезти посылку" %}</button>
{% endif %}
<button
onclick= "document.location='#anchor_how_it_work'"
id="how_it_work_b">{% translate "Как это работает?" %}
</button>
<a class="btn_a_anchor" href="#anchor_how_it_work" id="how_it_work_b">
<div class="text_in_btn_a_anchor">{% translate "Как это работает?" %}</div>
</a>
</div>
</div>
</div>
@@ -55,7 +54,7 @@
{% include "blocks/static_pages_blocks/b_benefit_img_about_service.html" %}
<div id="anchor_how_it_work"></div>
<div id="anchor_how_it_work" class="anchor"></div>
<div id="title_static"
@@ -151,7 +150,7 @@
</div>
<div class="options_subscribe">
<div class="options_subscribe_title light" style="color: {{ subscribe.text_color }}">
Опции:
{% trans "Опции" %}:
</div>
<div class="list_options_subscribe">
<ul class="option_list">

View File

@@ -6,9 +6,9 @@
<span id="sub_title_static">{{ page.description }}</span>
<div class="button_container">
<button
onclick="document.location= '#scroll_to_div'"
id="more_button">{% translate "Узнать подробнее" %}</button>
<a class="btn_a_anchor partners" href="#scroll_to_div" id="how_it_work_b">
<div class="text_in_btn_a_anchor">{% translate "Узнать подробнее" %}</div>
</a>
</div>
</div>
</div>
@@ -30,7 +30,7 @@
</div>
<div id="scroll_to_div" class="bottom_block_static">
<div id="scroll_to_div" class="bottom_block_static anchor">
<div id=title_static >{% translate "Стань нашим партнером" %}</div>
<span id="sub_title_static">{% translate "Оставь заявку и получи пресональное предложение о партнерстве" %}</span>
<form data-name="msg_from_partners">

View File

@@ -0,0 +1,65 @@
<div style="font-family:Calibri,Candara,Segoe,'Segoe UI',Optima,Arial,sans-serif; padding:10px; background-color: #F8F8F8;">
<div style="line-height:1.0em;width: 660px">
<div style="padding:5px; text-align: center;">
<img src="{{ logo }}" alt="{{ project_name }}" style="margin:0;padding:0;">
</div>
<p style="font-weight:700;font-size:25px;text-align:center;padding:0;line-height:1em; text-transform: uppercase; color: #ff613a;">
{{ message_title|safe }}
</p>
<div style="line-height:1.0em;font-size:18px;margin-top: 5px; margin-left: 30px; box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); padding: 30px; border-radius: 10px; background-color: #FFF;">
{# <p style="line-height:1.0em;font-size:18px;margin-top: 5px; margin-left: 80px">#}
{{ message_text|safe }}
{# </p>#}
</div>
{% for button in message_buttons %}
<div style="text-align:center;font-weight: 700;">
<a href="{{ button.url }}">
<div style="display:inline-block;text-align:center;font-size:18px;padding:5px 10px;margin:5px;border-radius:2px;background-color:#61aeb6;color:#fff;text-decoration:none;line-height:1.0em;cursor:pointer">
{{ button.caption }}
</div>
</a>
</div>
{% endfor %}
<div style="text-align:center;width: 660px;line-height:1.1em">
<div style="margin: 40px 10px 10px;">
<hr>
{# <nobr><b>Адрес кафе:</b> Минск, ул. Будславская, 2</nobr>#}
{# <br>#}
{# <nobr><b>График работы:</b> пн-вс 12:00 - 24:00</nobr>#}
{# <br>#}
{# <nobr><b>Телефоны кафе:</b> +375 44 77 321 77</nobr>#}
</div>
</div>
<div style="text-align: center;margin-top:5px">
{# <a href="https://baldenini.by/event/dostavka-edy" style="text-decoration: none;">#}
{# <div style="color: #311A12;#}
{# padding: 10px;#}
{# margin: 5px 10px 0 10px;#}
{# border: 2px solid #311A12;#}
{# border-radius: 5px;#}
{# font-size: 20px;#}
{# display: inline-block;#}
{# font-weight: 700;#}
{# text-transform: uppercase;">О ДОСТАВКЕ#}
{# </div>#}
{# </a>#}
{# <a href="https://baldenini.by/page/baldenini-cafe-o-nas" style="text-decoration: none;">#}
{# <div style="color: #311A12;#}
{# padding: 10px;#}
{# margin: 5px 10px 0 10px;#}
{# border: 2px solid #311A12;#}
{# border-radius: 5px;#}
{# font-size: 20px;#}
{# display: inline-block;#}
{# font-weight: 700;#}
{# text-transform: uppercase;">О BALDENINI CAFE#}
{# </div>#}
{# </a>#}
</div>
</div>
</div>

View File

@@ -44,7 +44,7 @@
<div class="news_item_static">
<div class="news_img"><img src="{{ MEDIA_URL }} {{ page.picture }}" /></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 }}

View File

@@ -0,0 +1,9 @@
{% load static %}
<div class="not_found_routes show">
<div class="text-align-center fw-700 font-large c-txt-b2 m-a w-80 m-t-8p">
Упс... <span class="orange-text">Ничего не найдено</span>, попробуйте
изменить параметры поиска
</div>
<img class="boxes_not_fond_routes left" src="{% static "img/boxes_for_not_found_routes/b_1.svg" %}">
<img class="boxes_not_fond_routes right" src="{% static "img/boxes_for_not_found_routes/b_2.svg" %}">
</div>