<!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][3975] trunk/bp-core/admin/bp-core-admin.php: Reworks Component Setup admin screen to better match WP admin.</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>3975</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-01-31 15:29:02 +0000 (Mon, 31 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reworks Component Setup admin screen to better match WP admin. Adds Page Setup section to enable bp-pages configuration after installation. Fixes #3019</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</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 (3974 => 3975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-01-30 21:40:05 UTC (rev 3974)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-01-31 15:29:02 UTC (rev 3975)
</span><span class="lines">@@ -233,12 +233,20 @@
</span><span class="cx"> if ( !check_admin_referer('bp-admin-component-setup') )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Settings form submitted, now save the settings.
</del><ins>+ // Settings form submitted, now save the settings. First, set active components
</ins><span class="cx"> foreach ( (array)$_POST['bp_components'] as $key => $value ) {
</span><span class="cx"> if ( !(int) $value )
</span><span class="cx"> $disabled[$key] = 1;
</span><span class="cx"> }
</span><span class="cx"> update_site_option( 'bp-deactivated-components', $disabled );
</span><ins>+
+ // Then, update the directory pages
+ $directory_pages = array();
+ foreach ( (array)$_POST['bp_pages'] as $key => $value ) {
+ if ( !empty( $value ) )
+ $directory_pages[$key] = (int)$value;
+ }
+ bp_core_update_page_meta( $directory_pages );
</ins><span class="cx"> } ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -255,11 +263,13 @@
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="bp-admin-component-form">
</span><span class="cx">
</span><del>- <p><?php _e('By default, all BuddyPress components are enabled. You can selectively disable any of the components by using the form below. Your BuddyPress installation will continue to function, however the features of the disabled components will no longer be accessible to anyone using the site.', 'buddypress' ) ?></p>
</del><ins>+
</ins><span class="cx">
</span><span class="cx"> <?php $disabled_components = get_site_option( 'bp-deactivated-components' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php bp_core_admin_component_options() ?>
</span><ins>+
+ <?php bp_core_admin_page_options() ?>
</ins><span class="cx">
</span><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="lines">@@ -274,7 +284,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Creates reusable markup for the component setup dashboard panel.
</del><ins>+ * Creates reusable markup for component setup on the Components and Pages dashboard panel.
</ins><span class="cx"> *
</span><span class="cx"> * This markup has been abstracted so that it can be used both during the setup wizard as well as
</span><span class="cx"> * when BP has been fully installed.
</span><span class="lines">@@ -284,100 +294,132 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_admin_component_options() {
</span><span class="cx"> $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
</span><ins>+
+ // An array of strings looped over to create component setup markup
+ $optional_components = array(
+ 'xprofile' => array(
+ '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' )
+ ),
+ 'friends' => array(
+ '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' )
+ ),
+ 'messages' => array(
+ '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' )
+ ),
+ 'activity' => array(
+ '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' )
+ ),
+ 'groups' => array(
+ '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' )
+ ),
+ 'forums' => array(
+ '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' )
+ )
+ );
+
+ if ( is_multisite() ) {
+ $optional_components['blogs'] = array(
+ '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><del>- <div class="component">
- <h5><?php _e( "Extended Profiles", 'buddypress' ) ?></h5>
</del><ins>+ <h3><?php _e( 'Optional Components', 'buddypress' ) ?></h3>
+
+ <p><?php _e( "Select the BuddyPress components you'd like to enable.", 'buddypress' ) ?></p>
+
+ <table class="form-table">
+ <tbody>
+ <?php foreach ( $optional_components as $name => $labels ) : ?>
+ <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>
</ins><span class="cx">
</span><del>- <div class="radio">
- <input type="radio" name="bp_components[bp-xprofile.php]" value="1"<?php if ( !isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-xprofile.php]" value="0"<?php if ( isset( $disabled_components['bp-xprofile.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
</del><ins>+ </td>
+ </tr>
+ <?php endforeach ?>
+ </tbody>
+ </table>
</ins><span class="cx">
</span><del>- <img src="<?php echo plugins_url( 'buddypress/screenshot-2.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "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' ) ?></p>
- </div>
-
- <div class="component">
- <h5><?php _e( "Friend Connections", 'buddypress' ) ?></h5>
-
- <div class="radio">
- <input type="radio" name="bp_components[bp-friends.php]" value="1"<?php if ( !isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-friends.php]" value="0"<?php if ( isset( $disabled_components['bp-friends.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
-
- <img src="<?php echo plugins_url( 'buddypress/screenshot-4.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "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' ) ?></p>
- </div>
-
- <div class="component">
- <h5><?php _e( "Discussion Forums", 'buddypress' ) ?></h5>
-
- <div class="radio">
- <input type="radio" name="bp_components[bp-forums.php]" value="1"<?php if ( !isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-forums.php]" value="0"<?php if ( isset( $disabled_components['bp-forums.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
-
- <img src="<?php echo plugins_url( 'buddypress/screenshot-6.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "Full powered discussion forums built directly into groups allow for more conventional in-depth conversations. <strong>NOTE: This will require an extra (but easy) setup step.</strong>", 'buddypress' ) ?></p>
- </div>
-
- <div class="component">
- <h5><?php _e( "Activity Streams", 'buddypress' ) ?></h5>
-
- <div class="radio">
- <input type="radio" name="bp_components[bp-activity.php]" value="1"<?php if ( !isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-activity.php]" value="0"<?php if ( isset( $disabled_components['bp-activity.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
-
- <img src="<?php echo plugins_url( 'buddypress/screenshot-1.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.", 'buddypress' ) ?></p>
- </div>
-
- <div class="component">
- <h5><?php _e( "Extensible Groups", 'buddypress' ) ?></h5>
-
- <div class="radio">
- <input type="radio" name="bp_components[bp-groups.php]" value="1"<?php if ( !isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-groups.php]" value="0"<?php if ( isset( $disabled_components['bp-groups.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
-
- <img src="<?php echo plugins_url( 'buddypress/screenshot-3.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "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' ) ?></p>
- </div>
-
- <div class="component">
- <h5><?php _e( "Private Messaging", 'buddypress' ) ?></h5>
-
- <div class="radio">
- <input type="radio" name="bp_components[bp-messages.php]" value="1"<?php if ( !isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-messages.php]" value="0"<?php if ( isset( $disabled_components['bp-messages.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
-
- <img src="<?php echo plugins_url( 'buddypress/screenshot-5.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "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' ) ?></p>
- </div>
-
- <?php if ( is_multisite() ) : ?>
-
- <div class="component">
- <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
-
- <div class="radio">
- <input type="radio" name="bp_components[bp-blogs.php]" value="1"<?php if ( !isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
- <input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
- </div>
-
- <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
- <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
- </div>
-
- <?php else: ?>
-
</del><ins>+ <?php /* Make sure that the blogs component is deactivated when multisite is shut off */ ?>
+ <?php if ( !is_multisite() ) : ?>
</ins><span class="cx"> <input type="hidden" name="bp_components[bp-blogs.php]" value="0" />
</span><ins>+ <?php endif ?>
+
+ <?php
+}
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+/**
+ * Creates reusable markup for page setup on the Components and Pages dashboard panel.
+ *
+ * This markup has been abstracted so that it can be used both during the setup wizard as well as
+ * when BP has been fully installed.
+ *
+ * @package BuddyPress Core
+ * @since 1.3
+ */
+function bp_core_admin_page_options() {
+ // Get the existing WP pages
+ $existing_pages = bp_core_get_page_meta();
</ins><span class="cx">
</span><ins>+ // An array of strings looped over to create component setup markup
+ $directory_pages = array(
+ 'groups' => __( "Groups Directory", 'buddypress' ),
+ 'forums' => __( "Forums Directory", 'buddypress' ),
+ 'members' => __( "Members Directory", 'buddypress' ),
+ 'activity' => __( "Activity", 'buddypress' ),
+ 'register' => __( "Register", 'buddypress' ),
+ 'activate' => __( "Activate", 'buddypress' )
+ );
+
+ if ( is_multisite() ) {
+ $directory_pages['blogs'] = __( "Blogs Directory", 'buddypress' );
+ }
+
+ ?>
+
+ <h3><?php _e( "BuddyPress Page Setup", 'buddypress' ) ?></h3>
+
+ <p><?php _e( "Choose the WordPress pages you'd like to associate with the following BuddyPress content.", 'buddypress' ) ?></p>
+
+ <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>
+
+ <table class="form-table">
+ <tbody>
+ <?php foreach ( $directory_pages as $name => $label ) : ?>
+ <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>
+ <?php endforeach ?>
+ </tbody>
+ </table>
+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>