Ticket #174: bp-admin-bar-login-signup-v2.patch

bp-core/css/admin-bar.css

@@ -53 +53 @@
                         background: url( ../images/admin-menu-arrow.gif ) 88% 53% no-repeat;
                 }
 
+                #wp-admin-bar ul .bp-login { /* all list items */
+                        background: url( ../images/blogadmin_icon.gif ) 88% 53% no-repeat;
+                }
+
+                #wp-admin-bar .bp-signup {
+                        background: url( ../images/invite_bullet.gif ) 88% 53% no-repeat;
+                }               
+
                 #wp-admin-bar ul li ul a {
                         color: #666 !important;
                 }

bp-core/bp-core-adminbar.php

@@ -7 +7 @@
                 return false;
 
         echo '<div id="wp-admin-bar">';
-        echo '<a href="' . get_blog_option( 1, 'siteurl' ) . '"><img id="admin-bar-logo" src="' . site_url() . '/wp-content/mu-plugins/bp-core/images/admin_bar_logo.gif" alt="BuddyPress" /></a>';
+
+        // **** Do bp-adminbar-logo Actions ********
+        do_action('bp-adminbar-logo');
+
         echo '<ul class="main-nav">';
         
-        // **** "My Account" Menu ******
-        
+        // **** Do bp-adminbar-menus Actions ********
+        do_action('bp-adminbar-menus');
+
+        echo '</ul>';
+        echo '</div>';
+}
+
+// **** Default BuddyPress admin bar logo ********
+function bp_adminbar_logo() {
+        echo '<a href="' . get_blog_option( 1, 'siteurl' ) . '"><img id="admin-bar-logo" src="' . site_url() . '/wp-content/mu-plugins/bp-core/images/admin_bar_logo.gif" alt="BuddyPress" /></a>';
+}
+
+// **** "Log In" and "Sign Up" links (Visible when not logged in) ********
+function bp_adminbar_login_menu() {
+        if ( !is_user_logged_in() ) {   
+                echo '<li  class="bp-login"><a href="' . site_url() . '/wp-login.php?redirect_to=' . urlencode(get_bloginfo('siteurl') . $_SERVER['REQUEST_URI']) . '">' . __('Log In', 'buddypress') . '</a></li>';
+                // Show "Sign Up" link if registrations are allowed
+                if (get_site_option('registration') != 'none') {
+                        echo '<li class="bp-signup"><a href="' . site_url() . '/wp-signup.php">' . __('Sign Up', 'buddypress') . '</a></li>';
+                }
+        }
+}
+
+// **** "My Account" Menu ******
+function bp_adminbar_account_menu() {
         if ( is_user_logged_in() ) {
-        
+                global $bp;
+                
                 echo '<li><a href="">';
         
                 echo __('My Account', 'buddypress') . '</a>';
@@ -47 +74 @@
                 echo '</ul>';
                 echo '</li>';
         }
-        
-        // *** "My Blogs" Menu ********
-        
+}
+
+// *** "My Blogs" Menu ********
+function bp_adminbar_blogs_menu() {
         if ( is_user_logged_in() ) {
+                global $bp; 
                 if ( function_exists('bp_blogs_install') ) {
                         $blogs = BP_Blogs_Blog::get_blogs_for_user( $bp['loggedin_userid'] );
 
@@ -90 +119 @@
                         echo '</li>';
                 }
         }
-        
-        // **** "Notifications" Menu *********
-        
+}       
+
+// **** "Notifications" Menu *********
+function bp_adminbar_notifications_menu() {     
         if ( is_user_logged_in() ) {
+                global $bp;
                 echo '<li id="notifications_menu"><a href="' . $bp['loggedin_domain'] . '">';
                 _e('Notifications', 'buddypress');
         
@@ -117 +148 @@
                 echo '</ul>';
                 echo '</li>';
         }
-        
-        // **** "Blog Authors" Menu (visible when not logged in) ********
-        
+}
+
+// **** "Blog Authors" Menu (visible when not logged in) ********
+function bp_adminbar_authors_menu() {
+        global $current_blog;
         if ( $current_blog->blog_id > 1 ) {
                 $authors = get_users_of_blog(); 
         
@@ -146 +179 @@
                         echo '</li>';
                 }
         }
+}
         
-        // **** "Random" Menu (visible when not logged in) ********
-        ?>
+// **** "Random" Menu (visible when not logged in) ********
+function bp_adminbar_random_menu() { 
+        global $bp; ?>
         <li class="align-right">
                 <a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
                 <ul class="random-list">
@@ -164 +199 @@
                         <?php endif; ?>
                 </ul>
         </li>
-        <?php
-        
-        echo '</ul>';
-        echo '</div>';
+<?php
 }
 
+add_action('bp-adminbar-logo','bp_adminbar_logo');
+add_action('bp-adminbar-menus','bp_adminbar_login_menu',2);
+add_action('bp-adminbar-menus','bp_adminbar_account_menu',4);
+add_action('bp-adminbar-menus','bp_adminbar_blogs_menu',6);
+add_action('bp-adminbar-menus','bp_adminbar_notifications_menu',8);
+add_action('bp-adminbar-menus','bp_adminbar_authors_menu',12);
+add_action('bp-adminbar-menus','bp_adminbar_random_menu',100);
+
 add_action( 'wp_footer', 'bp_core_admin_bar' );
 //add_action( 'admin_footer', 'bp_core_admin_bar' )