Merge remote-tracking branch 'origin/main'

GeneralApp/models.py

@@ -21,6 +21,7 @@ block_type_choices = (
     ('photo_n_text', _('Фото + текст')),
     ('photo150_n_title', _('Фото 150x150 + заголовок')),
     ('how_work', _('Как с нами работать')),
+    ('feedback_form', _('Форма обратной связи')),
     # ('slider', _('Галерея слайдов')),
 )
 

templates/blocks/b_how_with_us_working.html

@@ -51,8 +51,6 @@
             </div>
         {% endif %}
 
-        {% include 'forms/f_consultation.html' %}
-
 
     </div>
 </div>

templates/forms/f_consultation.html

@@ -1,27 +1,30 @@
 {% load static %}
 {% load i18n %}
+<div style="width: 100%;{% if block.bg_color %} background: {{ block.bg_color }}{% endif %}">
+    <div class="cut-width">
+        <div class="form_consultation_container" >
+            <div class="top_border_gradient"></div>
+            <form class="form_consultation">
+                <div class="container_content_form_consultation">
+                    <div class="description_form_consultation">
+                        <div class="medium_txt title_form_consultation">
+                            {% translate 'НУЖНА КОНСУЛЬТАЦИЯ - ИХ ЕСТЬ У НАС!' %}
+                        </div>
+                        <div class="standart_txt description_form_consultation_txt">
+                            {% translate 'Lorem ipsum dolor sit amet consectetur. Rutrum tristique mauris non vitae varius porta quis. Magna adipiscing in turpis pellentesque sit turpis enim condimentum cras. Imperdiet enim feugiat blandit in vitae congue cursus ac.' %}
+                        </div>
+                        <button class="button_form_consultation">{% translate 'Отправить запрос' %}</button>
+                    </div>
+                    <div class="form_consultation_content">
+                        <input class="input_form_consultation" id="id_name" name="name" placeholder="{% translate 'Имя' %}">
+                        <input class="input_form_consultation" id="id_company" name="company" placeholder="{% translate 'Компания' %}">
+                        <input class="input_form_consultation" id="id_contacts" name="contacs" placeholder="{% translate 'Контактные данные' %}">
+                        <label class="label_consultation_form standart_txt" for="id_consultation_topic">{% translate 'Тема консультации' %}</label>
+                        <textarea class="textarea_form_consultation" id="id_consultation_topic" name="consultation_topic"></textarea>
+                    </div>
 
-<div class="form_consultation_container">
-    <div class="top_border_gradient"></div>
-    <form class="form_consultation">
-        <div class="container_content_form_consultation">
-            <div class="description_form_consultation">
-                <div class="medium_txt title_form_consultation">
-                    {% translate 'НУЖНА КОНСУЛЬТАЦИЯ - ИХ ЕСТЬ У НАС!' %}
                 </div>
-                <div class="standart_txt description_form_consultation_txt">
+            </form>
-                    {% translate 'Lorem ipsum dolor sit amet consectetur. Rutrum tristique mauris non vitae varius porta quis. Magna adipiscing in turpis pellentesque sit turpis enim condimentum cras. Imperdiet enim feugiat blandit in vitae congue cursus ac.' %}
-                </div>
-                <button class="button_form_consultation">{% translate 'Отправить запрос' %}</button>
-            </div>
-            <div class="form_consultation_content">
-                <input class="input_form_consultation" id="id_name" name="name" placeholder="{% translate 'Имя' %}">
-                <input class="input_form_consultation" id="id_company" name="company" placeholder="{% translate 'Компания' %}">
-                <input class="input_form_consultation" id="id_contacts" name="contacs" placeholder="{% translate 'Контактные данные' %}">
-                <label class="label_consultation_form standart_txt" for="id_consultation_topic">{% translate 'Тема консультации' %}</label>
-                <textarea class="textarea_form_consultation" id="id_consultation_topic" name="consultation_topic"></textarea>
-            </div>
-
         </div>
-    </form>
+    </div>
 </div>

templates/pages/content/c_projectiing_section.html

@@ -6,7 +6,10 @@
         {% include 'blocks/b_photo150_n_title.html' %}
     {% elif block.block_type == 'how_work' %}
         {% include 'blocks/b_how_with_us_working.html' %}
+    {% elif block.block_type == 'feedback_form' %}
+        {% include 'forms/f_consultation.html' %}
     {% endif %}
+
 {% endfor %}
 {% if cur_section.plugin_presentation.all %}
     {% include 'blocks/b_3d_s_d.html' with block=cur_section.plugin_presentation.all.0 %}