AntonLV 6 년 전
부모
커밋
866b782f28

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

@@ -567,12 +567,13 @@
 	<string name="_adm_bp_txt_page_uri"><![CDATA[URL]]></string>
 	<string name="_adm_bp_txt_page_url"><![CDATA[Link]]></string>
 	<string name="_adm_bp_txt_page_visible_for_levels"><![CDATA[Select Levels]]></string>
-  <string name="_adm_bp_txt_page_sticky_columns"><![CDATA[Enable sticky blocks]]></string>
-  <string name="_adm_bp_txt_select_page"><![CDATA[Select Page...]]></string>
+        <string name="_adm_bp_txt_page_sticky_columns"><![CDATA[Enable sticky blocks]]></string>
+        <string name="_adm_bp_txt_select_page"><![CDATA[Select Page...]]></string>
 	<string name="_adm_bp_txt_settings_popup"><![CDATA[Settings]]></string>
 	<string name="_adm_bp_txt_visible_for"><![CDATA[Visible for {0}]]></string>
 	<string name="_adm_bp_wrn_page_delete"><![CDATA[Are you sure you want to delete the page?]]></string>
 	<string name="_adm_bp_wrn_page_block_delete"><![CDATA[Are you sure you want to delete the block?]]></string>
+        <string name="_adm_bp_txt_inactive_blocks"><![CDATA[Inactive Blocks]]></string>
 	<string name="_adm_btn_cancel_submit"><![CDATA[Cancel]]></string>
 	<string name="_adm_btn_checkout_submit"><![CDATA[Checkout]]></string>
 	<string name="_adm_btn_delete_submit"><![CDATA[Delete]]></string>

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

@@ -567,12 +567,13 @@
 	<string name="_adm_bp_txt_page_uri"><![CDATA[URL]]></string>
 	<string name="_adm_bp_txt_page_url"><![CDATA[Ссылка]]></string>
 	<string name="_adm_bp_txt_page_visible_for_levels"><![CDATA[Выбрать уровни]]></string>
-  <string name="_adm_bp_txt_page_sticky_columns"><![CDATA[Включить 'липкие' блоки]]></string>
+        <string name="_adm_bp_txt_page_sticky_columns"><![CDATA[Включить 'липкие' блоки]]></string>
 	<string name="_adm_bp_txt_select_page"><![CDATA[Выбрать страницу...]]></string>
 	<string name="_adm_bp_txt_settings_popup"><![CDATA[Настройки]]></string>
 	<string name="_adm_bp_txt_visible_for"><![CDATA[Видимо для {0}]]></string>
 	<string name="_adm_bp_wrn_page_delete"><![CDATA[Вы уверены, что хотите удалить эту страницу?]]></string>
 	<string name="_adm_bp_wrn_page_block_delete"><![CDATA[Вы уверены, что хотите удалить этот блок?]]></string>
+        <string name="_adm_bp_txt_inactive_blocks"><![CDATA[Неактивные блоки]]></string>
 	<string name="_adm_btn_cancel_submit"><![CDATA[Отменить]]></string>
 	<string name="_adm_btn_checkout_submit"><![CDATA[Оплатить]]></string>
 	<string name="_adm_btn_delete_submit"><![CDATA[Удалить]]></string>

+ 2 - 1
template/_row_1_column_dump.html

@@ -1,7 +1,8 @@
 <bx_if:show_layout_row_dump>
     <div class="bx-layout-row bx-lr-dump bx-clearfix">
         <div class="bx-layout-col bx-layout-1-column-column1 bx-layout-column-fullwidth">
-            <div class="bx-layout-cell" id="bx-layout-cell-0">
+            <div class="bx-layout-cell bx-def-margin-topbottom" id="bx-layout-cell-0">
+                <div class="bx-layout-cell-title bx-def-margin-thd-bottom"><bx_text:_adm_bp_txt_inactive_blocks /></div>
                 __cell_0__
             </div>
         </div>

+ 3 - 1
template/css/page_layouts.css

@@ -3,7 +3,9 @@
 .bx-layout-row.bx-lr-dump {
     display: block;
 }
