<!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][5872] trunk/bp-themes/bp-default/groups/create.php: Rearrange group create template to move old forum creation to bottom, and simplify logic and output.</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/5872">5872</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-03-03 09:42:15 +0000 (Sat, 03 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rearrange group create template to move old forum creation to bottom, and simplify logic and output. See <a href="http://buddypress.trac.wordpress.org/ticket/3598">#3598</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultgroupscreatephp">trunk/bp-themes/bp-default/groups/create.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultgroupscreatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/create.php (5871 => 5872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/create.php 2012-03-03 09:40:53 UTC (rev 5871)
+++ trunk/bp-themes/bp-default/groups/create.php 2012-03-03 09:42:15 UTC (rev 5872)
</span><span class="lines">@@ -57,26 +57,6 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_settings_creation_step' ); ?>
</span><span class="cx">
</span><del>- <?php if ( bp_is_active( 'forums' ) ) : ?>
- <?php if ( bp_forums_is_installed_correctly() ) : ?>
-
- <div class="checkbox">
- <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
- </div>
-
- <?php else : ?>
- <?php if ( bp_current_user_can( 'bp_moderate' ) ) : ?>
-
- <div class="checkbox">
- <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' ); ?></label>
- </div>
-
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
-
- <hr />
-
</del><span class="cx"> <h4><?php _e( 'Privacy Options', 'buddypress' ); ?></h4>
</span><span class="cx">
</span><span class="cx"> <div class="radio">
</span><span class="lines">@@ -108,8 +88,6 @@
</span><span class="cx"> </label>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <hr />
-
</del><span class="cx"> <h4><?php _e( 'Group Invitations', 'buddypress' ); ?></h4>
</span><span class="cx">
</span><span class="cx"> <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
</span><span class="lines">@@ -131,8 +109,18 @@
</span><span class="cx"> </label>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <hr />
</del><ins>+ <?php if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) : ?>
</ins><span class="cx">
</span><ins>+ <h4><?php _e( 'Group Forums', 'buddypress' ); ?></h4>
+
+ <p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
+
+ <div class="checkbox">
+ <label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
+ </div>
+
+ <?php endif; ?>
+
</ins><span class="cx"> <?php do_action( 'bp_after_group_settings_creation_step' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php wp_nonce_field( 'groups_create_save_group-settings' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>