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

install/sql/system.sql

@@ -229,7 +229,6 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 (@iCategoryId, 'sys_site_icon', '', '0', 'digit', '', '', '', 22),
 (@iCategoryId, 'sys_site_logo_width', '_adm_stg_cpt_option_sys_site_logo_width', '240', 'digit', '', '', '', 23),
 (@iCategoryId, 'sys_site_logo_height', '_adm_stg_cpt_option_sys_site_logo_height', '48', 'digit', '', '', '', 24),
-(@iCategoryId, 'main_div_width', '', '1000px', 'digit', '', '', '', 25),
 
 (@iCategoryId, 'sys_template_cache_image_enable', '', '', 'checkbox', '', '', '', 30),
 (@iCategoryId, 'sys_template_cache_image_max_size', '', '5', 'digit', '', '', '', 31),
@@ -267,10 +266,7 @@ INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `hidden`, `or
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, 'template', '_adm_stg_cpt_option_template', '', 'select', 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:13:"get_templates";s:5:"class";s:21:"TemplTemplateServices";}', 'Template', '_adm_stg_err_option_template', 1),
-
-(@iCategoryId, 'sys_template_page_width_min', '_adm_stg_cpt_option_sys_template_page_width_min', '774', 'digit', '', '', '', 2),
-(@iCategoryId, 'sys_template_page_width_max', '_adm_stg_cpt_option_sys_template_page_width_max', '1600', 'digit', '', '', '', 3);
+(@iCategoryId, 'template', '_adm_stg_cpt_option_template', '', 'select', 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:13:"get_templates";s:5:"class";s:21:"TemplTemplateServices";}', 'Template', '_adm_stg_err_option_template', 1);
 
 
 --

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
-	<string name="_bx_accnt"><![CDATA[Manage Accounts]]></string>
+	<string name="_bx_accnt"><![CDATA[Accounts]]></string>
 
 	<string name="_bx_accnt_page_title_sys_manage"><![CDATA[Manage Accounts]]></string>
 	<string name="_bx_accnt_page_title_manage"><![CDATA[Manage Accounts]]></string>

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

@@ -1160,8 +1160,6 @@
 	<string name="_adm_stg_cpt_option_sys_template_cache_enable"><![CDATA[Enable cache for HTML files]]></string>
 	<string name="_adm_stg_cpt_option_sys_template_cache_engine"><![CDATA[Template cache engine (other than FileHtml option may require custom server setup)]]></string>
 	<string name="_adm_stg_cpt_option_sys_template_cache_js_enable"><![CDATA[Enable cache for JS files]]></string>
-	<string name="_adm_stg_cpt_option_sys_template_page_width_max"><![CDATA[Max page width(in pixels)]]></string>
-	<string name="_adm_stg_cpt_option_sys_template_page_width_min"><![CDATA[Min page width(in pixels)]]></string>
 	<string name="_adm_stg_cpt_option_sys_transcoder_queue_storage"><![CDATA[Remote video transcoding]]></string>
 	<string name="_adm_stg_cpt_option_template"><![CDATA[Default Template]]></string>
 	<string name="_adm_stg_err_option_template"><![CDATA[Template cannot be empty and must have a valid name.]]></string>
@@ -1207,6 +1205,7 @@
 	<string name="_adm_str_txt_pv_version_mask"><![CDATA[{0} ({1} is available)]]></string>
 	<string name="_adm_str_txt_update_from_to"><![CDATA[{0} - {1}]]></string>
 	<string name="_adm_tmi_cpt_edit"><![CDATA[Manage Launcher]]></string>
+	<string name="_adm_tmi_cpt_extensions"><![CDATA[Add Extensions]]></string>
 	<string name="_adm_tmi_cpt_favorite"><![CDATA[Show Favorite Only]]></string>
 	<string name="_adm_tmi_cpt_logout"><![CDATA[Sign out]]></string>
 	<string name="_adm_tmi_cpt_site"><![CDATA[Go To Site]]></string>

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

@@ -15,6 +15,9 @@ class BxTemplConfig extends BxBaseConfig
     {
         parent::__construct();
 
+		if(class_exists('BxDolDb') && BxDolDb::getInstance())
+			$this->_aConfig['aLessConfig']['bx-page-width'] = getParam('bx_lagoon_page_width') . 'px';
+
         bx_import('BxDolTemplate');
         $sCode = BxDolTemplate::getInstance()->getCode();
         $sStaticImages = BX_DOL_URL_ROOT . 'templates/tmpl_' . $sCode . '/images/';

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

@@ -4,4 +4,5 @@
 	<string name="_bx_lagoon_stg_cpt_type"><![CDATA[Lagoon]]></string>
 	<string name="_bx_lagoon_stg_cpt_category_system"><![CDATA[General]]></string>
 	<string name="_bx_lagoon_stg_cpt_option_switcher_name"><![CDATA[Name In Template Switcher]]></string>
+	<string name="_bx_lagoon_stg_cpt_option_page_width"><![CDATA[Page Width]]></string>
 </resources>

modules/boonex/lagoon/install/sql/install.sql

@@ -10,7 +10,8 @@ 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, '_switcher_title'), '_bx_lagoon_stg_cpt_option_switcher_name', 'Lagoon', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_switcher_title'), '_bx_lagoon_stg_cpt_option_switcher_name', 'Lagoon', 'digit', '', '', '', 1),
+(@iCategoryId, CONCAT(@sName, '_page_width'), '_bx_lagoon_stg_cpt_option_page_width', '1000', 'digit', '', '', '', 2);
 
 
 -- STUDIO PAGE & WIDGET

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

@@ -28,6 +28,9 @@ class BxTemplConfig extends BxBaseConfig
         	'bx-border-color' => '#00a0ce',
         ));
 
+        if(class_exists('BxDolDb') && BxDolDb::getInstance())
+			$this->_aConfig['aLessConfig']['bx-page-width'] = getParam('bx_ocean_page_width') . 'px';
+
         bx_import('BxDolTemplate');
         $sCode = BxDolTemplate::getInstance()->getCode();
         $sStaticImages = BX_DOL_URL_ROOT . 'templates/tmpl_' . $sCode . '/images/';

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

@@ -4,4 +4,5 @@
 	<string name="_bx_ocean_stg_cpt_type"><![CDATA[Ocean]]></string>
 	<string name="_bx_ocean_stg_cpt_category_system"><![CDATA[General]]></string>
 	<string name="_bx_ocean_stg_cpt_option_switcher_name"><![CDATA[Name In Template Switcher]]></string>
+	<string name="_bx_ocean_stg_cpt_option_page_width"><![CDATA[Page Width]]></string>
 </resources>

modules/boonex/ocean/install/sql/install.sql

@@ -10,7 +10,8 @@ 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, '_switcher_title'), '_bx_ocean_stg_cpt_option_switcher_name', 'Ocean', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_switcher_title'), '_bx_ocean_stg_cpt_option_switcher_name', 'Ocean', 'digit', '', '', '', 1),
+(@iCategoryId, CONCAT(@sName, '_page_width'), '_bx_ocean_stg_cpt_option_page_width', '1000', 'digit', '', '', '', 2);
 
 
 -- STUDIO PAGE & WIDGET

studio/classes/BxDolStudioMenuTop.php

@@ -45,6 +45,12 @@ class BxDolStudioMenuTop extends BxDol
                 'onclick' => $this->getJsObject() . '.clickFavorite(this);',
                 'title' => '_adm_tmi_cpt_favorite'
             ),
+            'extensions' => array(
+                'name' => 'extensions',
+                'icon' => 'plus',
+                'link' => BX_DOL_URL_STUDIO . 'store.php?page=goodies',
+                'title' => '_adm_tmi_cpt_extensions'
+            ),
         );
 
         $aMatch = array();

template/scripts/BxBaseConfig.php

@@ -61,9 +61,6 @@ class BxBaseConfig extends BxDol implements iBxDolSingleton
     function __construct()
     {
         parent::__construct();
-
-        if (class_exists('BxDolDb') && BxDolDb::getInstance())
-            $this->_aConfig['aLessConfig']['bx-page-width'] = getParam('main_div_width');
     }
 
     public static function getInstance()