AntonLV 7 yıl önce
ebeveyn
işleme
8956d35347

+ 1 - 0
inc/design.inc.php

@@ -53,6 +53,7 @@ define('BX_DB_PADDING_NO_CAPTION', 13);
 define('BX_DB_HIDDEN_PHONE', 1);
 define('BX_DB_HIDDEN_TABLET', 2);
 define('BX_DB_HIDDEN_DESKTOP', 3);
+define('BX_DB_HIDDEN_MOBILE', 4);
 
 define('BX_FORMAT_DATE', 'sys_format_date'); ///< date format identifier for use in @see bx_time_js function
 define('BX_FORMAT_TIME', 'sys_format_time'); ///< time format identifier for use in @see bx_time_js function

+ 6 - 4
modules/boonex/english/data/langs/system/en.xml

@@ -525,6 +525,7 @@
 	<string name="_adm_bp_txt_block_hidden_on_phone"><![CDATA[phone]]></string>
 	<string name="_adm_bp_txt_block_hidden_on_tablet"><![CDATA[tablet]]></string>
 	<string name="_adm_bp_txt_block_hidden_on_desktop"><![CDATA[desktop]]></string>
+        <string name="_adm_bp_txt_block_hidden_on_mobile"><![CDATA[mobile app]]></string>
 	<string name="_adm_bp_txt_block_selected"><![CDATA[blocks selected]]></string>
 	<string name="_adm_bp_txt_block_title"><![CDATA[Title]]></string>
 	<string name="_adm_bp_txt_block_visible_for"><![CDATA[Visible For]]></string>
@@ -1074,10 +1075,11 @@
 	<string name="_adm_nav_txt_sets_gl_module"><![CDATA[Module]]></string>
 	<string name="_adm_nav_txt_sets_gl_title"><![CDATA[System Name]]></string>
 	<string name="_adm_nav_txt_sets_title"><![CDATA[System Name]]></string>
