Ticket #6008: 6008.03.patch

src/bp-blogs/bp-blogs-template.php

@@ -1467 +1467 @@
                         'component'  => 'blogs',
                         'link_text'  => __( 'Create a Site', 'buddypress' ),
                         'link_title' => __( 'Create a Site', 'buddypress' ),
-                        'link_class' => 'button blog-create bp-title-button',
+                        'link_class' => 'blog-create no-ajax',
                         'link_href'  => trailingslashit( bp_get_root_domain() ) . trailingslashit( bp_get_blogs_root_slug() ) . trailingslashit( 'create' ),
                         'wrapper'    => false,
                 );
@@ -1483 +1483 @@
         }
 
 /**
+ * Output the Create a Site nav item.
+ *
+ * @since BuddyPress (2.2.0)
+ */
+function bp_blog_create_nav_item() {
+        echo bp_get_blog_create_nav_item();
+}
+
+        /**
+         * Get the Create a Site nav item.
+         *
+         * @since BuddyPress (2.2.0)
+         *
+         * @return string
+         */
+        function bp_get_blog_create_nav_item() {
+                // Get the create a site button
+                $create_blog_button = bp_get_blog_create_button();
+
+                // Make sure the button is available
+                if ( empty( $create_blog_button ) ) {
+                        return;
+                }
+
+                $output = '<li id="blog-create-nav">' . $create_blog_button . '</li>';
+
+                return apply_filters( 'bp_get_blog_create_nav_item', $output );
+        }
+
+/**
+ * Checks if a specific theme is still filtering the Blogs directory title
+ * if so, transform the title button into a Blogs directory nav item.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @uses   bp_blog_create_nav_item() to output the Create a Site nav item
+ * @return string HTML Output
+ */
+function bp_blog_backcompat_create_nav_item() {
+        // Bail if Blogs nav item is already used by bp-legacy
+        if ( has_action( 'bp_blogs_directory_blog_types', 'bp_legacy_theme_blog_create_nav', 999 ) ) {
+                return;
+        }
+
+        // Bail if the theme is not filtering the Blogs directory title
+        if ( ! has_filter( 'bp_blogs_directory_header' ) ) {
+                return;
+        }
+
+        bp_blog_create_nav_item();
+}
+add_action( 'bp_blogs_directory_blog_types', 'bp_blog_backcompat_create_nav_item', 1000 );
+
+/**
  * Output button for visiting a blog in a loop.
  *
  * @see bp_get_blogs_visit_blog_button() for description of arguments.

src/bp-groups/bp-groups-template.php

@@ -2850 +2850 @@
                         'component'  => 'groups',
                         'link_text'  => __( 'Create a Group', 'buddypress' ),
                         'link_title' => __( 'Create a Group', 'buddypress' ),
-                        'link_class' => 'button group-create bp-title-button',
+                        'link_class' => 'group-create no-ajax',
                         'link_href'  => trailingslashit( bp_get_root_domain() ) . trailingslashit( bp_get_groups_root_slug() ) . trailingslashit( 'create' ),
                         'wrapper'    => false,
                 );
@@ -2859 +2859 @@
         }
 
 /**
+ * Output the Create a Group nav item.
+ *
+ * @since BuddyPress (2.2.0)
+ */
+function bp_group_create_nav_item() {
+        echo bp_get_group_create_nav_item();
+}
+
+        /**
+         * Get the Create a Group nav item.
+         *
+         * @since BuddyPress (2.2.0)
+         *
+         * @return string
+         */
+        function bp_get_group_create_nav_item() {
+                // Get the create a group button
+                $create_group_button = bp_get_group_create_button();
+
+                // Make sure the button is available
+                if ( empty( $create_group_button ) ) {
+                        return;
+                }
+
+                $output = '<li id="group-create-nav">' . $create_group_button . '</li>';
+
+                return apply_filters( 'bp_get_group_create_nav_item', $output );
+        }
+
+/**
+ * Checks if a specific theme is still filtering the Groups directory title
+ * if so, transform the title button into a Groups directory nav item.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @uses   bp_group_create_nav_item() to output the create a Group nav item
+ * @return string HTML Output
+ */
+function bp_group_backcompat_create_nav_item() {
+        // Bail if the Groups nav item is already used by bp-legacy
+        if ( has_action( 'bp_groups_directory_group_filter', 'bp_legacy_theme_group_create_nav', 999 ) ) {
+                return;
+        }
+
+        // Bail if the theme is not filtering the Groups directory title
+        if ( ! has_filter( 'bp_groups_directory_header' ) ) {
+                return;
+        }
+
+        bp_group_create_nav_item();
+}
+add_action( 'bp_groups_directory_group_filter', 'bp_group_backcompat_create_nav_item', 1000 );
+
+/**
  * Prints a message if the group is not visible to the current user (it is a
  * hidden or private group, and the user does not have access).
  *

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -108 +108 @@
 
                         // Group buttons
                         if ( bp_is_active( 'groups' ) ) {
-                                add_action( 'bp_group_header_actions',     'bp_group_join_button',           5 );
-                                add_action( 'bp_group_header_actions',     'bp_group_new_topic_button',      20 );
-                                add_action( 'bp_directory_groups_actions', 'bp_group_join_button' );
-                                add_filter( 'bp_groups_directory_header',  'bp_legacy_theme_group_create_button' );
-                                add_filter( 'bp_blogs_directory_header',   'bp_legacy_theme_blog_create_button' );
+                                add_action( 'bp_group_header_actions',          'bp_group_join_button',               5 );
+                                add_action( 'bp_group_header_actions',          'bp_group_new_topic_button',         20 );
+                                add_action( 'bp_directory_groups_actions',      'bp_group_join_button'                  );
+                                add_action( 'bp_groups_directory_group_filter', 'bp_legacy_theme_group_create_nav', 999 );
                         }
 
                         // Blog button
-                        if ( bp_is_active( 'blogs' ) )
-                                add_action( 'bp_directory_blogs_actions',  'bp_blogs_visit_blog_button' );
+                        if ( bp_is_active( 'blogs' ) ) {
+                                add_action( 'bp_directory_blogs_actions',    'bp_blogs_visit_blog_button'           );
+                                add_action( 'bp_blogs_directory_blog_types', 'bp_legacy_theme_blog_create_nav', 999 );
+                        }
+
 
                 }
 
@@ -449 +451 @@
  * the behavior of bp-default.
  *
  * @since BuddyPress (2.0.0)
+ * @todo Deprecate
  *
  * @param string $title Groups directory title.
  * @return string
@@ -458 +461 @@
 }
 
 /**
+ * Add the Create a Group nav to the Groups directory navigation.
+ *
+ * bp-legacy puts the Create a Group nav at the last position of
+ * the Groups directory navigation.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @uses   bp_group_create_nav_item() to output the create a Group nav item
+ * @return string
+ */
+function bp_legacy_theme_group_create_nav() {
+        bp_group_create_nav_item();
+}
+
+/**
  * Add the Create a Site button to the Sites directory title.
  *
  * bp-legacy puts the Create a Site button into the page title, to mimic
  * the behavior of bp-default.
  *
  * @since BuddyPress (2.0.0)
+ * @todo Deprecate
  *
  * @param string $title Sites directory title.
  * @return string
@@ -471 +490 @@
 function bp_legacy_theme_blog_create_button( $title ) {
         return $title . ' ' . bp_get_blog_create_button();
 }
+
+/**
+ * Add the Create a Site nav to the Sites directory navigation.
+ *
+ * bp-legacy puts the Create a Site nav at the last position of
+ * the Sites directory navigation.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @uses   bp_blog_create_nav_item() to output the Create a Site nav item
+ * @return string
+ */
+function bp_legacy_theme_blog_create_nav() {
+        bp_blog_create_nav_item();
+}
+
 /**
  * This function looks scarier than it actually is. :)
  * Each object loop (activity/members/groups/blogs/forums) contains default

src/bp-templates/bp-legacy/js/buddypress.js

@@ -835 +835 @@
 
         /* When a navigation tab is clicked - e.g. | All Groups | My Groups | */
         jq('div.item-list-tabs').on( 'click', function(event) {
-                if ( jq(this).hasClass('no-ajax') )  {
+                if ( jq(this).hasClass('no-ajax')  || jq( event.target ).hasClass('no-ajax') )  {
                         return;
                 }