Changeset 15866 for trunk

Timestamp:

01/10/12 22:34:10 (5 months ago)

Author:

Alexander Trofimov

Message:

Groups - new menu was added

Location:

trunk/modules/boonex/groups

Files:

• classes/BxGroupsPageMain.php (modified) (1 diff)
• classes/BxGroupsTemplate.php (modified) (1 diff)
• install/langs/en.xml (modified) (1 diff)
• install/sql/disable.sql (modified) (1 diff)
• install/sql/enable.sql (modified) (1 diff)
• install/sql/install.sql (modified) (1 diff)
• install/sql/uninstall.sql (modified) (1 diff)

trunk/modules/boonex/groups/classes/BxGroupsPageMain.php

@@ -63 +63 @@
         return $this->ajaxBrowse('recent', $this->oDb->getParam('bx_groups_perpage_main_recent'));
     }
+
+    function getBlockCode_Menu() {
+        bx_import('BxTemplMenu');
+        $oMenu = BxTemplMenu::getObjectInstance('bx_groups');
+        return $oMenu ? $oMenu->getCode () : '';
+    }
 }
 

trunk/modules/boonex/groups/classes/BxGroupsTemplate.php

@@ -34 +34 @@
     function BxGroupsTemplate(&$oConfig, &$oDb) {
         parent::BxDolTwigTemplate($oConfig, $oDb);
+        bx_import('BxDolMenu');
+        BxDolMenu::setSelected ('bx_groups', 'groups'); 
     }
 

trunk/modules/boonex/groups/install/langs/en.xml

@@ -225 +225 @@
     <string name="_mma_groups_approve_groups"><![CDATA[groups approve groups]]></string>
     <string name="_mma_groups_broadcast_message"><![CDATA[groups broadcast message]]></string>
+    <string name="_bx_groups_menu_title_main"><![CDATA[Groups Navigation]]></string>
+    <string name="_bx_groups_menu_set_title_main"><![CDATA[Groups Items]]></string>
+    <string name="_bx_groups_menu_title_group_view"><![CDATA[Group View Navigation]]></string>
+    <string name="_bx_groups_menu_set_title_group_view"><![CDATA[Group View Items]]></string>
 </resources>

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

@@ -24 +24 @@
 DELETE FROM `sys_email_templates` WHERE `Name` = 'bx_groups_broadcast' OR `Name` = 'bx_groups_join_request' OR `Name` = 'bx_groups_join_reject' OR `Name` = 'bx_groups_join_confirm' OR `Name` = 'bx_groups_fan_remove' OR `Name` = 'bx_groups_fan_become_admin' OR `Name` = 'bx_groups_admin_become_fan' OR `Name` = 'bx_groups_sbs' OR `Name` = 'bx_groups_invitation';
 
--- top menu
-SET @iCatRoot := (SELECT `ID` FROM `sys_menu_top` WHERE `Name` = 'Groups' AND `Parent` = 0 LIMIT 1);
-DELETE FROM `sys_menu_top` WHERE `Parent` = @iCatRoot;
-DELETE FROM `sys_menu_top` WHERE `ID` = @iCatRoot;
-
-SET @iCatRoot := (SELECT `ID` FROM `sys_menu_top` WHERE `Name` = 'Groups' AND `Parent` = 0 LIMIT 1);
-DELETE FROM `sys_menu_top` WHERE `Parent` = @iCatRoot;
-DELETE FROM `sys_menu_top` WHERE `ID` = @iCatRoot;
+-- menus
+DELETE FROM `sys_objects_menu` WHERE `module` = 'bx_groups';
+DELETE FROM `sys_menu_sets` WHERE `module` = 'bx_groups';
+DELETE FROM `sys_menu_items` WHERE `module` = 'bx_groups';
 
 -- settings

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

