AntonLV 5 years ago
parent
commit
651d6fa5ea

+ 7 - 5
install/sql/system.sql

@@ -4991,10 +4991,10 @@ INSERT INTO `sys_objects_page` (`object`, `uri`, `title_system`, `title`, `modul
 ('sys_dashboard_content', 'dashboard-content', '_sys_page_title_system_dashboard_content', '_sys_page_title_dashboard_content', 'system', 1, 12, '', 2147483646, 1, 'page.php?i=dashboard-content', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', '', 0),
 ('sys_dashboard_reports', 'dashboard-reports', '_sys_page_title_system_dashboard_reports', '_sys_page_title_dashboard_reports', 'system', 1, 12, '', 2147483646, 1, 'page.php?i=dashboard-reports', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', '', 0),
 ('sys_dashboard_audit', 'dashboard-audit', '_sys_page_title_system_dashboard_audit', '_sys_page_title_dashboard_audit', 'system', 1, 12, '', 2147483646, 1, 'page.php?i=dashboard-audit', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', '', 0),
-('sys_create_account', 'create-account', '_sys_page_title_system_create_account', '_sys_page_title_create_account', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=create-account', '', '', '', 0, 1, 0, '', '', 0),
-('sys_login', 'login', '_sys_page_title_system_login', '_sys_page_title_login', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=login', '', '', '', 0, 1, 0, '', '', 0),
-('sys_login_step2', 'login-step2', '_sys_page_title_system_login_step2', '_sys_page_title_login_step2', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=login-step2', '', '', '', 0, 1, 0, '', '', 0),
-('sys_login_step3', 'login-step3', '_sys_page_title_system_login_step3', '_sys_page_title_login_step3', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=login-step3', '', '', '', 0, 1, 0, '', '', 0),
+('sys_create_account', 'create-account', '_sys_page_title_system_create_account', '_sys_page_title_create_account', 'system', 1, 18, '', 2147483647, 1, 'page.php?i=create-account', '', '', '', 0, 1, 0, '', '', 0),
+('sys_login', 'login', '_sys_page_title_system_login', '_sys_page_title_login', 'system', 1, 18, '', 2147483647, 1, 'page.php?i=login', '', '', '', 0, 1, 0, '', '', 0),
+('sys_login_step2', 'login-step2', '_sys_page_title_system_login_step2', '_sys_page_title_login_step2', 'system', 1, 18, '', 2147483647, 1, 'page.php?i=login-step2', '', '', '', 0, 1, 0, '', '', 0),
+('sys_login_step3', 'login-step3', '_sys_page_title_system_login_step3', '_sys_page_title_login_step3', 'system', 1, 18, '', 2147483647, 1, 'page.php?i=login-step3', '', '', '', 0, 1, 0, '', '', 0),
 ('sys_forgot_password', 'forgot-password', '_sys_page_title_system_forgot_password', '_sys_page_title_forgot_password', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=forgot-password', '', '', '', 0, 1, 0, '', '', 0),
 ('sys_confirm_email', 'confirm-email', '_sys_page_title_system_confirm_email', '_sys_page_title_confirm_email', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=confirm-email', '', '', '', 0, 1, 0, '', '', 0),
 ('sys_confirm_phone', 'confirm-phone', '_sys_page_title_system_confirm_phone', '_sys_page_title_confirm_phone', 'system', 1, 5, '', 2147483647, 1, 'page.php?i=confirm-phone', '', '', '', 0, 1, 0, '', '', 0),
@@ -5053,7 +5053,9 @@ INSERT INTO `sys_pages_layouts` (`id`, `name`, `icon`, `title`, `template`, `cel
 (14, 'bar_content_bar', 'layout_bar_content_bar.png', '_sys_layout_bar_content_bar', 'layout_bar_content_bar.html', 3),
 (15, 'top_area_bar_content_bar', 'layout_top_area_bar_content_bar.png', '_sys_layout_top_area_bar_content_bar', 'layout_top_area_bar_content_bar.html', 4),
 (16, 'topbottom_area_col1_col3_col2', 'layout_topbottom_area_col1_col3_col2.png', '_sys_layout_topbottom_area_col1_col3_col2', 'layout_topbottom_area_col1_col3_col2.html', 5),
-(17, 'topbottom_area_col1_col5', 'layout_topbottom_area_col1_col5.png', '_sys_layout_topbottom_area_col1_col5', 'layout_topbottom_area_col1_col5.html', 4);
+(17, 'topbottom_area_col1_col5', 'layout_topbottom_area_col1_col5.png', '_sys_layout_topbottom_area_col1_col5', 'layout_topbottom_area_col1_col5.html', 4),
+(18, '1_column_thin', 'layout_1_column_thin.png', '_sys_layout_1_column_thin', 'layout_1_column_thin.html', 1),
+(19, '1_column_half', 'layout_1_column_half.png', '_sys_layout_1_column_half', 'layout_1_column_half.html', 1);
 
 CREATE TABLE IF NOT EXISTS `sys_pages_design_boxes` (
   `id` int(11) NOT NULL,

+ 2 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -2626,6 +2626,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_inst_start_installation"><![CDATA[Start installation]]></string>
 	<string name="_sys_inst_title"><![CDATA[UNA {0} Installation]]></string>
 	<string name="_sys_layout_1_column"><![CDATA[1 column]]></string>
+        <string name="_sys_layout_1_column_thin"><![CDATA[1 column (thin)]]></string>
+        <string name="_sys_layout_1_column_half"><![CDATA[1 column (half)]]></string>
 	<string name="_sys_layout_2_columns"><![CDATA[2 columns]]></string>
 	<string name="_sys_layout_3_columns"><![CDATA[3 columns]]></string>
 	<string name="_sys_layout_bar_left"><![CDATA[With left bar]]></string>

+ 3 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+_sys_layout_1_column<?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
 	<string name="_ADM_PROFILE_SEND_MSG"><![CDATA[Сообщение было удачно отправлено]]></string>
 	<string name="_ATT_ACTIVE_E"><![CDATA[Вы полноправный член нашего Сообщества. Но Вы можете заблокировать свой профиль, чтобы он был временно недоступен для других.]]></string>
@@ -2610,6 +2610,8 @@
 	<string name="_sys_inst_start_installation"><![CDATA[Начать установку]]></string>
 	<string name="_sys_inst_title"><![CDATA[Установка UNA {0}]]></string>
 	<string name="_sys_layout_1_column"><![CDATA[1 столбец]]></string>
+        <string name="_sys_layout_1_column_thin"><![CDATA[1 столбец (узкий)]]></string>
+        <string name="_sys_layout_1_column_half"><![CDATA[1 столбец (половина)]]></string>
 	<string name="_sys_layout_2_columns"><![CDATA[2 столбца]]></string>
 	<string name="_sys_layout_3_columns"><![CDATA[3 столбца]]></string>
 	<string name="_sys_layout_bar_left"><![CDATA[С левой линейкой]]></string>

+ 7 - 0
template/_row_1_column_half.html

@@ -0,0 +1,7 @@
+<div class="bx-layout-row bx-clearfix">
+    <div class="bx-layout-col bx-layout-1-column-half-column1 bx-layout-column-half bx-def-centered">
+        <div class="bx-layout-cell" id="bx-layout-cell-1">
+            __cell_1__
+        </div>
+    </div>
+</div>

+ 7 - 0
template/_row_1_column_thin.html

@@ -0,0 +1,7 @@
+<div class="bx-layout-row bx-clearfix">
+    <div class="bx-layout-col bx-layout-1-column-thin-column1 bx-layout-column-thin bx-def-centered">
+        <div class="bx-layout-cell" id="bx-layout-cell-1">
+            __cell_1__
+        </div>
+    </div>
+</div>

+ 11 - 0
template/css/page_layouts.css

@@ -19,6 +19,17 @@
     float:none;
 }
 
+/* layout 1 column thin */
+.bx-layout-1-column-thin-column1 {
+    float:none;
+    width:33.3%;
+}
+
+/* layout 1 column half */
+.bx-layout-1-column-half-column1 {
+    float:none;
+    width:50%;
+}
 
 /* layout 3 columns */
 .bx-layout-3-columns-column3,

BIN
template/images/layout_1_column_half.png


BIN
template/images/layout_1_column_thin.png


+ 6 - 0
template/layout_1_column_half.html

@@ -0,0 +1,6 @@
+<!-- layout 1 column half [ start ] -->
+<div id="__page_id__" class="bx-layout-wrapper bx-layout-1-column-half">
+    <bx_include_auto:_row_1_column_half.html />
+    <bx_include_auto:_row_1_column_dump.html />
+</div>
+<!-- layout 1 column half [  end  ] -->

+ 6 - 0
template/layout_1_column_thin.html

@@ -0,0 +1,6 @@
+<!-- layout 1 column thin [ start ] -->
+<div id="__page_id__" class="bx-layout-wrapper bx-layout-1-column-thin">
+    <bx_include_auto:_row_1_column_thin.html />
+    <bx_include_auto:_row_1_column_dump.html />
+</div>
+<!-- layout 1 column thin [  end  ] -->