From e2a15e732001ce097341f30e9352c785b097b953 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Fri, 22 Dec 2023 18:08:07 +0500
Subject: [PATCH 1/4] =?UTF-8?q?0.4.30=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=20o?=
 =?UTF-8?q?ption=20order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GeneralApp/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py
index 1d349b1..d7a1326 100644
--- a/GeneralApp/admin.py
+++ b/GeneralApp/admin.py
@@ -223,7 +223,7 @@ class Admin_Option(Admin_Trans_BaseModel):
     ]
 
     list_display = ['image_thumb', 'opt_type', 'name', 'order', 'value', 'prefix']
-    list_editable = ['value', 'prefix']
+    list_editable = ['value', 'prefix', 'order']
     list_filter = ['opt_type']
 
 admin.site.register(Option,Admin_Option)

From 20df116b4002e722d7cd759889b4d0bcd6c9aeb0 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Fri, 22 Dec 2023 18:11:57 +0500
Subject: [PATCH 2/4] =?UTF-8?q?0.4.31=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=20o?=
 =?UTF-8?q?ption=20order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/aerbimCSS.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/aerbimCSS.css b/static/aerbimCSS.css
index bad3052..9145800 100644
--- a/static/aerbimCSS.css
+++ b/static/aerbimCSS.css
@@ -891,6 +891,7 @@ body.n_scroll{
 .txt_footer{
     padding-bottom: 5px;
     text-decoration: none;
+    display: block;
 }
 
 /* how dev*/

From 3ff4a480e2baa2f183ecc4b705bf9e6ccfc749e6 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Fri, 22 Dec 2023 18:21:47 +0500
Subject: [PATCH 3/4] 0.4.32 fix get_footer_contacts

---
 GeneralApp/funcs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GeneralApp/funcs.py b/GeneralApp/funcs.py
index 8a8ebd3..c26d7a4 100644
--- a/GeneralApp/funcs.py
+++ b/GeneralApp/funcs.py
@@ -8,7 +8,7 @@ def get_logo_url():
 
 def get_footer_contacts():
     from .models import Option
-    options = Option.objects.filter(enable=True, opt_type__in=['footer_email', 'footer_phone'])
+    options = Option.objects.filter(enable=True, opt_type__in=['footer_email', 'footer_phone']).order_by('order')
     return options
 
 

From af9cd4407edea699814889d28175f7c1d316e5db Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Sat, 23 Dec 2023 16:47:31 +0500
Subject: [PATCH 4/4] 0.4.33 add presentation file

---
 ...res.html => b_main_block_w_subblocks.html} |  0
 templates/blocks/b_photo_n_text.html          | 27 ++++++-------------
 templates/blocks/b_presentation_aerBim.html   | 12 ---------
 .../blocks/block_elements/be_button.html      |  2 +-
 .../pages/content/c_blocks_constructor.html   |  4 +--
 5 files changed, 11 insertions(+), 34 deletions(-)
 rename templates/blocks/{b_functional_features.html => b_main_block_w_subblocks.html} (100%)
 delete mode 100644 templates/blocks/b_presentation_aerBim.html

diff --git a/templates/blocks/b_functional_features.html b/templates/blocks/b_main_block_w_subblocks.html
similarity index 100%
rename from templates/blocks/b_functional_features.html
rename to templates/blocks/b_main_block_w_subblocks.html
diff --git a/templates/blocks/b_photo_n_text.html b/templates/blocks/b_photo_n_text.html
index c786a5c..304652a 100644
--- a/templates/blocks/b_photo_n_text.html
+++ b/templates/blocks/b_photo_n_text.html
@@ -1,23 +1,12 @@
+{% load static %}
 <div {% include "block_settings/blocks_settings.html" %}>
-    <div>
-        {% for widget in block.get_widgets %}
-            <div>
-                <div>
-                    {% if widget.name %}
-                        <div>{{ widget.name }}</div>
-                    {% endif %}
-                    {% if widget.description %}
-                        <div>{{ widget.description|safe|linebreaksbr }}</div>
-                    {% endif %}
-                </div>
-                <div>
-                    {% if widget.video_url %}
-                        <div>{{ widget.video_url|safe }}</div>
-                    {% elif widget.picture %}
-                        <img src="{{ MEDIA_URL }}{{ widget.picture }}" alt="{{ widget.name }}" />
-                    {% endif %}
-                </div>
+    <div class="container_block_presentation_aerBim">
+        <div class="cut-width">
+            <div class="container_content_presentation_aerBim">
+                {% for widget in block.get_widgets %}
+                    {% include "widgets/w_one_present_aerBim.html" %}
+                {% endfor %}
             </div>
-        {% endfor %}
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/blocks/b_presentation_aerBim.html b/templates/blocks/b_presentation_aerBim.html
deleted file mode 100644
index 304652a..0000000
--- a/templates/blocks/b_presentation_aerBim.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% load static %}
-<div {% include "block_settings/blocks_settings.html" %}>
-    <div class="container_block_presentation_aerBim">
-        <div class="cut-width">
-            <div class="container_content_presentation_aerBim">
-                {% for widget in block.get_widgets %}
-                    {% include "widgets/w_one_present_aerBim.html" %}
-                {% endfor %}
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/templates/blocks/block_elements/be_button.html b/templates/blocks/block_elements/be_button.html
index f60ab65..d26578c 100644
--- a/templates/blocks/block_elements/be_button.html
+++ b/templates/blocks/block_elements/be_button.html
@@ -30,7 +30,7 @@
         }
     </style>
     <div class="{{ name_w }}_{{ widget.id }}_align_btn">
-        <a class="{{ name_w }}_{{ widget.id }}_widget_btn_a" href="{{ widget.url }}">
+        <a class="{{ name_w }}_{{ widget.id }}_widget_btn_a" href="{{ widget.url }}" target="_blank">
             {{ widget.but_title }}
         </a>
     </div>
diff --git a/templates/pages/content/c_blocks_constructor.html b/templates/pages/content/c_blocks_constructor.html
index 92eb247..5f5f574 100644
--- a/templates/pages/content/c_blocks_constructor.html
+++ b/templates/pages/content/c_blocks_constructor.html
@@ -21,9 +21,9 @@
     {% elif block.block_type == 'present_technology_block' %}
         {% include 'blocks/b_present_technology.html' %}
     {% elif block.block_type == 'main_block_w_subblocks' %}
-        {% include 'blocks/b_functional_features.html' %}
+        {% include 'blocks/b_main_block_w_subblocks.html' %}
     {% elif block.block_type == 'photo_n_text' %}
-        {% include 'blocks/b_presentation_aerBim.html' %}
+        {% include 'blocks/b_photo_n_text.html' %}
     {% elif block.block_type == 'projects_block' %}
         {% include 'blocks/b_projects.html' %}
     {% endif %}