Changeset 3917 for trunk/bp-activity/bp-activity-loader.php

Timestamp:

01/25/2011 08:58:56 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename new 'bp-users' component to 'bp-members' for consistency through-out project.
Core, Messages, and Friends Components now use the BP_Component class.
Split Friends and Messages components into smaller files.
Change references to 'profile' to 'xprofile' through-out project for consistency.
Introduce 'bp_actions' and 'bp_screens' standard hooks to replace the usage of 'wp' through-out project.
Move component loader sequence into bp-core-bootstrap.php,
Move old root_component action into 1.3 deprecated file.

File:

• trunk/bp-activity/bp-activity-loader.php (modified) (11 diffs)

trunk/bp-activity/bp-activity-loader.php

@@ -18 +18 @@
      */
     function BP_Activity_Component() {
-        parent::start( 'activity', __( 'Activity Streams', 'buddypress' ) );
+        parent::start(
+            'activity',
+            __( 'Activity Streams', 'buddypress' ),
+            BP_PLUGIN_DIR
+        );
+    }
+
+    /**
+     * Include files
+     */
+    function _includes() {
+        // Files to include
+        $includes = array(
+            'actions',
+            'screens',
+            'filters',
+            'classes',
+            'template',
+            'functions',
+            'notifications',
+        );
+
+        parent::_includes( $includes );
     }
 
@@ -37 +59 @@
             define( 'BP_ACTIVITY_SLUG', $this->id );
 
-        // Do some slug checks
-        $this->slug      = BP_ACTIVITY_SLUG;
-        $this->root_slug = isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : $this->slug;
-
-        // Tables
-        $this->table_name      = $bp->table_prefix . 'bp_activity';
-        $this->table_name_meta = $bp->table_prefix . 'bp_activity_meta';
-        
-        // Register this in the active components array
-        $bp->active_components[$this->id] = $this->id;
-
-        // The default text for the blogs directory search box
-        $bp->default_search_strings[$this->id] = __( 'Search Activity...', 'buddypress' );      
-    }
-
-    /**
-     * Include files
-     */
-    function _includes() {
-        require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-actions.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-screens.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-classes.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-template.php'  );
-        require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-functions.php' );
+        // Global tables for messaging component
+        $global_tables = array(
+            'table_name'      => $bp->table_prefix . 'bp_activity',
+            'table_name_meta' => $bp->table_prefix . 'bp_activity_meta',
+        );
+
+        // All globals for messaging component.
+        // Note that global_tables is included in this array.
+        $globals = array(
+            'path'                  => BP_PLUGIN_DIR,
+            'slug'                  => BP_ACTIVITY_SLUG,
+            'root_slug'             => isset( $bp->pages->activity->slug ) ? $bp->pages->activity->slug : BP_ACTIVITY_SLUG,
+            'search_string'         => __( 'Search Activity...', 'buddypress' ),
+            'global_tables'         => $global_tables,
+        );
+
+        parent::_setup_globals( $globals );
     }
 
@@ -73 +87 @@
 
         // Add 'Activity' to the main navigation
-        bp_core_new_nav_item( array(
+        $main_nav = array(
             'name'                => __( 'Activity', 'buddypress' ),
             'slug'                => $this->slug,
@@ -79 +93 @@
             'screen_function'     => 'bp_activity_screen_my_activity',
             'default_subnav_slug' => 'just-me',
-            'item_css_id'         => $this->id )
+            'item_css_id'         => $this->id
         );
 
@@ -101 +115 @@
 
         // Add the subnav items to the activity nav item if we are using a theme that supports this
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Personal', 'buddypress' ),
             'slug'            => 'just-me',
@@ -108 +122 @@
             'screen_function' => 'bp_activity_screen_my_activity',
             'position'        => 10
-        ) );
+        );
 
         // Additional menu if friends is active
         if ( bp_is_active( 'friends' ) ) {
-            bp_core_new_subnav_item( array(
+            $sub_nav[] = array(
                 'name'            => __( 'Friends', 'buddypress' ),
                 'slug'            => $bp->friends->slug,
@@ -120 +134 @@
                 'position'        => 20,
                 'item_css_id'     => 'activity-friends'
-            ) );
+            ) ;
         }
 
         // Additional menu if groups is active
         if ( bp_is_active( 'groups' ) ) {
-            bp_core_new_subnav_item( array(
+            $sub_nav[] = array(
                 'name'            => __( 'Groups', 'buddypress' ),
                 'slug'            => $bp->groups->slug,
@@ -133 +147 @@
                 'position'        => 30,
                 'item_css_id'     => 'activity-groups'
-            ) );
+            );
         }
 
         // Favorite activity items
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Favorites', 'buddypress' ),
             'slug'            => 'favorites',
@@ -145 +159 @@
             'position'        => 40,
             'item_css_id'     => 'activity-favs'
-        ) );
+        );
 
         // @ mentions
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => sprintf( __( '@%s Mentions', 'buddypress' ), $user_login ),
             'slug'            => 'mentions',
@@ -156 +170 @@
             'position'        => 50,
             'item_css_id'     => 'activity-mentions'
-        ) );
+        );
+
+        parent::_setup_nav( $main_nav, $sub_nav );
+    }
+
+    /**
+     * Sets up the title for pages and <title>
+     *
+     * @global obj $bp
+     */
+    function _setup_title() {
+        global $bp;
 
         // Adjust title based on view
@@ -170 +195 @@
             }
         }
+
+        parent::_setup_title();
     }
 }