Changeset 15795 for trunk/modules

Timestamp:

12/25/11 21:58:37 (5 months ago)

Author:

Anton Lesnikov

Message:

1. Studio -> Settings improvement.
2. inc/languages.inc.php -> BxDolLanguages?.php and related changes.
3. Minor fixes and improvements.

Location:

trunk/modules/boonex

Files:

• english/install/config.php (modified) (4 diffs)
• english/install/sql/disable.sql (modified) (2 diffs)
• english/install/sql/enable.sql (modified) (2 diffs)
• english/install/sql/install.sql (modified) (4 diffs)
• english/install/sql/uninstall.sql (modified) (3 diffs)
• russian/install/sql/uninstall.sql (modified) (1 diff)

trunk/modules/boonex/english/install/config.php

@@ -25 +25 @@
      */
     'type' => BX_DOL_MODULE_TYPE_LANGUAGE,
-    'name' => 'en',
+    'name' => 'bx_en',
     'title' => 'English',
     'note' => 'Language file',
@@ -50 +50 @@
      */
     'install' => array(
-        'show_introduction' => 1,
+        'show_introduction' => 0,
         'change_permissions' => 0,
         'move_sources' => 1,
@@ -58 +58 @@
         'recompile_global_paramaters' => 1,
         'clear_db_cache' => 0,
-        'show_conclusion' => 1
+        'show_conclusion' => 0
     ),
     'uninstall' => array (
-        'show_introduction' => 1,
+        'show_introduction' => 0,
         'change_permissions' => 0,
         'move_sources' => 1,
@@ -68 +68 @@
         'recompile_global_paramaters' => 1,
         'clear_db_cache' => 0,
-        'show_conclusion' => 1
+        'show_conclusion' => 0
     ),
     'enable' => array(

trunk/modules/boonex/english/install/sql/disable.sql

@@ -2 +2 @@
 -- General section.
 --
-SET @sModuleName = 'bx_lang_en';
+SET @sName = 'bx_en';
 UPDATE `sys_localization_languages` SET `Enabled`='0' WHERE `Name`='en';
 
@@ -9 +9 @@
 -- Studio page and widget.
 --
-SET @iPageId = (SELECT `id` FROM `sys_std_pages` WHERE `name`=@sModuleName LIMIT 1);
+SET @iPageId = (SELECT `id` FROM `sys_std_pages` WHERE `name`=@sName LIMIT 1);
 UPDATE `sys_std_widgets` SET `status`='2' WHERE `page_id`=@iPageId LIMIT 1;

trunk/modules/boonex/english/install/sql/enable.sql

@@ -2 +2 @@
 -- General section.
 --
-SET @sModuleName = 'bx_lang_en';
+SET @sName = 'bx_en';
 UPDATE `sys_localization_languages` SET `Enabled`='1' WHERE `Name`='en';
 
@@ -9 +9 @@
 -- Studio page and widget.
 --
-SET @iPageId = (SELECT `id` FROM `sys_std_pages` WHERE `name`=@sModuleName LIMIT 1);
+SET @iPageId = (SELECT `id` FROM `sys_std_pages` WHERE `name`=@sName LIMIT 1);
 UPDATE `sys_std_widgets` SET `status`='1' WHERE `page_id`=@iPageId LIMIT 1;

trunk/modules/boonex/english/install/sql/install.sql

@@ -2 +2 @@
 -- General section.
 --
-SET @sModuleName = 'bx_lang_en';
+SET @sName = 'bx_en';
 INSERT INTO `sys_localization_languages`(`Name`, `Flag`, `Title`, `Enabled`) VALUES('en', 'gb', 'English', '0');
 
@@ -10 +10 @@
 --
 INSERT INTO `sys_std_pages`(`index`, `name`, `header`, `caption`, `icon`) VALUES
-(3, @sModuleName, '', '', 'modules/boonex/english/|std-pi.png');
+(3, @sName, '', '', 'modules/boonex/english/|std-pi.png');
 SET @iPageId = LAST_INSERT_ID();
 
@@ -16 +16 @@
 SET @iParentPageOrder = (SELECT MAX(`order`) FROM `sys_std_pages_widgets` WHERE `page_id`=@iParentPageId);
 INSERT INTO `sys_std_widgets`(`page_id`, `url`, `click`, `icon`, `caption`, `cnt_notices`, `cnt_actions`, `status`) VALUES
-(@iPageId, '{url_studio}language.php?name=en', '', 'modules/boonex/english/|std-wi.png', '_bx_eng_wgt_cpt', '', '', 2);
+(@iPageId, CONCAT('{url_studio}language.php?name=', @sName), '', 'modules/boonex/english/|std-wi.png', '_bx_eng_wgt_cpt', '', '', 2);
 INSERT INTO `sys_std_pages_widgets`(`page_id`, `widget_id`, `order`) VALUES
 (@iParentPageId, LAST_INSERT_ID(), @iParentPageOrder + 1);
@@ -25 +25 @@
 --
 INSERT INTO `sys_options_types`(`group`, `name`, `caption`, `icon`, `order`) VALUES 
-('languages', @sModuleName, '_bx_eng_stg_cpt_type', 'modules/boonex/english/|std-mi.png', 2);
+('languages', @sName, '_bx_eng_stg_cpt_type', 'modules/boonex/english/|std-mi.png', 2);
 SET @iTypeId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options_categories`(`type_id`, `name`, `caption`, `order`) VALUES 
-(@iTypeId, CONCAT(@sModuleName, '_system'), '_bx_eng_stg_cpt_category_system', 1);
+(@iTypeId, CONCAT(@sName, '_system'), '_bx_eng_stg_cpt_category_system', 1);
 SET @iCategoryId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, CONCAT(@sModuleName, '_switcher_title'), 'Name In Language Switcher', 'English', 'digit', '', '', '', 1);
+(@iCategoryId, CONCAT(@sName, '_switcher_title'), 'Name In Language Switcher', 'English', 'digit', '', '', '', 1);

trunk/modules/boonex/english/install/sql/uninstall.sql

@@ -2 +2 @@
 -- General section.
 --
-SET @sModuleName = 'bx_lang_en';
+SET @sName = 'bx_en';
 
 DELETE FROM `tll`, `tls`
-USING `sys_localization_languages` AS `tll`, `sys_localization_strings` AS `tls`
-WHERE `tll`.`ID`=`tls`.`IDLanguage` AND `tll`.`Name`='en';
+USING `sys_localization_languages` AS `tll` LEFT JOIN `sys_localization_strings` AS `tls` ON `tll`.`ID`=`tls`.`IDLanguage`
+WHERE `tll`.`Name`='en';
 
 
@@ -14 +14 @@
 DELETE FROM `tp`, `tw`, `tpw`
 USING `sys_std_pages` AS `tp`, `sys_std_widgets` AS `tw`, `sys_std_pages_widgets` AS `tpw`
-WHERE `tp`.`id`=`tw`.`page_id` AND `tw`.`id`=`tpw`.`widget_id` AND `tp`.`name`=@sModuleName;
+WHERE `tp`.`id`=`tw`.`page_id` AND `tw`.`id`=`tpw`.`widget_id` AND `tp`.`name`=@sName;
 
 
@@ -22 +22 @@
 DELETE FROM `tot`, `toc`, `to` 
 USING `sys_options_types` AS `tot`, `sys_options_categories` AS `toc`, `sys_options` AS `to` 
-WHERE `tot`.`id`=`toc`.`type_id` AND `toc`.`id`=`to`.`category_id` AND `tot`.`name`=@sModuleName;
+WHERE `tot`.`id`=`toc`.`type_id` AND `toc`.`id`=`to`.`category_id` AND `tot`.`name`=@sName;

trunk/modules/boonex/russian/install/sql/uninstall.sql

@@ -5 +5 @@
 
 DELETE FROM `tll`, `tls`
-USING `sys_localization_languages` AS `tll`, `sys_localization_strings` AS `tls`
-WHERE `tll`.`ID`=`tls`.`IDLanguage` AND `tll`.`Name`='ru';
+USING `sys_localization_languages` AS `tll` LEFT JOIN `sys_localization_strings` AS `tls` ON `tll`.`ID`=`tls`.`IDLanguage`
+WHERE `tll`.`Name`='ru';