-  <string name="_adm_nav_txt_block_hidden_on"><![CDATA[Hidden on]]></string>
-  <string name="_adm_nav_txt_block_hidden_on_phone"><![CDATA[phone]]></string>
-  <string name="_adm_nav_txt_block_hidden_on_tablet"><![CDATA[tablet]]></string>
-  <string name="_adm_nav_txt_block_hidden_on_desktop"><![CDATA[desktop]]></string>
+        <string name="_adm_nav_txt_block_hidden_on"><![CDATA[Hidden on]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_phone"><![CDATA[phone]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_tablet"><![CDATA[tablet]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_desktop"><![CDATA[desktop]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_mobile"><![CDATA[mobile app]]></string>
 	<string name="_adm_page_cpt_builder_forms"><![CDATA[Forms]]></string>
 	<string name="_adm_page_cpt_builder_menus"><![CDATA[Navigation]]></string>
 	<string name="_adm_page_cpt_builder_mobile"><![CDATA[Mobile Builder]]></string>

+ 6 - 4
modules/boonex/russian/data/langs/system/ru.xml

@@ -525,6 +525,7 @@
 	<string name="_adm_bp_txt_block_hidden_on_phone"><![CDATA[телефоне]]></string>
 	<string name="_adm_bp_txt_block_hidden_on_tablet"><![CDATA[планшете]]></string>
 	<string name="_adm_bp_txt_block_hidden_on_desktop"><![CDATA[настольном компьютере]]></string>
+        <string name="_adm_bp_txt_block_hidden_on_mobile"><![CDATA[мобильное приложение]]></string>
 	<string name="_adm_bp_txt_block_selected"><![CDATA[блоков выбрано]]></string>
 	<string name="_adm_bp_txt_block_title"><![CDATA[Заголовок]]></string>
 	<string name="_adm_bp_txt_block_visible_for"><![CDATA[Видимо для]]></string>
@@ -1072,10 +1073,11 @@
 	<string name="_adm_nav_txt_sets_gl_module"><![CDATA[Модуль]]></string>
 	<string name="_adm_nav_txt_sets_gl_title"><![CDATA[Системное имя]]></string>
 	<string name="_adm_nav_txt_sets_title"><![CDATA[Системное имя]]></string>
-  <string name="_adm_nav_txt_block_hidden_on"><![CDATA[Скрыть на]]></string>
-  <string name="_adm_nav_txt_block_hidden_on_phone"><![CDATA[телефоне]]></string>
-  <string name="_adm_nav_txt_block_hidden_on_tablet"><![CDATA[планшете]]></string>
-  <string name="_adm_nav_txt_block_hidden_on_desktop"><![CDATA[настольном компьютере]]></string>
+        <string name="_adm_nav_txt_block_hidden_on"><![CDATA[Скрыть на]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_phone"><![CDATA[телефоне]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_tablet"><![CDATA[планшете]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_desktop"><![CDATA[настольном компьютере]]></string>
+        <string name="_adm_nav_txt_block_hidden_on_mobile"><![CDATA[мобильное приложение]]></string>
 	<string name="_adm_page_cpt_builder_forms"><![CDATA[Формы]]></string>
 	<string name="_adm_page_cpt_builder_menus"><![CDATA[Навигация]]></string>
 	<string name="_adm_page_cpt_builder_mobile"><![CDATA[Мобильный построитель]]></string>

+ 8 - 8
studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -683,17 +683,17 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                     'name' => 'hidden_on',
                     'caption' => _t('_adm_bp_txt_block_hidden_on'),
                     'info' => '',
-                	'value' => (int)$aBlock['hidden_on'],
+                    'value' => (int)$aBlock['hidden_on'],
                     'values' => array(
-                		BX_DB_HIDDEN_PHONE => _t('_adm_bp_txt_block_hidden_on_phone'),
-                		BX_DB_HIDDEN_TABLET => _t('_adm_bp_txt_block_hidden_on_tablet'),
-                		BX_DB_HIDDEN_DESKTOP => _t('_adm_bp_txt_block_hidden_on_desktop')
-                
-                	),
-                	'db' => array (
+                        BX_DB_HIDDEN_PHONE => _t('_adm_bp_txt_block_hidden_on_phone'),
+                        BX_DB_HIDDEN_TABLET => _t('_adm_bp_txt_block_hidden_on_tablet'),
+                        BX_DB_HIDDEN_DESKTOP => _t('_adm_bp_txt_block_hidden_on_desktop'),
+                        BX_DB_HIDDEN_MOBILE => _t('_adm_bp_txt_block_hidden_on_mobile')
+                    ),
+                    'db' => array (
                         'pass' => 'Set',
                     )
-				),
+                ),
                 'visible_for' => array(
                     'type' => 'select',
                     'name' => 'visible_for',

+ 8 - 7
studio/template/scripts/BxBaseStudioNavigationItems.php

@@ -670,16 +670,17 @@ class BxBaseStudioNavigationItems extends BxDolStudioNavigationItems
                     'name' => 'hidden_on',
                     'caption' => _t('_adm_nav_txt_block_hidden_on'),
                     'info' => '',
-                	'value' => isset($aItem['hidden_on']) ? (int)$aItem['hidden_on'] : '',
+                    'value' => isset($aItem['hidden_on']) ? (int)$aItem['hidden_on'] : '',
                     'values' => array(
-                		BX_DB_HIDDEN_PHONE => _t('_adm_nav_txt_block_hidden_on_phone'),
-                		BX_DB_HIDDEN_TABLET => _t('_adm_nav_txt_block_hidden_on_tablet'),
-                		BX_DB_HIDDEN_DESKTOP => _t('_adm_nav_txt_block_hidden_on_desktop')
-                	),
-                	'db' => array (
+                        BX_DB_HIDDEN_PHONE => _t('_adm_nav_txt_block_hidden_on_phone'),
+                        BX_DB_HIDDEN_TABLET => _t('_adm_nav_txt_block_hidden_on_tablet'),
+                        BX_DB_HIDDEN_DESKTOP => _t('_adm_nav_txt_block_hidden_on_desktop'),
+                        BX_DB_HIDDEN_MOBILE => _t('_adm_nav_txt_block_hidden_on_mobile')
+                    ),
+                    'db' => array (
                         'pass' => 'Set',
                     )
-				),
+                ),
                 'icon' => array(
                     'type' => 'text',
                     'name' => 'icon',

+ 6 - 5
template/scripts/BxBaseMenu.php

@@ -123,11 +123,12 @@ class BxBaseMenu extends BxDolMenu
 
 	protected function _getMenuItem ($a)
 	{
-        $aHiddenOn = array(
-			pow(2, BX_DB_HIDDEN_PHONE - 1) => 'bx-def-media-phone-hide',
-			pow(2, BX_DB_HIDDEN_TABLET - 1) => 'bx-def-media-tablet-hide',
-			pow(2, BX_DB_HIDDEN_DESKTOP - 1) => 'bx-def-media-desktop-hide'
-		);
+            $aHiddenOn = array(
+                pow(2, BX_DB_HIDDEN_PHONE - 1) => 'bx-def-media-phone-hide',
+                pow(2, BX_DB_HIDDEN_TABLET - 1) => 'bx-def-media-tablet-hide',
+                pow(2, BX_DB_HIDDEN_DESKTOP - 1) => 'bx-def-media-desktop-hide',
+                pow(2, BX_DB_HIDDEN_MOBILE - 1) => 'bx-def-mobile-app-hide'
+            );
         
 		if (isset($a['active']) && !$a['active'])
 			return false;

+ 10 - 10
template/scripts/BxBasePage.php

@@ -165,10 +165,11 @@ class BxBasePage extends BxDolPage
     protected function _getPageCode ()
     {
     	$aHiddenOn = array(
-			pow(2, BX_DB_HIDDEN_PHONE - 1) => 'bx-def-media-phone-hide',
-			pow(2, BX_DB_HIDDEN_TABLET - 1) => 'bx-def-media-tablet-hide',
-			pow(2, BX_DB_HIDDEN_DESKTOP - 1) => 'bx-def-media-desktop-hide'
-		);
+            pow(2, BX_DB_HIDDEN_PHONE - 1) => 'bx-def-media-phone-hide',
+            pow(2, BX_DB_HIDDEN_TABLET - 1) => 'bx-def-media-tablet-hide',
+            pow(2, BX_DB_HIDDEN_DESKTOP - 1) => 'bx-def-media-desktop-hide',
+            pow(2, BX_DB_HIDDEN_MOBILE - 1) => 'bx-def-mobile-app-hide'
+        );
 
         $aVars = array (
             'page_id' => 'bx-page-' . $this->_aObject['uri'],
@@ -180,12 +181,11 @@ class BxBasePage extends BxDolPage
                 $sContentWithBox = $this->_getBlockCode($aBlock);
 
             	$sHiddenOn = '';
-		    	if(!empty($aBlock['hidden_on']))
-		    		foreach($aHiddenOn as $iHiddenOn => $sClass)
-		    			if((int)$aBlock['hidden_on'] & $iHiddenOn)
-		    				$sHiddenOn .= ' ' . $sClass;
-    	
-    	
+                if(!empty($aBlock['hidden_on']))
+                    foreach($aHiddenOn as $iHiddenOn => $sClass)
+                        if((int)$aBlock['hidden_on'] & $iHiddenOn)
+                            $sHiddenOn .= ' ' . $sClass;
+
                 if ($sContentWithBox)
                     $sCell .= '<div class="bx-page-block-container bx-def-padding-sec-topbottom' . $sHiddenOn . '" id="bx-page-block-' . $aBlock['id'] . '">' . $sContentWithBox . '</div>';
             }