Merge branch 'master' of github.com:boonex/dolphin

modules/boonex/russian/data/langs/bx_uni/ru.xml

@@ -109,7 +109,6 @@
 	<string name="_bx_uni_stg_cpt_option_menu_slide_shadow"><![CDATA[Тень]]></string>
 
 	<string name="_bx_uni_stg_cpt_category_styles_menu_page"><![CDATA[Страничное меню]]></string>
-	<string name="_bx_uni_stg_cpt_option_menu_page_height"><![CDATA[Высота]]></string>
 	<string name="_bx_uni_stg_cpt_option_menu_page_bg_color"><![CDATA[Цвет фона]]></string>
 	<string name="_bx_uni_stg_cpt_option_menu_page_bg_image"><![CDATA[Изображение фона]]></string>
 	<string name="_bx_uni_stg_cpt_option_menu_page_bg_image_repeat"><![CDATA[Повтор изображение фона]]></string>

modules/boonex/uni/data/template/system/css/default.less

@@ -309,9 +309,7 @@ h3,
 }
 
 /* page menu */
-.bx-menu-main-bar {
-	height: @bx-height-menu-page;
-
+.bx-menu-main-bar-wrapper {
 	border: @bx-border-width-menu-page solid @bx-color-border-menu-page;
 
 	background-color: @bx-color-menu-page;
@@ -320,7 +318,7 @@ h3,
 	background-repeat: @bx-image-bg-menu-page-repeat;
     background-size: @bx-image-bg-menu-page-size;
 }
-.bx-menu-main-bar .bx-menu-main-container {
+.bx-menu-main-bar-wrapper .bx-menu-main-submenu {
 	padding: @bx-content-padding-menu-page;
 }
 

modules/boonex/uni/data/template/system/scripts/BxTemplConfig.php

@@ -66,7 +66,6 @@ class BxTemplConfig extends BxBaseConfig
         $this->_aConfig['aLessConfig']['bx-height-header'] = $this->_setSize($sName . '_header_height', '3rem');
         $this->_aConfig['aLessConfig']['bx-height-block-title-div'] = $this->_setSize($sName . '_block_title_div_height', '1px');
         $this->_aConfig['aLessConfig']['bx-height-form-input'] = $this->_setSize($sName . '_form_input_height', '2.2rem');
-        $this->_aConfig['aLessConfig']['bx-height-menu-page'] = $this->_setSize($sName . '_menu_page_height', '2.5rem');
 		$this->_aConfig['aLessConfig']['bx-height-button'] = $this->_setSize($sName . '_button_lg_height', '2.25rem');
 		$this->_aConfig['aLessConfig']['bx-height-button-small'] = $this->_setSize($sName . '_button_sm_height', '1.5rem');
 		

modules/boonex/uni/install/langs/en.xml

@@ -109,7 +109,6 @@
 	<string name="_bx_uni_stg_cpt_option_menu_slide_shadow"><![CDATA[Shadow]]></string>
 	
 	<string name="_bx_uni_stg_cpt_category_styles_menu_page"><![CDATA[Page Menu]]></string>
-	<string name="_bx_uni_stg_cpt_option_menu_page_height"><![CDATA[Height]]></string>
 	<string name="_bx_uni_stg_cpt_option_menu_page_bg_color"><![CDATA[Background color]]></string>
 	<string name="_bx_uni_stg_cpt_option_menu_page_bg_image"><![CDATA[Background image]]></string>
 	<string name="_bx_uni_stg_cpt_option_menu_page_bg_image_repeat"><![CDATA[Background image repeat]]></string>

modules/boonex/uni/install/sql/install.sql

@@ -168,15 +168,14 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALU
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sName, '_menu_page_height'), '_bx_uni_stg_cpt_option_menu_page_height', '2.5rem', 'digit', '', '', '', 1),
-(@iCategoryId, CONCAT(@sName, '_menu_page_bg_color'), '_bx_uni_stg_cpt_option_menu_page_bg_color', 'rgba(242, 242, 242, 1)', 'rgba', '', '', '', 2),
-(@iCategoryId, CONCAT(@sName, '_menu_page_bg_image'), '_bx_uni_stg_cpt_option_menu_page_bg_image', '', 'image', '', '', '', 3),
+(@iCategoryId, CONCAT(@sName, '_menu_page_bg_color'), '_bx_uni_stg_cpt_option_menu_page_bg_color', 'rgba(242, 242, 242, 1)', 'rgba', '', '', '', 1),
+(@iCategoryId, CONCAT(@sName, '_menu_page_bg_image'), '_bx_uni_stg_cpt_option_menu_page_bg_image', '', 'image', '', '', '', 2),
 (@iCategoryId, CONCAT(@sName, '_menu_page_bg_image_repeat'), '_bx_uni_stg_cpt_option_menu_page_bg_image_repeat', 'no-repeat', 'select', 'no-repeat,repeat,repeat-x,repeat-y', '', '', 3),
 (@iCategoryId, CONCAT(@sName, '_menu_page_bg_image_size'), '_bx_uni_stg_cpt_option_menu_page_bg_image_size', 'cover', 'select', 'auto,cover,contain', '', '', 4),
-(@iCategoryId, CONCAT(@sName, '_menu_page_content_padding'), '_bx_uni_stg_cpt_option_menu_page_content_padding', '0px', 'digit', '', '', '', 4),
-(@iCategoryId, CONCAT(@sName, '_menu_page_border_color'), '_bx_uni_stg_cpt_option_menu_page_border_color', 'rgba(208, 208, 208, 1)', 'rgba', '', '', '', 5),
-(@iCategoryId, CONCAT(@sName, '_menu_page_border_size'), '_bx_uni_stg_cpt_option_menu_page_border_size', '0px', 'digit', '', '', '', 6),
-(@iCategoryId, CONCAT(@sName, '_menu_page_shadow'), '_bx_uni_stg_cpt_option_menu_page_shadow', 'none', 'digit', '', '', '', 7);
+(@iCategoryId, CONCAT(@sName, '_menu_page_content_padding'), '_bx_uni_stg_cpt_option_menu_page_content_padding', '0px', 'digit', '', '', '', 5),
+(@iCategoryId, CONCAT(@sName, '_menu_page_border_color'), '_bx_uni_stg_cpt_option_menu_page_border_color', 'rgba(208, 208, 208, 1)', 'rgba', '', '', '', 6),
+(@iCategoryId, CONCAT(@sName, '_menu_page_border_size'), '_bx_uni_stg_cpt_option_menu_page_border_size', '0px', 'digit', '', '', '', 7),
+(@iCategoryId, CONCAT(@sName, '_menu_page_shadow'), '_bx_uni_stg_cpt_option_menu_page_shadow', 'none', 'digit', '', '', '', 8);
 
 
 -- SETTINGS: UNI Styles Forms

template/scripts/BxBaseMenuSwitchLanguage.php

@@ -32,8 +32,9 @@ class BxBaseMenuSwitchLanguage extends BxTemplMenu
 
         $oPermalink = BxDolPermalinks::getInstance();
 
-        $sPageLink = ltrim($_SERVER['REQUEST_URI'], '/');
-        $sPageLink = $oPermalink->unpermalink($sPageLink);
+        $aBaseLink = parse_url(BX_DOL_URL_ROOT);
+        $sBaseLink = (!empty($aBaseLink['scheme']) ? $aBaseLink['scheme'] : 'http') . '://' . $aBaseLink['host'];
+        $sPageLink = $oPermalink->unpermalink($sBaseLink . $_SERVER['REQUEST_URI']);
 
         $sPageParams = '';
         if(strpos($sPageLink, '?') !== false)