From a740e48c8ea11629aff5e13548e03c88888be3b5 Mon Sep 17 00:00:00 2001
From: SBD <strigevitch.boris@gmail.com>
Date: Tue, 28 Nov 2023 14:02:49 +0300
Subject: [PATCH] 0.0.29

---
 static/aerbimCSS.css                          | 22 +++++++++++----
 static/aerbimJS.js                            |  4 ++-
 templates/blocks/b_footer.html                | 21 ++++++++-------
 templates/blocks/static/header.html           |  2 +-
 .../pages/content/c_projectiing_section.html  |  1 -
 templates/pages/p_section.html                | 27 ++++++++++++-------
 templates/tb_base.html                        |  1 +
 7 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/static/aerbimCSS.css b/static/aerbimCSS.css
index 230fbfa..24d1ff2 100644
--- a/static/aerbimCSS.css
+++ b/static/aerbimCSS.css
@@ -380,8 +380,8 @@ body,html{
 }
 
 .form_consultation_container{
-    margin: 130px 90px 0 90px;
-    padding-bottom: 110px;
+    padding: 130px 90px 0 90px;
+    padding-bottom: 90px;
 }
 
 
@@ -571,7 +571,7 @@ body,html{
 }
 
 .container_content_faq{
-    margin: 0 170px;
+    margin: 100px 170px 0 170px;
     padding-bottom: 90px;
 }
 
@@ -646,8 +646,6 @@ body,html{
 .footer_els_container{
     width: 73%;
     display: flex;
-    padding-top: 70px;
-    padding-bottom: 60px;
     flex-wrap: wrap;
 }
 
@@ -668,11 +666,15 @@ body,html{
 
 .footer_name_str{
     margin-top: 20px;
+    display: block;
+    text-decoration: none;
 }
 
 .flex_container_footer{
     display: flex;
     width: 100%;
+    padding-top: 70px;
+    padding-bottom: 60px;
 }
 
 .btn_contacts_footer{
@@ -682,6 +684,7 @@ body,html{
     color: #FB6952;
     background: none;
     width: 100%;
+    transition: 200ms;
 }
 .btn_contacts_footer:hover{
     border-radius: 2px;
@@ -689,8 +692,17 @@ body,html{
     padding: 15px 0;
     background: #FB6952;
     color: #ffffff;
+    transition: 200ms;
 }
 
 .logo_footer{
     height: 35px;
+}
+
+.inf_contacts_footer{
+    padding: 20px 0 15px 0;
+}
+
+.txt_footer{
+    padding-bottom: 5px;
 }
\ No newline at end of file
diff --git a/static/aerbimJS.js b/static/aerbimJS.js
index 767e5f0..d407a70 100644
--- a/static/aerbimJS.js
+++ b/static/aerbimJS.js
@@ -1,5 +1,7 @@
 $(document).ready(function (){
-    renderContent()
+    if (document.querySelector(".header").dataset['page'] === true){
+        renderContent()
+    }
 })
 
 function getInfoAboutUser (){
diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html
index 332ec36..250e914 100644
--- a/templates/blocks/b_footer.html
+++ b/templates/blocks/b_footer.html
@@ -5,18 +5,19 @@
     <div class="cut-width">
         <div class="flex_container_footer">
             <div class="footer_els_container">
-                {% for service in services %}
+                {% for item in sections %}
                         <div class="footer_el">
                             <div class="footer_name_str medium_txt">
-                                {{ service.name }}
+{#                                {{ item.name }}#}
+                                Разделы
                             </div>
 
-                            {% if service.rel_children_for_service.all %}
+                            {% if sections %}
                                 <div class="footer_el_childs">
-                                    {% for sub_serv in service.rel_children_for_service.all %}
-                                        <div class="footer_name_str standart_semi_bold_txt">
-                                            {{ service.name }}
-                                        </div>
+                                    {% for sub_item in sections %}
+                                        <a href="{% url 'section_page' sub_item.url %}" class="footer_name_str standart_semi_bold_txt">
+                                            {{ sub_item.name }}
+                                        </a>
                                     {% endfor %}
                                 </div>
                             {% endif %}
@@ -28,8 +29,10 @@
                 <div class="logo_container_footer">
                     <img src="{{ logo }}" class="logo_footer">
                 </div>
-                <div class="standart_txt">+1 234 5678901</div>
-                <div class="standart_txt">company@aerbim.com</div>
+                <div class="inf_contacts_footer">
+                    <div class="standart_txt txt_footer">+1 234 5678901</div>
+                    <div class="standart_txt txt_footer">company@aerbim.com</div>
+                </div>
                 <button class="btn_contacts_footer">Контакты</button>
             </div>
         </div>
diff --git a/templates/blocks/static/header.html b/templates/blocks/static/header.html
index 69e185e..5e00c4f 100644
--- a/templates/blocks/static/header.html
+++ b/templates/blocks/static/header.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load admin_interface_tags %}
 
-<div class="header">
+<div class="header" data-page="{{ main }}">
     <div class="cut-width">
         <div class="left_part_header">
 {#            <img src="{% static "images/logo.svg" %}" class="logo_header">#}
diff --git a/templates/pages/content/c_projectiing_section.html b/templates/pages/content/c_projectiing_section.html
index f140e98..2e9f817 100644
--- a/templates/pages/content/c_projectiing_section.html
+++ b/templates/pages/content/c_projectiing_section.html
@@ -14,4 +14,3 @@
 {% if cur_section.plugin_presentation.all %}
     {% include 'blocks/b_3d_s_d.html' with block=cur_section.plugin_presentation.all.0 %}
 {% endif %}
-{% include 'blocks/b_faq.html' %}
\ No newline at end of file
diff --git a/templates/pages/p_section.html b/templates/pages/p_section.html
index 566549b..24019ac 100644
--- a/templates/pages/p_section.html
+++ b/templates/pages/p_section.html
@@ -1,10 +1,19 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
+{% extends 'tb_base.html' %}
+{% block CONTENT %}
+    {% include 'blocks/dynamic/b_sections_buttons.html' %}
+    {% include 'blocks/b_service.html' %}
+    {% for block in page.blocks.all %}
+        {% if block.block_type == 'photo150_n_title' %}
+            {% 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 %}
 
-</body>
-</html>
\ No newline at end of file
+    {% endfor %}
+    {% if page.plugin_presentation.all %}
+        {% include 'blocks/b_3d_s_d.html' with block=page.plugin_presentation.all.0 %}
+    {% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/tb_base.html b/templates/tb_base.html
index 345d6e6..03a9481 100644
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -20,6 +20,7 @@
 
             {% endblock %}
         </div>
+        {% include 'blocks/b_faq.html' %}
         {% include 'blocks/b_footer.html' %}
     </body>
 </html>
\ No newline at end of file