From af9cd4407edea699814889d28175f7c1d316e5db Mon Sep 17 00:00:00 2001 From: SDE Date: Sat, 23 Dec 2023 16:47:31 +0500 Subject: [PATCH] 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 %}
-
- {% for widget in block.get_widgets %} -
-
- {% if widget.name %} -
{{ widget.name }}
- {% endif %} - {% if widget.description %} -
{{ widget.description|safe|linebreaksbr }}
- {% endif %} -
-
- {% if widget.video_url %} -
{{ widget.video_url|safe }}
- {% elif widget.picture %} - {{ widget.name }} - {% endif %} -
+
+
+
+ {% for widget in block.get_widgets %} + {% include "widgets/w_one_present_aerBim.html" %} + {% endfor %}
- {% endfor %} +
\ 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 %} -
-
-
-
- {% for widget in block.get_widgets %} - {% include "widgets/w_one_present_aerBim.html" %} - {% endfor %} -
-
-
-
\ 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 @@ } 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 %}