<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][3987] trunk: Introduce icons32.png to project, and use through-out admin area.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3987</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-01 23:54:03 +0000 (Tue, 01 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce icons32.png to project, and use through-out admin area. Also clean up some component grammar and verbiage, and hide the admin dashboard menu item until it is closer to completion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorecssadmindevcss">trunk/bp-core/css/admin.dev.css</a></li>
<li><a href="#trunkbpxprofileadmincssadmindevcss">trunk/bp-xprofile/admin/css/admin.dev.css</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilebuddybarphp">trunk/bp-xprofile/bp-xprofile-buddybar.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcoreimagesicons32png">trunk/bp-core/images/icons32.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (3986 => 3987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-02-01 22:30:27 UTC (rev 3986)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-02-01 23:54:03 UTC (rev 3987)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $current_blog ) ) {
</span><del>- if ( $current_blog->blog_id != BP_ROOT_BLOG )
</del><ins>+ if ( $current_blog->blog_id != BP_ROOT_BLOG ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $wp_rewrite->permalink_structure ) ) { ?>
</span><span class="lines">@@ -65,11 +66,11 @@
</span><span class="cx"> <div class="wrap" id="bp-admin">
</span><span class="cx">
</span><span class="cx"> <div id="bp-admin-header">
</span><del>- <h3><?php _e( 'BuddyPress', 'buddypress' ) ?></h3>
- <h2><?php _e( 'Dashboard', 'buddypress' ) ?></h2>
</del><ins>+ <h3><?php _e( 'BuddyPress', 'buddypress' ); ?></h3>
+ <h2><?php _e( 'Dashboard', 'buddypress' ); ?></h2>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_admin_notices' ) ?>
</del><ins>+ <?php do_action( 'bp_admin_notices' ); ?>
</ins><span class="cx">
</span><span class="cx"> <form action="<?php echo site_url( '/wp-admin/admin.php?page=bp-general-settings' ) ?>" method="post" id="bp-admin-form">
</span><span class="cx"> <div id="bp-admin-content">
</span><span class="lines">@@ -114,12 +115,14 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx">
</span><del>- <h2><?php _e( 'BuddyPress Settings', 'buddypress' ) ?></h2>
</del><ins>+ <?php screen_icon( 'buddypress' ); ?>
</ins><span class="cx">
</span><ins>+ <h2><?php _e( 'BuddyPress General Settings', 'buddypress' ); ?></h2>
+
</ins><span class="cx"> <?php if ( isset( $_POST['bp-admin'] ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="updated fade">
</span><del>- <p><?php _e( 'Settings Saved', 'buddypress' ) ?></p>
</del><ins>+ <p><?php _e( 'Settings Saved', 'buddypress' ); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -132,18 +135,6 @@
</span><span class="cx"> <?php if ( bp_is_active( 'xprofile' ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e( 'Base profile group name', 'buddypress' ) ?>:</th>
- <td>
- <input name="bp-admin[bp-xprofile-base-group-name]" id="bp-xprofile-base-group-name" value="<?php echo esc_attr( stripslashes( get_site_option( 'bp-xprofile-base-group-name' ) ) ) ?>" />
- </td>
- </tr>
- <tr>
- <th scope="row"><?php _e( 'Full Name field name', 'buddypress' ) ?>:</th>
- <td>
- <input name="bp-admin[bp-xprofile-fullname-field-name]" id="bp-xprofile-fullname-field-name" value="<?php echo esc_attr( stripslashes( get_site_option( 'bp-xprofile-fullname-field-name' ) ) ) ?>" />
- </td>
- </tr>
- <tr>
</del><span class="cx"> <th scope="row"><?php _e( 'Disable BuddyPress to WordPress profile syncing?', 'buddypress' ) ?>:</th>
</span><span class="cx"> <td>
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-profile-sync]"<?php if ( (int)get_site_option( 'bp-disable-profile-sync' ) ) : ?> checked="checked"<?php endif; ?> id="bp-disable-profile-sync" value="1" /> <?php _e( 'Yes', 'buddypress' ) ?> &nbsp;
</span><span class="lines">@@ -160,6 +151,7 @@
</span><span class="cx"> <input type="radio" name="bp-admin[hide-loggedout-adminbar]"<?php if ( !(int)get_site_option( 'hide-loggedout-adminbar' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-hide-loggedout-adminbar-no" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+
</ins><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'Disable avatar uploads? (Gravatars will still work)', 'buddypress' ) ?>:</th>
</span><span class="cx"> <td>
</span><span class="lines">@@ -167,6 +159,7 @@
</span><span class="cx"> <input type="radio" name="bp-admin[bp-disable-avatar-uploads]"<?php if ( !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?> checked="checked"<?php endif; ?> id="bp-admin-disable-avatar-uploads-no" value="0" /> <?php _e( 'No', 'buddypress' ) ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+
</ins><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'Disable user account deletion?', 'buddypress' ) ?>:</th>
</span><span class="cx"> <td>
</span><span class="lines">@@ -204,13 +197,13 @@
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_core_admin_screen' ) ?>
</del><ins>+ <?php do_action( 'bp_core_admin_screen' ); ?>
</ins><span class="cx">
</span><span class="cx"> <p class="submit">
</span><del>- <input class="button-primary" type="submit" name="bp-admin-submit" id="bp-admin-submit" value="<?php _e( 'Save Settings', 'buddypress' ) ?>"/>
</del><ins>+ <input class="button-primary" type="submit" name="bp-admin-submit" id="bp-admin-submit" value="<?php _e( 'Save Settings', 'buddypress' ); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx">
</span><del>- <?php wp_nonce_field( 'bp-admin' ) ?>
</del><ins>+ <?php wp_nonce_field( 'bp-admin' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="lines">@@ -251,31 +244,35 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx">
</span><del>- <h2><?php _e( 'BuddyPress Component Setup', 'buddypress' ) ?></h2>
</del><ins>+ <?php screen_icon( 'buddypress'); ?>
</ins><span class="cx">
</span><ins>+ <h2><?php _e( 'BuddyPress Component Settings', 'buddypress' ); ?></h2>
+
</ins><span class="cx"> <?php if ( isset( $_POST['bp-admin-component-submit'] ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="updated fade">
</span><del>- <p><?php _e( 'Settings Saved', 'buddypress' ) ?></p>
</del><ins>+
+ <p><?php _e( 'Settings Saved', 'buddypress' ); ?></p>
+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="bp-admin-component-form">
</span><span class="cx">
</span><del>-
</del><ins>+ <?php
</ins><span class="cx">
</span><del>- <?php $disabled_components = get_site_option( 'bp-deactivated-components' ); ?>
-
- <?php bp_core_admin_component_options() ?>
-
- <?php bp_core_admin_page_options() ?>
</del><ins>+ $disabled_components = get_site_option( 'bp-deactivated-components' );
+ bp_core_admin_component_options();
+ bp_core_admin_page_options();
</ins><span class="cx">
</span><ins>+ ?>
+
</ins><span class="cx"> <p class="submit clear">
</span><span class="cx"> <input class="button-primary" type="submit" name="bp-admin-component-submit" id="bp-admin-component-submit" value="<?php _e( 'Save Settings', 'buddypress' ) ?>"/>
</span><span class="cx"> </p>
</span><span class="cx">
</span><del>- <?php wp_nonce_field( 'bp-admin-component-setup' ) ?>
</del><ins>+ <?php wp_nonce_field( 'bp-admin-component-setup' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="lines">@@ -300,35 +297,35 @@
</span><span class="cx"> // An array of strings looped over to create component setup markup
</span><span class="cx"> $optional_components = array(
</span><span class="cx"> 'xprofile' => array(
</span><del>- 'title' => __( "Extended Profiles", 'buddypress' ),
- 'description' => __( "Fully editable profile fields allow you to define the fields users can fill in to describe themselves. Tailor profile fields to suit your audience.", 'buddypress' )
</del><ins>+ 'title' => __( 'Extended Profiles', 'buddypress' ),
+ 'description' => __( 'Fully editable profile fields allow you to define the fields users can fill in to describe themselves. Tailor profile fields to suit your audience.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'friends' => array(
</span><del>- 'title' => __( "Friend Connections", 'buddypress' ),
- 'description' => __( "Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.", 'buddypress' )
</del><ins>+ 'title' => __( 'Friend Connections', 'buddypress' ),
+ 'description' => __( 'Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'messages' => array(
</span><del>- 'title' => __( "Private Messaging", 'buddypress' ),
- 'description' => __( "Private messaging will allow your users to talk to each other directly, and in private. Not just limited to one on one discussions, your users can send messages to multiple recipients.", 'buddypress' )
</del><ins>+ 'title' => __( 'Private Messaging', 'buddypress' ),
+ 'description' => __( 'Private messaging will allow your users to talk to each other directly, and in private. Not just limited to one on one discussions, your users can send messages to multiple recipients.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'activity' => array(
</span><del>- 'title' => __( "Activity Streams", 'buddypress' ),
- 'description' => __( "Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.", 'buddypress' )
</del><ins>+ 'title' => __( 'Activity Streams', 'buddypress' ),
+ 'description' => __( 'Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'groups' => array(
</span><del>- 'title' => __( "Extensible Groups", 'buddypress' ),
- 'description' => __( "Powerful public, private or hidden groups allow your users to break the discussion down into specific topics with a separate activity stream and member listing.", 'buddypress' )
</del><ins>+ 'title' => __( 'Extensible Groups', 'buddypress' ),
+ 'description' => __( 'Powerful public, private or hidden groups allow your users to break the discussion down into specific topics with a separate activity stream and member listing.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'forums' => array(
</span><del>- 'title' => __( "Discussion Forums", 'buddypress' ),
- 'description' => __( "Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. NOTE: This will require an extra (but easy) setup step.", 'buddypress' )
</del><ins>+ 'title' => __( 'Discussion Forums', 'buddypress' ),
+ 'description' => __( 'Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. NOTE: This will require an extra (but easy) setup step.', 'buddypress' )
</ins><span class="cx"> )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $optional_components['blogs'] = array(
</span><del>- 'title' => __( "Blog Tracking", 'buddypress' ),
- 'description' => __( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' )
</del><ins>+ 'title' => __( 'Blog Tracking', 'buddypress' ),
+ 'description' => __( 'Track new blogs, new posts and new comments across your entire blog network.', 'buddypress' )
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -336,34 +333,42 @@
</span><span class="cx">
</span><span class="cx"> <?php /* The setup wizard uses different, more descriptive text here */ ?>
</span><span class="cx"> <?php if ( empty( $bp_wizard ) ) : ?>
</span><del>- <h3><?php _e( 'Optional Components', 'buddypress' ) ?></h3>
</del><ins>+
+ <h3><?php _e( 'Active Components', 'buddypress' ); ?></h3>
</ins><span class="cx">
</span><del>- <p><?php _e( "Select the BuddyPress components you'd like to enable.", 'buddypress' ) ?></p>
</del><ins>+ <p><?php _e( 'Choose which BuddyPress components you would like to use.', 'buddypress' ); ?></p>
+
</ins><span class="cx"> <?php endif ?>
</span><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tbody>
</span><ins>+
</ins><span class="cx"> <?php foreach ( $optional_components as $name => $labels ) : ?>
</span><del>- <tr valign="top">
- <th scope="row">
- <?php echo esc_html( $labels['title'] ) ?>
- </th>
-
- <td>
- <label for="bp_components[bp-<?php echo esc_attr( $name ) ?>.php]">
- <input type="checkbox" name="bp_components[bp-<?php echo esc_attr( $name ) ?>.php]" value="1"<?php if ( !isset( $disabled_components['bp-' . esc_attr( $name ) . '.php'] ) ) : ?> checked="checked"<?php endif ?> />
- <?php echo esc_html( $labels['description'] ) ?>
- </label>
</del><span class="cx">
</span><del>- </td>
- </tr>
</del><ins>+ <tr valign="top">
+ <th scope="row"><?php echo esc_html( $labels['title'] ); ?></th>
+
+ <td>
+ <label for="bp_components[bp-<?php echo esc_attr( $name ); ?>.php]">
+ <input type="checkbox" name="bp_components[bp-<?php echo esc_attr( $name ); ?>.php]" value="1"<?php if ( !isset( $disabled_components['bp-' . esc_attr( $name ) . '.php'] ) ) : ?> checked="checked"<?php endif ?> />
+
+ <?php echo esc_html( $labels['description'] ); ?>
+
+ </label>
+
+ </td>
+ </tr>
+
</ins><span class="cx"> <?php endforeach ?>
</span><ins>+
</ins><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <?php /* Make sure that the blogs component is deactivated when multisite is shut off */ ?>
</span><span class="cx"> <?php if ( !is_multisite() ) : ?>
</span><ins>+
</ins><span class="cx"> <input type="hidden" name="bp_components[bp-blogs.php]" value="0" />
</span><ins>+
</ins><span class="cx"> <?php endif ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -384,44 +389,45 @@
</span><span class="cx">
</span><span class="cx"> // An array of strings looped over to create component setup markup
</span><span class="cx"> $directory_pages = array(
</span><del>- 'groups' => __( "Groups Directory", 'buddypress' ),
- 'forums' => __( "Forums Directory", 'buddypress' ),
- 'members' => __( "Members Directory", 'buddypress' ),
- 'activity' => __( "Activity", 'buddypress' ),
- 'register' => __( "Register", 'buddypress' ),
- 'activate' => __( "Activate", 'buddypress' )
</del><ins>+ 'groups' => __( 'Groups Directory', 'buddypress' ),
+ 'forums' => __( 'Forums Directory', 'buddypress' ),
+ 'members' => __( 'Members Directory', 'buddypress' ),
+ 'activity' => __( 'Activity', 'buddypress' ),
+ 'register' => __( 'Register', 'buddypress' ),
+ 'activate' => __( 'Activate', 'buddypress' )
</ins><span class="cx"> );
</span><span class="cx">
</span><del>- if ( is_multisite() ) {
- $directory_pages['blogs'] = __( "Blogs Directory", 'buddypress' );
- }
</del><ins>+ if ( is_multisite() )
+ $directory_pages['blogs'] = __( "Blogs Directory", 'buddypress' ); ?>
</ins><span class="cx">
</span><del>- ?>
</del><ins>+ <h3><?php _e( 'Page Setup', 'buddypress' ); ?></h3>
</ins><span class="cx">
</span><del>- <h3><?php _e( "BuddyPress Page Setup", 'buddypress' ) ?></h3>
</del><ins>+ <p><?php _e( 'Choose the WordPress pages you would like to associate with the following BuddyPress content.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <p><?php _e( "Choose the WordPress pages you'd like to associate with the following BuddyPress content.", 'buddypress' ) ?></p>
</del><ins>+ <p><?php _e( 'Leaving any of these items unset makes that content inaccessible to visitors, so be sure to fill this section out carefully.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <p><?php _e( "Leaving any of these items unset makes that content inaccessible to visitors, so be sure to fill this section out carefully.", 'buddypress' ) ?></p>
-
</del><span class="cx"> <table class="form-table">
</span><span class="cx"> <tbody>
</span><ins>+
</ins><span class="cx"> <?php foreach ( $directory_pages as $name => $label ) : ?>
</span><del>- <tr valign="top">
- <th scope="row">
- <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
- </th>
-
- <td>
- <?php echo wp_dropdown_pages( array(
- 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
- 'echo' => false,
- 'show_option_none' => __( '- Select -', 'buddypress' ),
- 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
- ) ) ?>
- </td>
- </tr>
</del><ins>+
+ <tr valign="top">
+ <th scope="row">
+ <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
+ </th>
+
+ <td>
+ <?php echo wp_dropdown_pages( array(
+ 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
+ 'echo' => false,
+ 'show_option_none' => __( '- None -', 'buddypress' ),
+ 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
+ ) ) ?>
+ </td>
+ </tr>
+
</ins><span class="cx"> <?php endforeach ?>
</span><ins>+
</ins><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (3986 => 3987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-02-01 22:30:27 UTC (rev 3986)
+++ trunk/bp-core/bp-core-functions.php 2011-02-01 23:54:03 UTC (rev 3987)
</span><span class="lines">@@ -145,18 +145,17 @@
</span><span class="cx"> 'page_title' => __( 'BuddyPress', 'buddypress' ),
</span><span class="cx"> 'capability' => 'manage_options',
</span><span class="cx"> 'file' => 'bp-general-settings',
</span><del>- 'function' => 'bp_core_admin_dashboard',
</del><ins>+ 'function' => 'bp_core_admin_component_setup',
</ins><span class="cx"> 'position' => 2
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $hooks[] = add_submenu_page( 'bp-general-settings', __( 'BuddyPress Dashboard', 'buddypress' ), __( 'Dashboard', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_dashboard' );
- $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' );
- $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress' ), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
</del><ins>+ $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Components', 'buddypress' ), __( 'Components', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup' );
+ $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' );
</ins><span class="cx">
</span><span class="cx"> // Add a hook for css/js
</span><del>- foreach( $hooks as $hook ) {
</del><ins>+ foreach( $hooks as $hook )
</ins><span class="cx"> add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
</span><del>- }
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'bp_core_add_admin_menu', 9 );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorecssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin.dev.css (3986 => 3987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin.dev.css 2011-02-01 22:30:27 UTC (rev 3986)
+++ trunk/bp-core/css/admin.dev.css 2011-02-01 23:54:03 UTC (rev 3987)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+div#icon-buddypress {
+ background: url( ../images/icons32.png ) no-repeat -4px 0px;
+}
+
</ins><span class="cx"> div#bp-admin {
</span><span class="cx"> margin: 25px 15px 25px 0;
</span><span class="cx"> padding: 0 20px 20px 20px;
</span></span></pre></div>
<a id="trunkbpcoreimagesicons32png"></a>
<div class="binary"><h4>Added: trunk/bp-core/images/icons32.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/bp-core/images/icons32.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkbpxprofileadmincssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/admin/css/admin.dev.css (3986 => 3987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/admin/css/admin.dev.css 2011-02-01 22:30:27 UTC (rev 3986)
+++ trunk/bp-xprofile/admin/css/admin.dev.css 2011-02-01 23:54:03 UTC (rev 3987)
</span><span class="lines">@@ -1,4 +1,7 @@
</span><span class="cx"> /* Profile field group main admin page */
</span><ins>+div#icon-buddypress {
+ background: url( ../../../bp-core/images/icons32.png ) no-repeat -4px 0px;
+}
</ins><span class="cx"> #tabs {
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (3986 => 3987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2011-02-01 22:30:27 UTC (rev 3986)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2011-02-01 23:54:03 UTC (rev 3987)
</span><span class="lines">@@ -38,10 +38,12 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><del>- <div class="icon32" id="icon-tools"><br></div>
</del><ins>+
+ <?php screen_icon( 'buddypress' ); ?>
+
</ins><span class="cx"> <h2>
</span><span class="cx">
</span><del>- <?php _e( 'Profile Field Setup', 'buddypress'); ?>
</del><ins>+ <?php _e( 'Extended Profile Fields', 'buddypress'); ?>
</ins><span class="cx">
</span><span class="cx"> <a id="add_group" class="button add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a>
</span><span class="cx"> </h2>
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-buddybar.php (3986 => 3987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-buddybar.php 2011-02-01 22:30:27 UTC (rev 3986)
+++ trunk/bp-xprofile/bp-xprofile-buddybar.php 2011-02-01 23:54:03 UTC (rev 3987)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Add the administration tab under the "Site Admin" tab for site administrators
</span><del>- add_submenu_page( 'bp-general-settings', __( 'Profile Field Setup', 'buddypress' ), __( 'Profile Field Setup', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
</del><ins>+ add_submenu_page( 'bp-general-settings', __( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>