@@ -84 +84 @@
     ('{evalResult}', 'modules/boonex/groups/|groups.png', '{BaseUri}', '', 'return $GLOBALS[''logged''][''member''] || $GLOBALS[''logged''][''admin''] ? _t(''_bx_groups_action_groups_home'') : '''';', '2', 'bx_groups_title');
     
--- top menu 
-INSERT INTO `sys_menu_top`(`ID`, `Parent`, `Name`, `Caption`, `Link`, `Order`, `Visible`, `Target`, `Onclick`, `Check`, `Editable`, `Deletable`, `Active`, `Type`, `Picture`, `Icon`, `BQuickLink`, `Statistics`) VALUES
-(NULL, 0, 'Groups', '_bx_groups_menu_root', 'modules/?r=groups/view/|modules/?r=groups/broadcast/|modules/?r=groups/invite/|modules/?r=groups/edit/|forum/groups/', '', 'non,memb', '', '', '', 1, 1, 1, 'system', 'modules/boonex/groups/|bx_groups.png', '', '0', '');
-SET @iCatRoot := LAST_INSERT_ID();
-INSERT INTO `sys_menu_top`(`ID`, `Parent`, `Name`, `Caption`, `Link`, `Order`, `Visible`, `Target`, `Onclick`, `Check`, `Editable`, `Deletable`, `Active`, `Type`, `Picture`, `Icon`, `BQuickLink`, `Statistics`) VALUES
-(NULL, @iCatRoot, 'Group View', '_bx_groups_menu_view_group', 'modules/?r=groups/view/{bx_groups_view_uri}', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Group View Forum', '_bx_groups_menu_view_forum', 'forum/groups/forum/{bx_groups_view_uri}-0.htm|forum/groups/', 1, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Group View Fans', '_bx_groups_menu_view_fans', 'modules/?r=groups/browse_fans/{bx_groups_view_uri}', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Group View Comments', '_bx_groups_menu_view_comments', 'modules/?r=groups/comments/{bx_groups_view_uri}', 3, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, '');
-
-
-SET @iMaxMenuOrder := (SELECT `Order` + 1 FROM `sys_menu_top` WHERE `Parent` = 0 ORDER BY `Order` DESC LIMIT 1);
-INSERT INTO `sys_menu_top`(`ID`, `Parent`, `Name`, `Caption`, `Link`, `Order`, `Visible`, `Target`, `Onclick`, `Check`, `Editable`, `Deletable`, `Active`, `Type`, `Picture`, `Icon`, `BQuickLink`, `Statistics`) VALUES
-(NULL, 0, 'Groups', '_bx_groups_menu_root', 'modules/?r=groups/home/|modules/?r=groups/', @iMaxMenuOrder, 'non,memb', '', '', '', 1, 1, 1, 'top', 'modules/boonex/groups/|bx_groups.png', '', 1, '');
-SET @iCatRoot := LAST_INSERT_ID();
-INSERT INTO `sys_menu_top`(`ID`, `Parent`, `Name`, `Caption`, `Link`, `Order`, `Visible`, `Target`, `Onclick`, `Check`, `Editable`, `Deletable`, `Active`, `Type`, `Picture`, `Icon`, `BQuickLink`, `Statistics`) VALUES
-(NULL, @iCatRoot, 'Groups Main Page', '_bx_groups_menu_main', 'modules/?r=groups/home/', 0, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Recent Groups', '_bx_groups_menu_recent', 'modules/?r=groups/browse/recent', 2, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Top Rated Groups', '_bx_groups_menu_top_rated', 'modules/?r=groups/browse/top', 3, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Popular Groups', '_bx_groups_menu_popular', 'modules/?r=groups/browse/popular', 4, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Featured Groups', '_bx_groups_menu_featured', 'modules/?r=groups/browse/featured', 5, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Groups Tags', '_bx_groups_menu_tags', 'modules/?r=groups/tags', 8, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, 'bx_groups'),
-(NULL, @iCatRoot, 'Groups Categories', '_bx_groups_menu_categories', 'modules/?r=groups/categories', 9, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, 'bx_groups'),
-(NULL, @iCatRoot, 'Calendar', '_bx_groups_menu_calendar', 'modules/?r=groups/calendar', 10, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, ''),
-(NULL, @iCatRoot, 'Search', '_bx_groups_menu_search', 'modules/?r=groups/search', 11, 'non,memb', '', '', '', 1, 1, 1, 'custom', 'modules/boonex/groups/|bx_groups.png', '', 0, '');
+
+-- site menu 
+
+SET @iMenuSiteMaxOrder := (SELECT MAX(`order`) FROM `sys_menu_items` WHERE `set_name` = 'sys_site');
+INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title`, `link`, `onclick`, `target`, `icon`, `hidden_for_levels`, `active`, `order`) VALUES
+('sys_site', 'bx_groups', 'groups', '_bx_groups_menu_root', 'modules/?r=groups/home/', '', '', '', 0, 1, @iMenuSiteMaxOrder + 1);
+
+-- groups menu 
+
+INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deleteable`, `active`, `override_class_name`, `override_class_file`) VALUES
+('bx_groups', '_bx_groups_menu_title_main', 'bx_groups', 'bx_groups', 1, 0, 1, '', '');
+
+INSERT INTO `sys_menu_sets` (`set_name`, `module`, `title`, `deletable`) VALUES
+('bx_groups', 'bx_groups', '_bx_groups_menu_set_title_main', 0);
+
+INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title`, `link`, `onclick`, `target`, `icon`, `hidden_for_levels`, `active`, `order`) VALUES
+('bx_groups', 'bx_groups', 'main_page', '_bx_groups_menu_main', 'modules/?r=groups/home/', '', '', '', 0, 1, 1),
+('bx_groups', 'bx_groups', 'recent', '_bx_groups_menu_recent', 'modules/?r=groups/browse/recent', '', '', '', 0, 1, 2),
+('bx_groups', 'bx_groups', 'top_rated', '_bx_groups_menu_top_rated', 'modules/?r=groups/browse/top', '', '', '', 0, 1, 3),
+('bx_groups', 'bx_groups', 'popular', '_bx_groups_menu_popular', 'modules/?r=groups/browse/popular', '', '', '', 0, 1, 4),
+('bx_groups', 'bx_groups', 'featured', '_bx_groups_menu_featured', 'modules/?r=groups/browse/featured', '', '', '', 0, 1, 5),
+('bx_groups', 'bx_groups', 'tags', '_bx_groups_menu_tags', 'modules/?r=groups/tags', '', '', '', 0, 1, 6),
+('bx_groups', 'bx_groups', 'categories', '_bx_groups_menu_categories', 'modules/?r=groups/categories', '', '', '', 0, 1, 7),
+('bx_groups', 'bx_groups', 'calendar', '_bx_groups_menu_calendar', 'modules/?r=groups/calendar', '', '', '', 0, 1, 8),
+('bx_groups', 'bx_groups', 'search', '_bx_groups_menu_search', 'modules/?r=groups/search', '', '', '', 0, 1, 9);
+
+-- group view menu 
+
+INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deleteable`, `active`, `override_class_name`, `override_cla
+ss_file`) VALUES
+('bx_groups_vew', '_bx_groups_menu_title_group_view', 'bx_groups_vew', 'bx_groups', 1, 0, 1, '', '');
+
+INSERT INTO `sys_menu_sets` (`set_name`, `module`, `title`, `deletable`) VALUES
+('bx_groups_vew', 'bx_groups', '_bx_groups_menu_set_title_group_view', 0);
+
+INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title`, `link`, `onclick`, `target`, `icon`, `hidden_for_levels`, `active`, `order`) VALUES
+('bx_groups_view', 'bx_groups', 'view', '_bx_groups_menu_view_group', 'modules/?r=groups/view/{bx_groups_view_uri}', '', '', '', 0, 1, 1),
+('bx_groups_view', 'bx_groups', 'view_forum', '_bx_groups_menu_view_forum', 'forum/groups/forum/{bx_groups_view_uri}-0.htm', '', '', '', 0, 1, 2),
+('bx_groups_view', 'bx_groups', 'view_fans', '_bx_groups_menu_view_fans', 'modules/?r=groups/browse_fans/{bx_groups_view_uri}', '', '', '', 0, 1, 3),
+('bx_groups_view', 'bx_groups', 'view_comments', '_bx_groups_menu_view_comments', 'modules/?r=groups/comments/{bx_groups_view_uri}', '', '', '', 0, 1, 4);
+
 
 -- site stats
+
 INSERT INTO `sys_stat_site` VALUES(NULL, 'bx_groups', 'bx_groups', 'modules/?r=groups/', 'SELECT COUNT(`id`) FROM `[db_prefix]main` WHERE `status` = ''approved''', '../modules/?r=groups/administration', 'SELECT COUNT(`id`) FROM `[db_prefix]main` WHERE `status` != ''approved''', 'modules/boonex/groups/|groups.png', 0);
 

