Merge remote-tracking branch 'origin/main'

static/aerbimCSS.css

@@ -290,6 +290,11 @@ body,html{
     margin: 80px 25px;
     display: flex;
     width: calc(100% - 50px);
+    flex-wrap: unset;
+}
+
+.block_service.two_cols{
+    flex-wrap: wrap;
 }
 
 .service_block_container{
@@ -297,6 +302,12 @@ body,html{
     margin-right: 70px;
 }
 
+.service_block_container.two_cols{
+    width: calc(50% - 70px);
+    margin-right: 70px;
+    margin-bottom: 25px;
+}
+
 .childs_service_container{
     border-left: 1px solid #9CDDF7;
     padding-left: 20px;
@@ -323,6 +334,11 @@ body,html{
     float: right;
     padding-left: 20px;
     font-weight: 700;
+    color: #000000;
+}
+
+.right_part_service.two_cols{
+    font-weight: 500;
 }
 
 .right_part_service.child{

static/aerbimJS.js

@@ -82,10 +82,7 @@ function replaceHrefOnOnclick () {
             str_f_replace = str_f_replace.replace(`${window.location.origin}`,'')
             str_f_replace = `href="${str_f_replace}"`
             str = str.replace(str_f_replace,'')
-            str = str.replace('"target="_blank""','')
-
             cur_el.outerHTML = str
-
         }
         i++
     })

templates/blocks/b_service_2_col.html

@@ -0,0 +1,23 @@
+{% load static %}
+{% load i18n %}
+
+<div class="cut-width">
+    <div class="block_service two_cols">
+        {% for service in services %}
+            <div class="service_block_container two_cols">
+                <div class="service_container">
+                    {% if service.picture %}
+                        <div class="left_part_service">
+                            <img class="service_img" src="{{ MEDIA_URL }}{{ service.picture }}">
+                        </div>
+                    {% endif %}
+                    <div class="right_part_service two_cols standart_txt {% if not service.picture %}w_100{% endif %}">
+                        {{ service.name }}
+                    </div>
+                    <div class="clear_both"></div>
+
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+</div>

templates/pages/content/c_blocks_constructor.html

@@ -1,5 +1,11 @@
 {% include 'blocks/dynamic/b_sections_buttons.html' %}
-{% include 'blocks/b_service.html' %}
+{% if services_view_scheme == '3_cols_w_group' %}
+    {% include 'blocks/b_service.html' %}
+    {% elif services_view_scheme == '2_cols_wo_group' %}
+    {% include 'blocks/b_service_2_col.html' %}
+{% endif %}
+
+
 {#{% include 'blocks/b_how_with_us_working.html' %}#}
 {% for block in cur_section.blocks.all %}
     {% if block.block_type == 'photo150_n_title' %}

templates/pages/p_section.html

@@ -1,7 +1,11 @@
 {% extends 'tb_base.html' %}
 {% block CONTENT %}
     {% include 'blocks/dynamic/b_sections_buttons.html' %}
-    {% include 'blocks/b_service.html' %}
+    {% if services_view_scheme == '3_cols_w_group' %}
+        {% include 'blocks/b_service.html' %}
+        {% elif services_view_scheme == '2_cols_wo_group' %}
+        {% include 'blocks/b_service_2_col.html' %}
+    {% endif %}
     {% for block in page.blocks.all %}
         {% if block.block_type == 'photo150_n_title' %}
             {% include 'blocks/b_photo150_n_title.html' %}