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,6 +1,7 @@
 {% 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">
@@ -25,3 +26,5 @@
                 </div>
             </form>
         </div>
+    </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 %}