trunk/modules/boonex/groups/install/sql/install.sql

@@ -156 +156 @@
 ('Other', '0', 'bx_groups', '0', 'active');
 
-    
--- admin menu
--- SET @iMax = (SELECT MAX(`order`) FROM `sys_menu_admin` WHERE `parent_id` = '2');
--- INSERT IGNORE INTO `sys_menu_admin` (`parent_id`, `name`, `title`, `url`, `description`, `icon`, `order`) VALUES
--- (2, 'bx_groups', '_bx_groups', '{siteUrl}modules/?r=groups/administration/', 'Groups module by BoonEx','modules/boonex/groups/|groups.png', @iMax+1);
-
-
 -- subscriptions
 INSERT INTO `sys_sbs_types` (`unit`, `action`, `template`, `params`) VALUES

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

@@ -22 +22 @@
 DELETE FROM `sys_tags` WHERE `Type` = 'bx_groups';
 
--- admin menu
--- DELETE FROM `sys_menu_admin` WHERE `name` = 'bx_groups';
-
 -- subscriptions
 DELETE FROM `sys_sbs_entries` USING `sys_sbs_types`, `sys_sbs_entries` WHERE `sys_sbs_types`.`id`=`sys_sbs_entries`.`subscription_id` AND `sys_sbs_types`.`unit`='bx_groups';