Ticket #6008: 6008.02.patch

src/bp-blogs/bp-blogs-screens.php

@@ -141 +141 @@
          */
         public function directory_dummy_post() {
 
-                $title = apply_filters( 'bp_blogs_directory_header', __( 'Sites', 'buddypress' ) );
-
                 bp_theme_compat_reset_post( array(
                         'ID'             => 0,
-                        'post_title'     => $title,
+                        'post_title'     => __( 'Sites', 'buddypress' ),
                         'post_author'    => 0,
                         'post_date'      => 0,
                         'post_content'   => '',
@@ -201 +199 @@
 
                 // Title based on ability to create blogs
                 if ( is_user_logged_in() && bp_blog_signup_enabled() ) {
-                        $title = '<a class="button bp-title-button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '">' . __( 'Sites', 'buddypress' ) . '</a>&nbsp;' . __( 'Create a Site', 'buddypress' );
+                        $title = __( 'Create a Site', 'buddypress' );
                 } else {
                         $title = __( 'Sites', 'buddypress' );
                 }

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

@@ -1215 +1215 @@
                         '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,
                 );
@@ -1326 +1326 @@
         // Filter and return
         return apply_filters( 'bp_blogs_get_profile_stats', $r['output'], $r );
 }
+
+/**
+ * Checks if a specific theme is still filtering the Blogs directory title
+ * if so, move it into the Blogs directory item tabs
+ *
+ * @since BuddyPress (?)
+ *
+ * @return string HTML Output
+ */
+function bp_blogs_backcompat_create_blog() {
+        // Bail if bp-legacy is in use
+        if ( did_action( 'bp_blogs_directory_blog_types', 'bp_legacy_theme_blog_create_button', 999 ) ) {
+                return;
+        }
+
+        // Get the button if the specific theme is still filtering the Blogs directory title
+        $create_blog_button = trim( apply_filters( 'bp_blogs_directory_header', '' ) );
+
+        if ( empty( $create_blog_button ) ) {
+                return;
+        }
+        ?>
+        <li id="blog-create-button"><?php echo $create_blog_button ;?></li>
+        <?php
+}
+add_action( 'bp_blogs_directory_blog_types', 'bp_blogs_backcompat_create_blog', 1000 );

src/bp-groups/bp-groups-screens.php

@@ -1099 +1099 @@
          * @since BuddyPress (1.7.0)
          */
         public function directory_dummy_post() {
-
-                $title = apply_filters( 'bp_groups_directory_header', bp_get_directory_title( 'groups' ) );
-
                 bp_theme_compat_reset_post( array(
                         'ID'             => 0,
-                        'post_title'     => $title,
+                        'post_title'     => bp_get_directory_title( 'groups' ),
                         'post_author'    => 0,
                         'post_date'      => 0,
                         'post_content'   => '',
@@ -1222 +1219 @@
         public function single_dummy_post() {
                 bp_theme_compat_reset_post( array(
                         'ID'             => 0,
-                        'post_title'     => '<a href="' . bp_get_group_permalink( groups_get_current_group() ) . '">' . bp_get_current_group_name() . '</a>',
+                        'post_title'     => bp_get_current_group_name(),
                         'post_author'    => 0,
                         'post_date'      => 0,
                         'post_content'   => '',

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,
                 );
@@ -4778 +4778 @@
         // Filter and return
         return apply_filters( 'bp_groups_get_profile_stats', $r['output'], $r );
 }
+
+/**
+ * Checks if a specific theme is still filtering the Groups directory title
+ * if so, move it into the Groups directory item tabs
+ *
+ * @since BuddyPress (?)
+ *
+ * @return string HTML Output
+ */
+function bp_groups_backcompat_create_group() {
+        // Bail if bp-legacy is in use
+        if ( did_action( 'bp_groups_directory_group_filter', 'bp_legacy_theme_group_create_button', 999 ) ) {
+                return;
+        }
+
+        // Get the button if the specific theme is still filtering the Groups directory title
+        $create_group_button = trim( apply_filters( 'bp_groups_directory_header', '' ) );
+
+        if ( empty( $create_group_button ) ) {
+                return;
+        }
+        ?>
+        <li id="group-create-button"><?php echo $create_group_button ;?></li>
+        <?php
+}
+add_action( 'bp_groups_directory_group_filter', 'bp_groups_backcompat_create_group', 1000 );

src/bp-members/bp-members-screens.php

@@ -235 +235 @@
 
         // grab the key (the old way)
         $key = isset( $_GET['key'] ) ? $_GET['key'] : '';
-  
+
         // grab the key (the new way)
         if ( empty( $key ) ) {
                 $key = bp_current_action();
@@ -245 +245 @@
         if ( empty( $key ) ) {
                 return;
         }
-  
+
         // Activate the signup
         $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
 
@@ -425 +425 @@
         public function single_dummy_post() {
                 bp_theme_compat_reset_post( array(
                         'ID'             => 0,
-                        'post_title'     => '<a href="' . bp_get_displayed_user_link() . '">' . bp_get_displayed_user_fullname() . '</a>',
+                        'post_title'     => bp_get_displayed_user_fullname(),
                         'post_author'    => 0,
                         'post_date'      => 0,
                         'post_content'   => '',

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_button', 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_blogs_directory_blog_types', 'bp_legacy_theme_blog_create_button', 999 );
+                                add_action( 'bp_directory_blogs_actions',    'bp_blogs_visit_blog_button'              );
+                        }
 
                 }
 
@@ -443 +444 @@
 endif;
 
 /**
- * Add the Create a Group button to the Groups directory title.
+ * Add the Create a Group button to the Groups directory item tabs.
  *
- * bp-legacy puts the Create a Group button into the page title, to mimic
- * the behavior of bp-default.
+ * bp-legacy puts the Create a Group button into the directory item tabs
+ * to avoid adding extra html to the title of the page
  *
  * @since BuddyPress (2.0.0)
  *
- * @param string $title Groups directory title.
  * @return string
  */
-function bp_legacy_theme_group_create_button( $title ) {
-        return $title . ' ' . bp_get_group_create_button();
+function bp_legacy_theme_group_create_button() {
+        $create_group_button = bp_get_group_create_button();
+
+        if ( empty( $create_group_button ) ) {
+                return;
+        }
+        ?>
+        <li id="group-create-button"><?php echo $create_group_button ;?></li>
+        <?php
 }
 
 /**
- * Add the Create a Site button to the Sites directory title.
+ * Add the Create a Site button to the Sites directory item tabs.
  *
- * bp-legacy puts the Create a Site button into the page title, to mimic
- * the behavior of bp-default.
+ * bp-legacy puts the Create a Site button into the directory item tabs
+ * to avoid adding extra html to the title of the page
  *
  * @since BuddyPress (2.0.0)
  *
- * @param string $title Sites directory title.
  * @return string
  */
-function bp_legacy_theme_blog_create_button( $title ) {
-        return $title . ' ' . bp_get_blog_create_button();
+function bp_legacy_theme_blog_create_button() {
+        $create_blog_button = bp_get_blog_create_button();
+
+        if ( empty( $create_blog_button ) ) {
+                return;
+        }
+        ?>
+        <li id="blog-create-button"><?php echo $create_blog_button ;?></li>
+        <?php
 }
 /**
  * This function looks scarier than it actually is. :)

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

@@ -764 +764 @@
 #buddypress input[type=reset],
 #buddypress ul.button-nav li a,
 #buddypress div.generic-button a,
-#buddypress .comment-reply-link,
-a.bp-title-button {
+#buddypress .comment-reply-link {
         background: #fff; /* Old browsers */
         border: 1px solid #ccc;
         color: #777;
@@ -776 +775 @@
         text-align: center;
         text-decoration: none;
 }
+
 #buddypress button:hover,
 #buddypress a.button:hover,
 #buddypress a.button:focus,
@@ -1315 +1315 @@
         float: right;
         margin: 7px 0 0;
 }
+#buddypress div.item-list-tabs ul li#group-create-button,
+#buddypress div.item-list-tabs ul li#blog-create-button {
+        margin:0;
+}
 #buddypress div.item-list-tabs#subnav ul li.last {
         margin-top: 4px;
 }
@@ -1586 +1590 @@
                 margin-bottom: 1em;
                 width: 50%;
         }
-        a.bp-title-button {
-                margin-left: 10px;
-        }
         #buddypress form.standard-form .main-column div.action{
                 position: relative;
                 margin-bottom:1em;
@@ -1665 +1666 @@
         #buddypress li div.item{
                 margin-left: 45px;
         }
-        h1 a.bp-title-button {
-                clear: left;
-                float: left;
-                margin: 10px 0 20px;
-        }
 }

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;
                 }