Skip to:
Content

BuddyPress.org

Changeset 5868


Ignore:
Timestamp:
02/28/2012 10:05:51 PM (13 years ago)
Author:
djpaul
Message:

s/admin bar/toolbar. Fixes #4056

Location:
trunk
Files:
24 edited

Legend:

Unmodified
Added
Removed

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

    r5705 r5868  
    201201
    202202    /**
    203      * Set up the admin bar
     203     * Set up the Toolbar
    204204     *
    205205     * @since 1.5.0

  • trunk/bp-blogs/bp-blogs-loader.php

    r5770 r5868  
    133133
    134134    /**
    135      * Set up the admin bar
     135     * Set up the Toolbar
    136136     *
    137137     * @global obj $bp

  • trunk/bp-core/admin/bp-core-update.php

    r5754 r5868  
    7777            // New for BP 1.6
    7878            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) ) {
    79                 $steps[] = __( 'Admin Bar', 'buddypress' );
     79                $steps[] = __( 'Toolbar', 'buddypress' );
    8080            }
    8181
    … …  
    217217                            break;
    218218
    219                         case __( 'Admin Bar', 'buddypress' ) :
     219                        case __( 'Toolbar', 'buddypress' ) :
    220220                            $this->step_admin_bar();
    221221                            break;
    … …  
    655655
    656656    /**
    657      * When upgrading to BP 1.6, prompt the admin to switch to WordPress' admin bar.
     657     * When upgrading to BP 1.6, prompt the admin to switch to WordPress' Toolbar.
    658658     *
    659659     * @since 1.6
    … …  
    662662    ?>
    663663
    664         <p><?php _e( "BuddyPress now uses WordPress' Admin Bar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Admin Bar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
     664        <p><?php _e( "BuddyPress now uses WordPress' Toolbar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Toolbar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
    665665
    666666        <p><?php _e( "We've noticed that your site uses the old bar from earlier versions of BuddyPress.", 'buddypress' ); ?></p>
    … …  
    669669            <label>
    670670                <input type="checkbox" name="keep_buddybar" value="1" />
    671                 <?php _e( "If you'd prefer to not switch to the WordPress Admin bar just yet, check this box. Don't worry, you can change your mind later.", 'buddypress' ); ?>
     671                <?php _e( "If you'd prefer to not switch to the WordPress Toolbar just yet, check this box. Don't worry, you can change your mind later.", 'buddypress' ); ?>
    672672            </label>
    673673        </p>
    … …  
    936936
    937937    /**
    938      * When upgrading to BP 1.6, the admin is prompted to switch to WordPress' admin bar.
     938     * When upgrading to BP 1.6, the admin is prompted to switch to WordPress' Toolbar.
    939939     * If they choose not to, record that preference in the options table.
    940940     *

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

    r5848 r5868  
    135135
    136136/**
    137  * Set up BuddyPress implementation of the WP admin bar
     137 * Set up BuddyPress implementation of the WP Toolbar
    138138 */
    139139function bp_setup_admin_bar() {

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

    r5846 r5868  
    312312
    313313        // Throttle setting
    314         add_settings_field( '_bp_admin_bar',        __( 'Admin Bar',        'buddypress' ), 'bp_admin_setting_callback_admin_bar',        'buddypress', 'bp_main' );
     314        add_settings_field( '_bp_admin_bar',        __( 'Toolbar',        'buddypress' ), 'bp_admin_setting_callback_admin_bar',        'buddypress', 'bp_main' );
    315315        register_setting  ( 'buddypress',           '_bp_admin_bar',        'intval'                                                                              );
    316316

  • trunk/bp-core/bp-core-adminbar.php

    r5867 r5868  
    22
    33/**
    4  * BuddyPress Core Admin Bar
     4 * BuddyPress Core Toolbar
    55 *
    6  * Handles the core functions related to the WordPress Admin Bar
     6 * Handles the core functions related to the WordPress Toolbar
    77 *
    88 * @package BuddyPress
    … …  
    4545
    4646/**
    47  * Handle the Admin Bar CSS
     47 * Handle the Toolbar CSS
    4848 *
    4949 * @since BuddyPress 1.5
    … …  
    5454        return;
    5555
    56     // Admin bar styles
     56    // Toolbar styles
    5757    if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    5858        $stylesheet = BP_PLUGIN_URL . 'bp-core/css/admin-bar.dev.css';

  • trunk/bp-core/bp-core-buddybar.php

    r5758 r5868  
    429429}
    430430
    431 // **** Default BuddyPress admin bar logo ********
     431// **** Default BuddyPress Toolbar logo ********
    432432function bp_adminbar_logo() {
    433433    echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . '</a>';
    … …  
    552552
    553553/**
    554  * Retrieve the admin bar display preference of a user based on context.
     554 * Retrieve the Toolbar display preference of a user based on context.
    555555 *
    556556 * This is a direct copy of WP's private _get_admin_bar_pref()
    … …  
    563563 * @uses get_user_option()
    564564 *
    565  * @return bool Whether the admin bar should be showing for this user.
     565 * @return bool Whether the Toolbar should be showing for this user.
    566566 */
    567567function bp_get_admin_bar_pref( $context, $user = 0 ) {
    … …  
    574574
    575575/**
    576  * Handle the Admin Bar/BuddyBar business
     576 * Handle the Toolbar/BuddyBar business
    577577 *
    578578 * @since 1.2.0
    … …  
    594594    global $wp_version;
    595595
    596     // Don't show if admin bar is disabled for non-logged in users
     596    // Don't show if Toolbar is disabled for non-logged in users
    597597    if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) )
    598598        return;
    599599
    600     // Show the WordPress admin bar
     600    // Show the WordPress Toolbar
    601601    if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
    602         // Respect user's admin bar display preferences
     602        // Respect user's Toolbar display preferences
    603603        if ( is_user_logged_in() && ( bp_get_admin_bar_pref( 'front', bp_loggedin_user_id() ) || bp_get_admin_bar_pref( 'admin', bp_loggedin_user_id() ) ) )
    604604            return;
    … …  
    606606        show_admin_bar( true );
    607607
    608     // Hide the WordPress admin bar
     608    // Hide the WordPress Toolbar
    609609    } elseif ( !bp_use_wp_admin_bar() ) {
    610610
    611         // Keep the WP admin bar from loading
     611        // Keep the WP Toolbar from loading
    612612        show_admin_bar( false );
    613613
    614         // Actions used to build the BP admin bar
     614        // Actions used to build the BP Toolbar
    615615        add_action( 'bp_adminbar_logo',  'bp_adminbar_logo' );
    616616        add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu',         2   );
    … …  
    619619        add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu',        100 );
    620620
    621         // Actions used to append BP admin bar to footer
     621        // Actions used to append BP Toolbar to footer
    622622        add_action( 'wp_footer',    'bp_core_admin_bar', 8 );
    623623        add_action( 'admin_footer', 'bp_core_admin_bar'    );

  • trunk/bp-core/bp-core-component.php

    r5472 r5868  
    6161
    6262    /**
    63      * @var array WordPress admin bar links
     63     * @var array WordPress Toolbar links
    6464     */
    6565    var $admin_menu;
    … …  
    228228        add_action( 'bp_setup_nav',              array ( $this, 'setup_nav'              ), 10 );
    229229
    230         // Setup WP Admin Bar menus
     230        // Setup WP Toolbar menus
    231231        add_action( 'bp_setup_admin_bar',        array ( $this, 'setup_admin_bar'        ), 10 );
    232232
    … …  
    275275
    276276    /**
    277      * Setup the admin bar
     277     * Setup the Toolbar
    278278     *
    279279     * @global obj $wp_admin_bar
    … …  
    290290            return;
    291291
    292         // Do we have admin bar menus to add?
     292        // Do we have Toolbar menus to add?
    293293        if ( !empty( $wp_admin_nav ) ) {
    294294

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

    r5827 r5868  
    931931
    932932/**
    933  * Should we use the WP admin bar?
    934  *
    935  * The WP Admin Bar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.5.
    936  * For BP 1.6, the WP Admin Bar is the default.
    937  *
    938  * @return bool False when WP Admin Bar support is disabled; true when enabled (default)
     933 * Should we use the WP Toolbar?
     934 *
     935 * The WP Toolbar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.5.
     936 * For BP 1.6, the WP Toolbar is the default.
     937 *
     938 * @return bool False when WP Toolbar support is disabled; true when enabled (default)
    939939 * @since 1.5
    940940 * @uses apply_filters() Filter 'bp_use_wp_admin_bar' to alter
    … …  
    943943    $use_admin_bar = true;
    944944
    945     // Has the WP Admin Bar constant been explicity set?
     945    // Has the WP Toolbar constant been explicity set?
    946946    if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && ! BP_USE_WP_ADMIN_BAR )
    947947        $use_admin_bar = false;

  • trunk/bp-core/bp-core-options.php

    r5754 r5868  
    5454        'bp-disable-profile-sync'         => false,
    5555
    56         // Hide the admin bar for logged out users
     56        // Hide the Toolbar for logged out users
    5757        'hide-loggedout-adminbar'         => false,
    5858
    … …  
    382382
    383383/**
    384  * Is the admin bar hidden for logged out users?
     384 * Is the Toolbar hidden for logged out users?
    385385 *
    386386 * @since BuddyPress (1.6)
    … …  
    388388 * @param $default bool Optional.Default value true
    389389 *
    390  * @uses bp_get_option() To get the logged out admin bar option
    391  * @return bool Is logged out admin bar enabled or not
     390 * @uses bp_get_option() To get the logged out Toolbar option
     391 * @return bool Is logged out Toolbar enabled or not
    392392 */
    393393function bp_hide_loggedout_adminbar( $default = true ) {
    … …  
    453453
    454454/**
    455  * Have we migrated to using the WordPress admin bar?
     455 * Have we migrated to using the WordPress Toolbar?
    456456 *
    457457 * @since BuddyPress (r3386)

  • trunk/bp-forums/bp-forums-loader.php

    r5705 r5868  
    168168
    169169    /**
    170      * Set up the admin bar
     170     * Set up the Toolbar
    171171     *
    172172     * @global obj $bp

  • trunk/bp-friends/bp-friends-activity.php

    r5729 r5868  
    6666
    6767/**
    68  * Format the BuddyBar/admin bar notifications for the Friends component
     68 * Format the BuddyBar/Toolbar notifications for the Friends component
    6969 *
    7070 * @package BuddyPress
    … …  
    7474 * @param int $secondary_item_id The secondary item id
    7575 * @param int $total_items The total number of messaging-related notifications waiting for the user
    76  * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Admin Bar
     76 * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Toolbar
    7777 */
    7878function friends_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {

  • trunk/bp-friends/bp-friends-loader.php

    r5705 r5868  
    130130
    131131    /**
    132      * Set up the admin bar
     132     * Set up the Toolbar
    133133     *
    134134     * @global obj $bp

  • trunk/bp-groups/bp-groups-adminbar.php

    r5689 r5868  
    22
    33/**
    4  * BuddyPress Groups Admin Bar
     4 * BuddyPress Groups Toolbar
    55 *
    6  * Handles the groups functions related to the WordPress Admin Bar
     6 * Handles the groups functions related to the WordPress Toolbar
    77 *
    88 * @package BuddyPress

  • trunk/bp-groups/bp-groups-loader.php

    r5764 r5868  
    405405
    406406    /**
    407      * Set up the admin bar
     407     * Set up the Toolbar
    408408     *
    409409     * @global obj $bp

  • trunk/bp-members/bp-members-adminbar.php

    r5829 r5868  
    22
    33/**
    4  * BuddyPress Members Admin Bar
     4 * BuddyPress Members Toolbar
    55 *
    6  * Handles the member functions related to the WordPress Admin Bar
     6 * Handles the member functions related to the WordPress Toolbar
    77 *
    88 * @package BuddyPress
    … …  
    1717 *
    1818 * @since BuddyPress (r4151)
    19  * @todo Deprecate WP 3.2 admin bar compatibility when we drop 3.2 support
     19 * @todo Deprecate WP 3.2 Toolbar compatibility when we drop 3.2 support
    2020 */
    2121function bp_members_admin_bar_my_account_menu() {

  • trunk/bp-members/bp-members-buddybar.php

    r5729 r5868  
    101101
    102102/**
    103  * Adds an admin bar menu to any profile page providing site moderator actions
     103 * Adds an Toolbar menu to any profile page providing site moderator actions
    104104 * that allow capable users to clean up a users account.
    105105 *

  • trunk/bp-messages/bp-messages-functions.php

    r5729 r5868  
    217217
    218218/**
    219  * Format the BuddyBar/admin bar notifications for the Messages component
     219 * Format the BuddyBar/Toolbar notifications for the Messages component
    220220 *
    221221 * @package BuddyPress
    … …  
    225225 * @param int $secondary_item_id The secondary item id
    226226 * @param int $total_items The total number of messaging-related notifications waiting for the user
    227  * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Admin Bar
     227 * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Toolbar
    228228 */
    229229function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {

  • trunk/bp-messages/bp-messages-loader.php

    r5705 r5868  
    157157
    158158    /**
    159      * Set up the admin bar
     159     * Set up the Toolbar
    160160     *
    161161     * @global obj $bp

  • trunk/bp-settings/bp-settings-loader.php

    r5829 r5868  
    146146
    147147    /**
    148      * Set up the admin bar
     148     * Set up the Toolbar
    149149     *
    150150     * @global obj $bp

  • trunk/bp-themes/bp-default/_inc/css/default-rtl.css

    r5822 r5868  
    2828        5.1.1 - Activity Listing
    2929        5.1.2 - Activity Comments
    30     5.2 - Admin Bar
     30    5.2 - Toolbar
    3131    5.3 - Ajax Loading
    3232    5.4 - Directories - Members, Groups, Blogs, Forums
    … …  
    553553
    554554/*--------------------------------------------------------------
    555 5.2 - Admin Bar
     5555.2 - Toolbar
    556556--------------------------------------------------------------*/
    557557/*--------------------------------------------------------------

  • trunk/bp-themes/bp-default/_inc/css/default.css

    r5839 r5868  
    2727        6.1.1 - Activity Listing
    2828        6.1.2 - Activity Comments
    29     6.2 - Admin Bar
     29    6.2 - Toolbar
    3030    6.3 - Directories - Members, Groups, Blogs, Forums
    3131    6.4 - Error / Success Messages
    … …  
    14941494
    14951495/*--------------------------------------------------------------
    1496 6.2 - Admin Bar
     14966.2 - Toolbar
    14971497--------------------------------------------------------------*/
    14981498#wp-admin-bar .padder {
    1499     width: 95% !important; /* Line up the admin bar with the content body in this theme */
     1499    width: 95% !important; /* Line up the Toolbar with the content body in this theme */
    15001500}
    15011501

  • trunk/bp-themes/bp-default/_inc/global.js

    r5822 r5868  
    11831183    });
    11841184
    1185     /* Admin Bar & wp_list_pages Javascript IE6 hover class */
     1185    /* Toolbar & wp_list_pages Javascript IE6 hover class */
    11861186    jq("#wp-admin-bar ul.main-nav li, #nav li").mouseover( function() {
    11871187        jq(this).addClass('sfhover');

  • trunk/bp-xprofile/bp-xprofile-loader.php

    r5797 r5868  
    183183
    184184    /**
    185      * Set up the admin bar
     185     * Set up the Toolbar
    186186     *
    187187     * @global obj $bp
Note: See TracChangeset for help on using the changeset viewer.