Merge remote-tracking branch 'origin/main'

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)

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
 
 

static/aerbimCSS.css

@@ -898,6 +898,7 @@ body.n_scroll{
 .txt_footer{
     padding-bottom: 5px;
     text-decoration: none;
+    display: block;
 }
 
 /* how dev*/

templates/blocks/b_photo_n_text.html

@@ -1,23 +1,12 @@
+{% load static %}
 <div {% include "block_settings/blocks_settings.html" %}>
-    <div>
+    <div class="container_block_presentation_aerBim">
-        {% for widget in block.get_widgets %}
+        <div class="cut-width">
-            <div>
+            <div class="container_content_presentation_aerBim">
-                <div>
+                {% for widget in block.get_widgets %}
-                    {% if widget.name %}
+                    {% include "widgets/w_one_present_aerBim.html" %}
-                        <div>{{ widget.name }}</div>
+                {% endfor %}
-                    {% 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>
-        {% endfor %}
+        </div>
     </div>
 </div>

templates/blocks/b_presentation_aerBim.html

@@ -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>

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>

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 %}