From 5caf539c2f9418b1e92faf718e9f0d619eea74fb Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 28 Nov 2023 13:27:27 +0300
Subject: [PATCH] 0.0.17 bg_color for block

---
 GeneralApp/models.py                          |  1 +
 templates/blocks/b_how_with_us_working.html   |  2 -
 templates/forms/f_consultation.html           | 45 ++++++++++---------
 .../pages/content/c_projectiing_section.html  |  3 ++
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/GeneralApp/models.py b/GeneralApp/models.py
index 1944078..7491657 100644
--- a/GeneralApp/models.py
+++ b/GeneralApp/models.py
@@ -21,6 +21,7 @@ block_type_choices = (
     ('photo_n_text', _('Фото + текст')),
     ('photo150_n_title', _('Фото 150x150 + заголовок')),
     ('how_work', _('Как с нами работать')),
+    ('feedback_form', _('Форма обратной связи')),
     # ('slider', _('Галерея слайдов')),
 )
 
diff --git a/templates/blocks/b_how_with_us_working.html b/templates/blocks/b_how_with_us_working.html
index 63650c6..c4ee63a 100644
--- a/templates/blocks/b_how_with_us_working.html
+++ b/templates/blocks/b_how_with_us_working.html
@@ -51,8 +51,6 @@
             </div>
         {% endif %}
 
-        {% include 'forms/f_consultation.html' %}
-
 
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/forms/f_consultation.html b/templates/forms/f_consultation.html
index e0c10ff..e33ae84 100644
--- a/templates/forms/f_consultation.html
+++ b/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">
-                    {% 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>
-
+            </form>
         </div>
-    </form>
+    </div>
 </div>
\ No newline at end of file
diff --git a/templates/pages/content/c_projectiing_section.html b/templates/pages/content/c_projectiing_section.html
index 859e84d..b8c5213 100644
--- a/templates/pages/content/c_projectiing_section.html
+++ b/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 %}