Changeset 6676

Timestamp:

12/26/2012 03:47:11 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Admin Menus:

• Add missing separator if network activated.
• Experiment with moving top level menus out of limbo and into the "content" section of the $menus global.
• Add functions to activity and groups components to hook them into the relocated menu items array.
• Introduce functions to reorder top level component menu items accordingly (props bbPress.)

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-core/admin/bp-core-actions.php (modified) (2 diffs)
• bp-core/admin/bp-core-functions.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (1 diff)

trunk/bp-activity/bp-activity-admin.php

@@ -45 +45 @@
 }
 add_action( bp_core_admin_hook(), 'bp_activity_add_admin_menu' );
+
+/**
+ * Add activity component to custom menus array
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @param array $custom_menus
+ * @return array
+ */
+function bp_activity_admin_menu_order( $custom_menus = array() ) {
+    array_push( $custom_menus, 'bp-activity' );
+    return $custom_menus;
+}
+add_filter( 'bp_admin_menu_order', 'bp_activity_admin_menu_order' );
 
 /**

trunk/bp-core/admin/bp-core-actions.php

@@ -44 +44 @@
 add_action( 'admin_notices',           'bp_admin_notices'                 );
 add_action( 'admin_enqueue_scripts',   'bp_admin_enqueue_scripts'         );
+add_action( 'network_admin_menu',      'bp_admin_menu'                    );
+add_action( 'custom_menu_order',       'bp_admin_custom_menu_order'       );
+add_action( 'menu_order',              'bp_admin_menu_order'              );
 add_action( 'wpmu_new_blog',           'bp_new_site',               10, 6 );
 
@@ -53 +56 @@
 add_action( 'bp_admin_init', 'bp_do_activation_redirect', 1   );
 
-// Reset the menu order
-//add_action( 'bp_admin_menu', 'bp_admin_separator' );
+// Add a new separator
+add_action( 'bp_admin_menu', 'bp_admin_separator' );
 
 /**

trunk/bp-core/admin/bp-core-functions.php

@@ -361 +361 @@
     }
 }
+
+/** Separator *****************************************************************/
+
+/**
+ * Add a separator to the WordPress admin menus
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @uses bp_current_user_can() To check users capability on root blog
+ */
+function bp_admin_separator() {
+
+    // Prevent duplicate separators when no core menu items exist
+    if ( ! bp_current_user_can( 'bp_moderate' ) )
+        return;
+
+    global $menu;
+
+    $menu[] = array( '', 'read', 'separator-buddypress', '', 'wp-menu-separator buddypress' );
+}
+
+/**
+ * Tell WordPress we have a custom menu order
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @param bool $menu_order Menu order
+ * @uses bp_current_user_can() To check users capability on root blog
+ * @return bool Always true
+ */
+function bp_admin_custom_menu_order( $menu_order = false ) {
+
+    // Bail if user cannot see admin pages
+    if ( ! bp_current_user_can( 'bp_moderate' ) )
+        return $menu_order;
+
+    return $menu_order;
+}
+
+/**
+ * Move our custom separator above our custom post types
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @param array $menu_order Menu Order
+ * @uses bp_current_user_can() To check users capability on root blog
+ * @return array Modified menu order
+ */
+function bp_admin_menu_order( $menu_order = array() ) {
+
+    // Bail if user cannot see admin pages
+    if ( empty( $menu_order ) || ! bp_current_user_can( 'bp_moderate' ) )
+        return $menu_order;
+
+    // Initialize our custom order array
+    $bp_menu_order = array();
+
+    // Menu values
+    $last_sep     = is_network_admin() ? 'separator1' : 'separator2';
+
+    // Filter the custom admin menus
+    $custom_menus = (array) apply_filters( 'bp_admin_menu_order', array() );
+
+    // Add our separator to beginning of array
+    array_unshift( $custom_menus, 'separator-buddypress' );
+
+    // Loop through menu order and do some rearranging
+    foreach ( (array) $menu_order as $item ) {
+
+        // Position BuddyPress menus above appearance
+        if ( $last_sep == $item ) {
+
+            // Add our custom menus
+            foreach( (array) $custom_menus as $custom_menu ) {
+                if ( array_search( $custom_menu, $menu_order ) ) {
+                    $bp_menu_order[] = $custom_menu;
+                }
+            }
+
+            // Add the appearance separator
+            $bp_menu_order[] = $last_sep;
+
+        // Skip our menu items
+        } elseif ( ! in_array( $item, $custom_menus ) ) {
+            $bp_menu_order[] = $item;
+        }
+    }
+
+    // Return our custom order
+    return $bp_menu_order;
+}

trunk/bp-groups/bp-groups-admin.php

@@ -45 +45 @@
 }
 add_action( bp_core_admin_hook(), 'bp_groups_add_admin_menu' );
+
+/**
+ * Add groups component to custom menus array
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @param array $custom_menus
+ * @return array
+ */
+function bp_groups_admin_menu_order( $custom_menus = array() ) {
+    array_push( $custom_menus, 'bp-groups' );
+    return $custom_menus;
+}
+add_filter( 'bp_admin_menu_order', 'bp_groups_admin_menu_order' );
 
 /**