-.bx-layout-row.bx-lr-dump .adm-bp-cell.bx-def-border {
+.bx-layout-row.bx-lr-dump .adm-bp-cell {
+    margin-top: 0;
+    margin-bottom: 0;
     border-style: dashed;
 }
 

+ 1 - 1
template/layout_1_column.html

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

+ 1 - 1
template/layout_2_columns.html

@@ -1,6 +1,5 @@
 <!-- layout 2 columns [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-2-columns">
-    <bx_include_auto:_row_1_column_dump.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
@@ -13,5 +12,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout 2 columns [  end  ] -->

+ 1 - 1
template/layout_3_columns.html

@@ -1,6 +1,5 @@
 <!-- layout 3 columns [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-3-columns">
-    <bx_include_auto:_row_1_column_dump.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1 bx-layout-column-thin">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
@@ -18,5 +17,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout 3 columns [  end  ] -->

+ 1 - 1
template/layout_bar_content_bar.html

@@ -1,6 +1,5 @@
 <!-- layout bar content bar (bcb) [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-bcb">
-    <bx_include_auto:_row_1_column_dump.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bcb-bar1 bx-layout-column-thin">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
@@ -18,5 +17,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout bar content bar (bcb) [  end  ] -->

+ 1 - 1
template/layout_bar_left.html

@@ -1,6 +1,5 @@
 <!-- layout bar left [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-bar-left">
-    <bx_include_auto:_row_1_column_dump.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar bx-layout-column-thin">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
@@ -13,5 +12,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout bar left [  end  ] -->

+ 1 - 1
template/layout_bar_right.html

@@ -1,6 +1,5 @@
 <!-- layout bar right [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-bar-right">
-    <bx_include_auto:_row_1_column_dump.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content bx-layout-column-wide">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
@@ -13,5 +12,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout bar right [  end  ] -->

+ 1 - 1
template/layout_bottom_area_2_columns.html

@@ -1,6 +1,5 @@
 <!-- layout top area 2 columns [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-2-columns">
-    <bx_include_auto:_row_1_column_dump.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
             <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
@@ -14,6 +13,7 @@
         </div>
     </div>
     <bx_include_auto:_row_1_column.html />
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <bx_include_auto:_layout_align_columns.html />
 <!-- layout top area 2 columns [  end  ] -->

+ 1 - 1
template/layout_top_area_2_columns.html

@@ -1,6 +1,5 @@
 <!-- layout top area 2 columns [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-2-columns">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
@@ -14,5 +13,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout top area 2 columns [  end  ] -->

+ 1 - 1
template/layout_top_area_3_columns.html

@@ -1,6 +1,5 @@
 <!-- layout top area 3 columns [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-3-columns">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1 bx-layout-column-thin">
@@ -19,5 +18,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout top area 3 columns [  end  ] -->

+ 1 - 1
template/layout_top_area_bar_content_bar.html

@@ -1,6 +1,5 @@
 <!-- layout top area bar content bar (bcb) [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-bcb">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bcb-bar1 bx-layout-column-thin">
@@ -19,5 +18,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout top area bar content bar (bcb) [  end  ] -->

+ 1 - 1
template/layout_top_area_bar_left.html

@@ -1,6 +1,5 @@
 <!-- layout top area bar left [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-bar-left">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar bx-layout-column-thin">
@@ -14,5 +13,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout top area bar left [  end  ] -->

+ 1 - 1
template/layout_top_area_bar_right.html

@@ -1,6 +1,5 @@
 <!-- layout top area bar right [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-bar-right">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content bx-layout-column-wide">
@@ -14,5 +13,6 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <!-- layout top area bar right [  end  ] -->

+ 1 - 1
template/layout_topbottom_area_2_columns.html

@@ -1,6 +1,5 @@
 <!-- layout top area 2 columns [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-top-area-2-columns">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
@@ -21,6 +20,7 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <bx_include_auto:_layout_align_columns.html />
 <!-- layout top area 2 columns [  end  ] -->

+ 1 - 1
template/layout_topbottom_area_bar_left.html

@@ -1,6 +1,5 @@
 <!-- layout top & bottom areas bar left [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-topbottom-area-bar-left">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar bx-layout-column-thin">
@@ -21,6 +20,7 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <bx_include_auto:_layout_align_columns.html />
 <!-- layout top area 2 columns [  end  ] -->

+ 1 - 1
template/layout_topbottom_area_bar_right.html

@@ -1,6 +1,5 @@
 <!-- layout top & bottom areas bar right [ start ] -->
 <div id="__page_id__" class="bx-layout-wrapper bx-layout-topbottom-area-bar-right">
-    <bx_include_auto:_row_1_column_dump.html />
     <bx_include_auto:_row_1_column.html />
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content bx-layout-column-wide">
@@ -21,6 +20,7 @@
             </div>
         </div>
     </div>
+    <bx_include_auto:_row_1_column_dump.html />
 </div>
 <bx_include_auto:_layout_align_columns.html />
 <!-- layout top area 2 columns [  end  ] -->