Merge remote-tracking branch 'origin/main'

GeneralApp/admin.py

@@ -187,6 +187,7 @@ class Admin_Block(Admin_Trans_BaseModelViewPage):
     list_editable = ['enable', 'order']
     search_fields = ['name']
     list_filter = ['enable', 'content_type', 'block_type']
+    ordering = ['content_type', 'object_id', 'order']
 
     def has_delete_permission(self, request, obj=None):
         if request.user.is_superuser:
@@ -279,8 +280,9 @@ class Admin_Office(Admin_Trans_BaseModelViewPage):
         'modifiedDT', 'createDT'
     ]
     list_editable = [
-        'work_time_from', 'work_time_to',
+        # 'work_time_from', 'work_time_to',
         # 'main_office',
+        'enable',
         'order'
     ]
     list_display_links = ['id', 'city', 'address']

templates/pages/content/c_section_content.html

@@ -2,22 +2,25 @@
 
 {% include 'blocks/dynamic/b_sections_buttons.html' %}
 
-<div class="cut-width">
-    <div style="padding-top: 40px;">
-        {% if page.description or page.title or page.text %}
-        
-            {% if page.description %}
-                <div class="description_page standart_txt">{{ page.description }}</div>
-            {% endif %}
-            {% if page.title %}
-                <div class="title_page standart_txt">{{ page.title }}</div>
-            {% endif %}
-            {% if page.text %}
-                <div class="title_page standart_txt">{{ page.text|safe }}</div>
-            {% endif %}
-        {% endif %}
+{% if page.description or page.title or page.text %}
+    <div {% include "block_settings/blocks_settings.html" %}>
+        <div class="cut-width">
+            <div>
+                
+                {% if page.description %}
+                    <div class="description_page standart_txt">{{ page.description }}</div>
+                {% endif %}
+                {% if page.title %}
+                    <div class="title_page standart_txt">{{ page.title }}</div>
+                {% endif %}
+                {% if page.text %}
+                    <div class="title_page standart_txt">{{ page.text|safe }}</div>
+                {% endif %}
+                
+            </div>
+        </div>
     </div>
-</div>
+{% endif %}
 
 {% if page.page_scheme == 'projecting' %}
     {% include "pages/page_schemes/ps_projecting.html" %}