<!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][5158] trunk/bp-forums/bp-forums-admin.php: Update bp-forums-admin.php with new 'Forums for Groups' and 'Site Wide Forums' text.</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><a href="http://buddypress.trac.wordpress.org/changeset/5158">5158</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-09-20 19:06:51 +0000 (Tue, 20 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update bp-forums-admin.php with new 'Forums for Groups' and 'Site Wide Forums' text. Includes plugin installer for bbPress 2.0. See <a href="http://buddypress.trac.wordpress.org/ticket/3592">#3592</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsadminphp">trunk/bp-forums/bp-forums-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-admin.php (5157 => 5158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php 2011-09-18 21:31:04 UTC (rev 5157)
+++ trunk/bp-forums/bp-forums-admin.php 2011-09-20 19:06:51 UTC (rev 5158)
</span><span class="lines">@@ -36,13 +36,48 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) :
</span><span class="cx">
</span><ins>+ // Delete the bb-config.php location option
+ bp_delete_option( 'bb-config-location' );
</ins><span class="cx"> bp_forums_bbpress_install_wizard();
</span><span class="cx">
</span><span class="cx"> else : ?>
</span><span class="cx">
</span><del>- <p><?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can <a href="%s" title="Reinstall bbPress">re-install</a>.', 'buddypress' ), $action ); ?>
- <p><?php _e( 'NOTE: The forums directory will only work if your bbPress tables are in the same database as your WordPress tables. If you are not using an existing bbPress install you can ignore this message.', 'buddypress' ); ?></p>
</del><ins>+ <div style="width: 45%; float: left;">
+ <h3><?php _e( '(Installed)', 'buddypress' ); ?> <?php _e( 'Forums for Groups', 'buddypress' ) ?></h3>
</ins><span class="cx">
</span><ins>+ <p><?php _e( 'Each individual Group can have it\'s own discussion forum. Choose this if you\'d like to isolate the conversations your members have into distinctly separate areas.' , 'buddypress' ); ?></p>
+ <p class="description"><?php _e( 'You may use an existing bbPress installation if you have one.', 'buddypress' ); ?></p>
+
+ <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+ <ul class="description" style="list-style: square; margin-left: 30px;">
+ <li><?php _e( 'Group Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Member Profile Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li>
+ </ul>
+
+ <div>
+ <a class="button button-primary" href="<?php echo $action ?>"><?php _e( 'Uninstall Group Forums', 'buddypress' ) ?></a> &nbsp;
+ </div>
+ </div>
+
+ <div style="width: 45%; float: left; margin-left: 20px; padding: 0 20px 20px 20px; border: 1px solid #ddd; background-color: #fff;">
+ <h3><?php _e( 'New! Site Wide Forums', 'buddypress' ) ?></h3>
+ <p><?php _e( 'Your site will have central forums that are not isolated to any specific group. Choose this if you\'d like to have a central forum area for your members.', 'buddypress' ) ?></p>
+ <p class="description"><?php _e( 'You may activate both Group and Site Wide forums, but this may create a poor experience for your members.', 'buddypress' ) ?></p>
+
+ <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+ <ul class="description" style="list-style: square; margin-left: 30px;">
+ <li><?php _e( 'Central Discussion Area', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Forum Plugins Available', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li>
+ </ul>
+ <div>
+ <a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> &nbsp;
+ </div>
+ </div>
+
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="lines">@@ -56,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> switch( $step ) {
</span><span class="cx"> case 'existing':
</span><del>- if ( 1 == (int)$_REQUEST['doinstall'] ) {
</del><ins>+ if ( isset( $_REQUEST['doinstall'] ) && ( 1 == (int) $_REQUEST['doinstall'] ) ) {
</ins><span class="cx"> if ( !bp_forums_configure_existing_install() ) {
</span><span class="cx"> _e( 'The bb-config.php file was not found at that location, please try again.', 'buddypress' );
</span><span class="cx"> } else {
</span><span class="lines">@@ -115,13 +150,52 @@
</span><span class="cx"> <p><?php printf( __( 'bbPress files were not found. To install the forums component you must download a copy of bbPress and make sure it is in the folder: "%s"', 'buddypress' ), 'wp-content/plugins/buddypress/bp-forums/bbpress/' ) ?></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php } else { ?>
</del><ins>+ <?php } else {
+
+ // Include the plugin install
</ins><span class="cx">
</span><del>- <p><?php _e( 'Forums in BuddyPress make use of a bbPress installation to function. You can choose to either let BuddyPress set up a new bbPress install, or use an already existing bbPress install. Please choose one of the options below.', 'buddypress' ) ?></p>
</del><ins>+ add_thickbox();
+ wp_enqueue_script( 'plugin-install' );
+ wp_admin_css( 'plugin-install' );
+ ?>
</ins><span class="cx">
</span><del>- <a class="button" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Set up a new bbPress installation', 'buddypress' ) ?></a> &nbsp;
- <a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use an existing bbPress installation', 'buddypress' ) ?></a>
</del><ins>+ <div style="width: 45%; float: left;">
+ <h3><?php _e( 'Forums for Groups', 'buddypress' ) ?></h3>
</ins><span class="cx">
</span><ins>+ <p><?php _e( 'Each individual Group can have it\'s own discussion forum. Choose this if you\'d like to isolate the conversations your members have into distinctly separate areas.' , 'buddypress' ); ?></p>
+ <p class="description"><?php _e( 'You may use an existing bbPress installation if you have one.', 'buddypress' ); ?></p>
+
+ <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+ <ul class="description" style="list-style: square; margin-left: 30px;">
+ <li><?php _e( 'Group Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Member Profile Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li>
+ </ul>
+
+ <div>
+ <a class="button button-primary" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Install Group Forums', 'buddypress' ) ?></a> &nbsp;
+ <a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use Existing Installation', 'buddypress' ) ?></a>
+ </div>
+ </div>
+
+ <div style="width: 45%; float: left; margin-left: 20px; padding: 0 20px 20px 20px; border: 1px solid #ddd; background-color: #fff;">
+ <h3><?php _e( 'New! Site Wide Forums', 'buddypress' ) ?></h3>
+ <p><?php _e( 'Your site will have central forums that are not isolated to any specific group. Choose this if you\'d like to have a central forum area for your members.', 'buddypress' ) ?></p>
+ <p class="description"><?php _e( 'You may activate both Group and Site Wide forums, but this may create a poor experience for your members.', 'buddypress' ) ?></p>
+
+ <h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+ <ul class="description" style="list-style: square; margin-left: 30px;">
+ <li><?php _e( 'Central Discussion Area', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Forum Plugins Available', 'buddypress' ); ?></p></li>
+ <li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+ <li><?php _e( '@ Mention Integration', 'buddypress' ); ?></p></li>
+ </ul>
+ <div>
+ <a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> &nbsp;
+ </div>
+ </div>
+
</ins><span class="cx"> <?php }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -286,4 +360,4 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>