New layouts + some fixes in layouts

install/sql/v70.sql

@@ -3267,9 +3267,9 @@ INSERT INTO `sys_pages_layouts` (`id`, `name`, `icon`, `title`, `template`, `cel
 (6, 'top_area_bar_left', 'layout_top_area_bar_left.png', '_sys_layout_top_area_bar_left', 'layout_top_area_bar_left.html', 3),
 (7, 'top_area_bar_right', 'layout_top_area_bar_right.png', '_sys_layout_top_area_bar_right', 'layout_top_area_bar_right.html', 3),
 (8, 'top_area_3_columns', 'layout_top_area_3_columns.png', '_sys_layout_top_area_3_columns', 'layout_top_area_3_columns.html', 4),
-(9, 'top_area_2_columns', 'layout_top_area_2_columns.png', '_sys_layout_top_area_2_columns', 'layout_top_area_2_columns.html', 3);
-
-
+(9, 'top_area_2_columns', 'layout_top_area_2_columns.png', '_sys_layout_top_area_2_columns', 'layout_top_area_2_columns.html', 3),
+(10, 'topbottom_area_2_columns', 'layout_topbottom_area_2_columns.png', '_sys_layout_topbottom_area_2_columns', 'layout_topbottom_area_2_columns.html', 4),
+(11, 'bottom_area_2_columns', 'layout_bottom_area_2_columns.png', '_sys_layout_bottom_area_2_columns', 'layout_bottom_area_2_columns.html', 3);
 
 CREATE TABLE IF NOT EXISTS `sys_pages_design_boxes` (
   `id` int(11) NOT NULL,

modules/boonex/english/data/langs/system.xml

@@ -2425,6 +2425,8 @@ Please click "Continue" below to navigate to the home page of the site.]]></stri
     <string name="_sys_layout_top_area_bar_right"><![CDATA[Top area with right bar]]></string>
     <string name="_sys_layout_top_area_3_columns"><![CDATA[Top area with 3 columns]]></string>
     <string name="_sys_layout_top_area_2_columns"><![CDATA[Top area with 2 columns]]></string>
+    <string name="_sys_layout_topbottom_area_2_columns"><![CDATA[Top&bottom areas with 2 columns in the middle]]></string>
+    <string name="_sys_layout_bottom_area_2_columns"><![CDATA[Bottom area with 2 columns at top]]></string>
     <string name="_sys_block_types_system"><![CDATA[System]]></string>
     <string name="_sys_block_types_custom"><![CDATA[Custom]]></string>
     <string name="_sys_block_types_skeletons"><![CDATA[Skeletons]]></string>

template/_row_1_column.html

@@ -1,4 +1,4 @@
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-1-column-column1">
             <div class="bx-layout-cell" id="bx-layout-cell-1">
                 __cell_1__

template/layout_2_columns.html

@@ -1,6 +1,6 @@
 <!-- layout 2 columns [ start ] -->
 <div class="bx-layout-wrapper bx-layout-2-columns">
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__

template/layout_3_columns.html

@@ -1,6 +1,6 @@
 <!-- layout 3 columns [ start ] -->
 <div class="bx-layout-wrapper bx-layout-3-columns">
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__

template/layout_bar_left.html

@@ -1,6 +1,6 @@
 <!-- layout bar left [ start ] -->
 <div class="bx-layout-wrapper bx-layout-bar-left">
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__

template/layout_bar_right.html

@@ -1,6 +1,6 @@
 <!-- layout bar right [ start ] -->
 <div class="bx-layout-wrapper bx-layout-bar-right">
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__

template/layout_bottom_area_2_columns.html

@@ -0,0 +1,20 @@
+<!-- layout top area 2 columns [ start ] -->
+<div class="bx-layout-wrapper bx-layout-top-area-2-columns">
+
+    <div class="bx-layout-row bx-clearfix">
+        <div class="bx-layout-col bx-layout-2-columns-column1">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+                __cell_2__
+            </div>
+        </div>
+        <div class="bx-layout-col bx-layout-2-columns-column2">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+                __cell_3__
+            </div>
+        </div>
+    </div>
+
+    <bx_include_auto:_row_1_column.html />
+
+</div>
+<!-- layout top area 2 columns [  end  ] -->

template/layout_top_area_2_columns.html

@@ -3,7 +3,7 @@
 
     <bx_include_auto:_row_1_column.html />
 
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__

template/layout_top_area_3_columns.html

@@ -3,7 +3,7 @@
 
     <bx_include_auto:_row_1_column.html />
 
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__

template/layout_top_area_bar_left.html

@@ -3,7 +3,7 @@
 
     <bx_include_auto:_row_1_column.html />
 
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__

template/layout_top_area_bar_right.html

@@ -3,7 +3,7 @@
 
     <bx_include_auto:_row_1_column.html />
 
-    <div class="bx-layout-row">
+    <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__

template/layout_topbottom_area_2_columns.html

@@ -0,0 +1,28 @@
+<!-- layout top area 2 columns [ start ] -->
+<div class="bx-layout-wrapper bx-layout-top-area-2-columns">
+
+    <bx_include_auto:_row_1_column.html />
+
+    <div class="bx-layout-row bx-clearfix">
+        <div class="bx-layout-col bx-layout-2-columns-column1">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+                __cell_2__
+            </div>
+        </div>
+        <div class="bx-layout-col bx-layout-2-columns-column2">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+                __cell_3__
+            </div>
+        </div>
+    </div>
+
+    <div class="bx-layout-row bx-clearfix">
+        <div class="bx-layout-col bx-layout-1-column-column1">
+            <div class="bx-layout-cell" id="bx-layout-cell-4">
+                __cell_4__
+            </div>
+        </div>
+    </div>
+
+</div>
+<!-- layout top area 2 columns [  end  ] -->