Doug Stewart avatar Doug Stewart committed fb35b73

Merging in SVN trunk from main bbPress theme repo.

Comments (0)

Files changed (61)

archive-forum.php

 				<?php do_action( 'bbp_template_notices' ); ?>
 
 				<div id="forum-front" class="bbp-forum-front">
-					<h1 class="entry-title"><?php _e( 'Forums', 'bbpress' ); ?></h1>
+					<h1 class="entry-title"><?php bbp_forum_archive_title(); ?></h1>
 					<div class="entry-content">
 
-						<?php do_action( 'bbp_template_before_forums_index' ); ?>
-
-						<?php if ( bbp_has_forums() ) : ?>
-
-							<?php bbp_get_template_part( 'bbpress/loop', 'forums' ); ?>
-
-						<?php else : ?>
-
-							<?php bbp_get_template_part( 'bbpress/no',   'forums' ); ?>
-
-						<?php endif; ?>
-
-						<?php do_action( 'bbp_template_after_forums_index' ); ?>
+						<?php bbp_get_template_part( 'bbpress/content', 'archive-forum' ); ?>
 
 					</div>
 				</div><!-- #forum-front -->
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

archive-topic.php

 
 				<?php do_action( 'bbp_template_notices' ); ?>
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<div id="topic-front" class="bbp-topics-front">
+					<h1 class="entry-title"><?php bbp_topic_archive_title(); ?></h1>
+					<div class="entry-content">
 
-					<div id="topics-front" class="bbp-topics-front">
-						<h1 class="entry-title"><?php the_title(); ?></h1>
-						<div class="entry-content">
+						<?php bbp_get_template_part( 'bbpress/content', 'archive-topic' ); ?>
 
-							<?php bbp_breadcrumb(); ?>
+					</div>
+				</div><!-- #topics-front -->
 
-							<?php do_action( 'bbp_template_before_topics_index' ); ?>
-
-							<?php if ( bbp_has_topics() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-								<?php bbp_get_template_part( 'bbpress/loop',       'topics' ); ?>
-
-								<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-							<?php else : ?>
-
-								<?php bbp_get_template_part( 'bbpress/no', 'topics' ); ?>
-
-							<?php endif; ?>
-
-							<?php do_action( 'bbp_template_after_topics_index' ); ?>
-
-						</div>
-					</div><!-- #topics-front -->
-
-				<?php endwhile; ?>
-
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

bbpress/action-edit.php

-<?php
-
-/**
- * Edit handler for topics and replies
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php get_header(); ?>
-
-<?php get_template_part( 'bbp-wrapper-header' ); ?>
-
-				<?php while ( have_posts() ) the_post(); ?>
-
-					<div id="bbp-edit-page" class="bbp-edit-page">
-						<h1 class="entry-title"><?php the_title(); ?></h1>
-						<div class="entry-content">
-
-							<?php bbp_breadcrumb(); ?>
-
-							<?php if ( bbp_is_reply_edit() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/form', 'reply' ); ?>
-
-							<?php elseif ( bbp_is_topic_edit() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/form', 'topic' ); ?>
-
-							<?php endif; ?>
-
-						</div>
-					</div><!-- #bbp-edit-page -->
-
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>

bbpress/action-split-merge.php

-<?php
-
-/**
- * Split/merge topic page
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php get_header(); ?>
-
-<?php get_template_part( 'bbp-wrapper-header' ); ?>
-
-				<?php do_action( 'bbp_template_notices' ); ?>
-
-				<?php while ( have_posts() ) the_post(); ?>
-
-					<div id="bbp-edit-page" class="bbp-edit-page">
-						<h1 class="entry-title"><?php the_title(); ?></h1>
-						<div class="entry-content">
-
-							<?php bbp_breadcrumb(); ?>
-
-							<?php if ( bbp_is_topic_merge() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/form', 'merge' ); ?>
-
-							<?php elseif ( bbp_is_topic_split() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/form', 'split' ); ?>
-
-							<?php endif; ?>
-
-						</div>
-					</div><!-- #bbp-edit-page -->
-
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>

bbpress/content-archive-forum.php

+<?php
+
+/**
+ * Archive Forum Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php do_action( 'bbp_template_before_forums_index' ); ?>
+
+	<?php if ( bbp_has_forums() ) : ?>
+
+		<?php bbp_get_template_part( 'bbpress/loop',     'forums'    ); ?>
+
+	<?php else : ?>
+
+		<?php bbp_get_template_part( 'bbpress/feedback', 'no-forums' ); ?>
+
+	<?php endif; ?>
+
+	<?php do_action( 'bbp_template_after_forums_index' ); ?>

bbpress/content-archive-topic.php

+<?php
+
+/**
+ * Archive Topic Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php do_action( 'bbp_template_before_topics_index' ); ?>
+
+	<?php if ( bbp_has_topics() ) : ?>
+
+		<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
+
+		<?php bbp_get_template_part( 'bbpress/loop',       'topics'    ); ?>
+
+		<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
+
+	<?php else : ?>
+
+		<?php bbp_get_template_part( 'bbpress/feedback',   'no-topics' ); ?>
+
+	<?php endif; ?>
+
+	<?php do_action( 'bbp_template_after_topics_index' ); ?>

bbpress/content-single-forum.php

+<?php
+
+/**
+ * Single Topic Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php if ( post_password_required() ) : ?>
+
+		<?php bbp_get_template_part( 'bbpress/form', 'protected' ); ?>
+
+	<?php else : ?>
+
+		<?php bbp_single_forum_description(); ?>
+
+		<?php if ( bbp_get_forum_subforum_count() && bbp_has_forums() ) : ?>
+
+			<?php bbp_get_template_part( 'bbpress/loop', 'forums' ); ?>
+
+		<?php endif; ?>
+
+		<?php if ( !bbp_is_forum_category() && bbp_has_topics() ) : ?>
+
+			<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
+
+			<?php bbp_get_template_part( 'bbpress/loop',       'topics'    ); ?>
+
+			<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
+
+			<?php bbp_get_template_part( 'bbpress/form',       'topic'     ); ?>
+
+		<?php elseif( !bbp_is_forum_category() ) : ?>
+
+			<?php bbp_get_template_part( 'bbpress/feedback',   'no-topics' ); ?>
+
+			<?php bbp_get_template_part( 'bbpress/form',       'topic'     ); ?>
+
+		<?php endif; ?>
+
+	<?php endif; ?>

bbpress/content-single-topic-lead.php

+<?php
+
+/**
+ * Single Topic Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<table class="bbp-topic" id="bbp-topic-<?php bbp_topic_id(); ?>">
+		<thead>
+			<tr>
+				<th class="bbp-topic-author"><?php _e( 'Creator', 'bbpress' ); ?></th>
+				<th class="bbp-topic-content">
+
+					<?php _e( 'Topic', 'bbpress' ); ?>
+
+					<?php bbp_user_subscribe_link(); ?>
+
+					<?php bbp_user_favorites_link(); ?>
+
+				</th>
+			</tr>
+		</thead>
+
+		<tfoot>
+			<tr>
+				<td colspan="2">
+
+					<?php bbp_topic_admin_links(); ?>
+
+				</td>
+			</tr>
+		</tfoot>
+
+		<tbody>
+
+			<tr class="bbp-topic-header">
+				<td colspan="2">
+
+					<?php printf( __( '%1$s at %2$s', 'bbpress' ), get_the_date(), esc_attr( get_the_time() ) ); ?>
+
+					<a href="#bbp-topic-<?php bbp_topic_id(); ?>" title="<?php bbp_topic_title(); ?>" class="bbp-topic-permalink">#<?php bbp_topic_id(); ?></a>
+
+				</td>
+			</tr>
+
+			<tr id="post-<?php bbp_topic_id(); ?>" <?php post_class( 'bbp-forum-topic' ); ?>>
+
+				<td class="bbp-topic-author">
+
+					<?php bbp_topic_author_link(); ?>
+
+					<?php if ( is_super_admin() ) : ?>
+
+						<div class="bbp-topic-ip"><?php bbp_author_ip( bbp_get_topic_id() ); ?></div>
+
+					<?php endif; ?>
+
+				</td>
+
+				<td class="bbp-topic-content">
+
+					<?php bbp_topic_content(); ?>
+
+				</td>
+
+			</tr><!-- #post-<?php bbp_topic_id(); ?> -->
+
+		</tbody>
+	</table><!-- #bbp-topic-<?php bbp_topic_id(); ?> -->

bbpress/content-single-topic.php

+native
+<?php
+
+/**
+ * Single Topic Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php do_action( 'bbp_template_before_single_topic' ); ?>
+
+	<?php if ( post_password_required() ) : ?>
+
+		<?php bbp_get_template_part( 'bbpress/form', 'protected' ); ?>
+
+	<?php else : ?>
+
+		<?php bbp_topic_tag_list(); ?>
+
+		<?php bbp_single_topic_description(); ?>
+
+		<?php if ( bbp_show_lead_topic() ) : ?>
+
+			<?php bbp_get_template_part( 'bbpress/content', 'single-topic-lead' ); ?>
+
+		<?php endif; ?>
+
+		<?php if ( bbp_get_query_name() || bbp_has_replies() ) : ?>
+
+			<?php bbp_get_template_part( 'bbpress/pagination', 'replies' ); ?>
+
+			<?php bbp_get_template_part( 'bbpress/loop',       'replies' ); ?>
+
+			<?php bbp_get_template_part( 'bbpress/pagination', 'replies' ); ?>
+
+		<?php endif; ?>
+
+		<?php bbp_get_template_part( 'bbpress/form', 'reply' ); ?>
+
+	<?php endif; ?>
+
+	<?php do_action( 'bbp_template_after_single_topic' ); ?>

bbpress/content-single-user-edit.php

+native
+<?php
+
+/**
+ * Single User Edit Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php do_action( 'bbp_template_notices' );
+
+	// Profile details
+	bbp_get_template_part( 'bbpress/user', 'details' );
+
+	// User edit form
+	bbp_get_template_part( 'bbpress/form', 'user-edit' );
+
+?>

bbpress/content-single-user.php

+<?php
+
+/**
+ * Single User Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php do_action( 'bbp_template_notices' );
+
+	// Profile details
+	bbp_get_template_part( 'bbpress/user', 'details'        );
+
+	// Subscriptions
+	bbp_get_template_part( 'bbpress/user', 'subscriptions'  );
+
+	// Favorite topics
+	bbp_get_template_part( 'bbpress/user', 'favorites'      );
+
+	// Topics created
+	bbp_get_template_part( 'bbpress/user', 'topics-created' );
+
+?>

bbpress/content-single-view.php

+native
+<?php
+
+/**
+ * Single View Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php bbp_set_query_name( 'bbp_view' ); ?>
+
+	<?php if ( bbp_view_query() ) : ?>
+
+		<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
+
+		<?php bbp_get_template_part( 'bbpress/loop',       'topics'    ); ?>
+
+		<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
+
+	<?php else : ?>
+
+		<?php bbp_get_template_part( 'bbpress/feedback',   'no-topics' ); ?>
+
+	<?php endif; ?>
+
+	<?php bbp_reset_query_name(); ?>

bbpress/css/bbpress-rtl.css

 	#bbp-your-profile fieldset legend {
 		display: none;
 	}
-	#bbp-your-profile fieldset label {
+	#content #bbp-your-profile fieldset label,
+	#container #bbp-your-profile fieldset label {
 		float: right;
 		width: 150px;
 		padding-left: 20px;
 		background-color: #f0f8ff;
 	}
 
-	#bbp-your-profile fieldset fieldset {
+	#content #bbp-your-profile fieldset fieldset,
+	#container #bbp-your-profile fieldset fieldset {
 		margin: 0;
 		width: 260px;
 		border: none;
 		padding: 0;
+		clear: none;
+		float: none;
 	}
 	#bbp-your-profile fieldset fieldset span.description {
 		margin-right: 0;

bbpress/css/bbpress.css

 	#bbp-your-profile fieldset legend {
 		display: none;
 	}
-	#bbp-your-profile fieldset label {
+	#content #bbp-your-profile fieldset label,
+	#container #bbp-your-profile fieldset label {
 		float: left;
 		width: 150px;
 		padding-right: 20px;
 		background-color: #f0f8ff;
 	}
 
-	#bbp-your-profile fieldset fieldset {
+	#content #bbp-your-profile fieldset fieldset,
+	#container #bbp-your-profile fieldset fieldset {
 		margin: 0;
 		width: 260px;
 		border: none;
 		padding: 0;
+		clear: none;
+		float: none;
 	}
 	#bbp-your-profile fieldset fieldset span.description {
 		margin-left: 0;

bbpress/feedback-logged-in.php

+<?php
+
+/**
+ * Already Logged In
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div class="bbp-template-notice info">
+	<p><?php _e( 'You are already logged in.', 'bbpress' ); ?></p>
+</div>

bbpress/feedback-no-access.php

+<?php
+
+/**
+ * No access
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="forum-private" class="bbp-forum-info">
+	<h1 class="entry-title"><?php _e( 'Private', 'bbpress' ); ?></h1>
+	<div class="entry-content">
+		<div class="bbp-template-notice info">
+			<p><?php _e( 'You do not have permission to view this forum.', 'bbpress' ); ?></p>
+		</div>
+	</div>
+</div><!-- #forum-private -->

bbpress/feedback-no-forums.php

+<?php
+
+/**
+ * Oh bother!
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div class="bbp-template-notice">
+	<p><?php _e( 'Oh bother! No forums were found here!', 'bbpress' ); ?></p>
+</div>

bbpress/feedback-no-topics.php

+<?php
+
+/**
+ * Oh bother!
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div class="bbp-template-notice">
+	<p><?php _e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></p>
+</div>

bbpress/form-merge.php

-<?php
-
-/**
- * Merge Topic
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
-
-	<div id="merge-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-merge">
-
-		<form id="merge_topic" name="merge_topic" method="post" action="">
-
-			<fieldset class="bbp-form">
-
-				<legend><?php printf( __( 'Merge topic "%s"', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
-
-				<div>
-
-					<div class="bbp-template-notice info">
-						<p><?php _e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'bbpress' ); ?></p>
-						<p><?php _e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'bbpress' ); ?></p>
-					</div>
-
-					<div class="bbp-template-notice">
-						<p><?php _e( 'All replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted. If the destination topic was created after this one, it\'s post date will be updated to second earlier than this one.', 'bbpress' ); ?></p>
-					</div>
-
-					<fieldset class="bbp-form">
-						<legend><?php _e( 'Destination', 'bbpress' ); ?></legend>
-						<div>
-							<?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
-
-								<label for="bbp_destination_topic"><?php _e( 'Merge with this topic:', 'bbpress' ); ?></label>
-
-								<?php
-									bbp_dropdown( array(
-										'post_type'   => bbp_get_topic_post_type(),
-										'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
-										'selected'    => -1,
-										'exclude'     => bbp_get_topic_id(),
-										'select_id'   => 'bbp_destination_topic',
-										'none_found'  => __( 'No topics were found to which the topic could be merged to!', 'bbpress' )
-									) );
-								?>
-
-							<?php else : ?>
-
-								<label><?php _e( 'There are no other topics in this forum to merge with.', 'bbpress' ); ?></label>
-
-							<?php endif; ?>
-
-						</div>
-					</fieldset>
-
-					<fieldset class="bbp-form">
-						<legend><?php _e( 'Topic Extras', 'bbpress' ); ?></legend>
-
-						<div>
-
-							<?php if ( bbp_is_subscriptions_active() ) : ?>
-
-								<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
-								<label for="bbp_topic_subscribers"><?php _e( 'Merge topic subscribers', 'bbpress' ); ?></label><br />
-
-							<?php endif; ?>
-
-							<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
-							<label for="bbp_topic_favoriters"><?php _e( 'Merge topic favoriters', 'bbpress' ); ?></label><br />
-
-							<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
-							<label for="bbp_topic_tags"><?php _e( 'Merge topic tags', 'bbpress' ); ?></label><br />
-
-						</div>
-					</fieldset>
-
-					<div class="bbp-template-notice error">
-						<p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
-					</div>
-
-					<div class="bbp-submit-wrapper">
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
-					</div>
-				</div>
-
-				<?php bbp_merge_topic_form_fields(); ?>
-
-			</fieldset>
-		</form>
-	</div>
-
-<?php else : ?>
-
-	<div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
-		<div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'bbpress' ) : _e( 'You cannot edit this topic.', 'bbpress' ); ?></div>
-	</div>
-
-
-<?php endif; ?>

bbpress/form-reply.php

 
 ?>
 
-<?php if ( bbp_is_reply_edit() || bbp_is_topic_open() || current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
+	<?php if ( bbp_is_reply_edit() ) : ?>
 
-	<?php if ( ( bbp_is_reply_edit() && current_user_can( 'edit_reply', bbp_get_reply_id() ) ) || ( current_user_can( 'publish_topics' ) || bbp_allow_anonymous() ) ) : ?>
+		<?php bbp_breadcrumb(); ?>
 
-		<div id="new-reply-<?php bbp_topic_id(); ?>" class="bbp-reply-form">
+	<?php endif; ?>
 
-			<form id="new-post" name="new-post" method="post" action="">
-				<fieldset class="bbp-form">
-					<legend><?php printf( __( 'Reply to: &ldquo;%s&rdquo;', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
+	<?php if ( bbp_is_reply_edit() || bbp_is_topic_open() || current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
 
-					<?php if ( !bbp_is_topic_open() && !bbp_is_reply_edit() ) : ?>
+		<?php if ( ( bbp_is_reply_edit() && current_user_can( 'edit_reply', bbp_get_reply_id() ) ) || ( current_user_can( 'publish_topics' ) || bbp_allow_anonymous() ) ) : ?>
 
-						<div class="bbp-template-notice">
-							<p><?php _e( 'This topic is marked as closed to new replies, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></p>
-						</div>
+			<div id="new-reply-<?php bbp_topic_id(); ?>" class="bbp-reply-form">
 
-					<?php endif; ?>
+				<form id="new-post" name="new-post" method="post" action="">
+					<fieldset class="bbp-form">
+						<legend><?php printf( __( 'Reply to: &ldquo;%s&rdquo;', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
 
-					<?php if ( current_user_can( 'unfiltered_html' ) ) : ?>
+						<?php if ( !bbp_is_topic_open() && !bbp_is_reply_edit() ) : ?>
 
-						<div class="bbp-template-notice">
-							<p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></p>
-						</div>
-
-					<?php endif; ?>
-
-					<?php do_action( 'bbp_template_notices' ); ?>
-
-					<div>
-
-						<div class="avatar">
-
-							<?php bbp_is_reply_edit() ? bbp_reply_author_avatar( bbp_get_reply_id(), 120 ) : bbp_current_user_avatar( 120 ); ?>
-
-						</div>
-
-						<?php bbp_get_template_part( 'bbpress/form', 'anonymous' ); ?>
-
-						<p>
-							<label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br />
-							<textarea id="bbp_reply_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_reply_content" cols="51" rows="6"><?php bbp_form_reply_content(); ?></textarea>
-						</p>
-
-						<?php if ( !current_user_can( 'unfiltered_html' ) ) : ?>
-
-							<p class="form-allowed-tags">
-								<label><?php _e( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:','bbpress' ); ?></label><br />
-								<code><?php bbp_allowed_tags(); ?></code>
-							</p>
+							<div class="bbp-template-notice">
+								<p><?php _e( 'This topic is marked as closed to new replies, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></p>
+							</div>
 
 						<?php endif; ?>
 
-						<p>
-							<label for="bbp_topic_tags"><?php _e( 'Tags:', 'bbpress' ); ?></label><br />
-							<input id="bbp_topic_tags" type="text" value="<?php bbp_form_topic_tags(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" />
-						</p>
+						<?php if ( current_user_can( 'unfiltered_html' ) ) : ?>
 
-						<?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_reply_edit() || ( bbp_is_reply_edit() && !bbp_is_reply_anonymous() ) ) ) : ?>
-
-							<p>
-
-								<input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php bbp_form_topic_subscribed(); ?> tabindex="<?php bbp_tab_index(); ?>" />
-
-								<?php if ( bbp_is_reply_edit() && $post->post_author != bbp_get_current_user_id() ) : ?>
-
-									<label for="bbp_topic_subscription"><?php _e( 'Notify the author of follow-up replies via email', 'bbpress' ); ?></label>
-
-								<?php else : ?>
-
-									<label for="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'bbpress' ); ?></label>
-
-								<?php endif; ?>
-
-							</p>
+							<div class="bbp-template-notice">
+								<p><?php _e( 'Your account has the ability to post unrestricted HTML content.', 'bbpress' ); ?></p>
+							</div>
 
 						<?php endif; ?>
 
-						<?php if ( bbp_is_reply_edit() ) : ?>
+						<?php do_action( 'bbp_template_notices' ); ?>
 
-							<fieldset class="bbp-form">
-								<legend><?php _e( 'Revision', 'bbpress' ); ?></legend>
-								<div>
-									<input name="bbp_log_reply_edit" id="bbp_log_reply_edit" type="checkbox" value="1" <?php bbp_form_reply_log_edit(); ?> tabindex="<?php bbp_tab_index(); ?>" />
-									<label for="bbp_log_reply_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />
-								</div>
+						<div>
 
-								<div>
-									<label for="bbp_reply_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
-									<input type="text" value="<?php bbp_form_reply_edit_reason(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_reply_edit_reason" id="bbp_reply_edit_reason" />
-								</div>
-							</fieldset>
+							<div class="avatar">
 
-						<?php else : ?>
+								<?php bbp_is_reply_edit() ? bbp_reply_author_avatar( bbp_get_reply_id(), 120 ) : bbp_current_user_avatar( 120 ); ?>
 
-							<?php bbp_topic_admin_links(); ?>
+							</div>
 
-						<?php endif; ?>
+							<?php bbp_get_template_part( 'bbpress/form', 'anonymous' ); ?>
 
-						<div class="bbp-submit-wrapper">
-							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+							<p>
+								<label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br />
+								<textarea id="bbp_reply_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_reply_content" cols="51" rows="6"><?php bbp_form_reply_content(); ?></textarea>
+							</p>
+
+							<?php if ( !current_user_can( 'unfiltered_html' ) ) : ?>
+
+								<p class="form-allowed-tags">
+									<label><?php _e( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:','bbpress' ); ?></label><br />
+									<code><?php bbp_allowed_tags(); ?></code>
+								</p>
+
+							<?php endif; ?>
+
+							<p>
+								<label for="bbp_topic_tags"><?php _e( 'Tags:', 'bbpress' ); ?></label><br />
+								<input id="bbp_topic_tags" type="text" value="<?php bbp_form_topic_tags(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" />
+							</p>
+
+							<?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_reply_edit() || ( bbp_is_reply_edit() && !bbp_is_reply_anonymous() ) ) ) : ?>
+
+								<p>
+
+									<input name="bbp_topic_subscription" id="bbp_topic_subscription" type="checkbox" value="bbp_subscribe"<?php bbp_form_topic_subscribed(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+
+									<?php if ( bbp_is_reply_edit() && $post->post_author != bbp_get_current_user_id() ) : ?>
+
+										<label for="bbp_topic_subscription"><?php _e( 'Notify the author of follow-up replies via email', 'bbpress' ); ?></label>
+
+									<?php else : ?>
+
+										<label for="bbp_topic_subscription"><?php _e( 'Notify me of follow-up replies via email', 'bbpress' ); ?></label>
+
+									<?php endif; ?>
+
+								</p>
+
+							<?php endif; ?>
+
+							<?php if ( bbp_is_reply_edit() ) : ?>
+
+								<fieldset class="bbp-form">
+									<legend><?php _e( 'Revision', 'bbpress' ); ?></legend>
+									<div>
+										<input name="bbp_log_reply_edit" id="bbp_log_reply_edit" type="checkbox" value="1" <?php bbp_form_reply_log_edit(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+										<label for="bbp_log_reply_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />
+									</div>
+
+									<div>
+										<label for="bbp_reply_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
+										<input type="text" value="<?php bbp_form_reply_edit_reason(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_reply_edit_reason" id="bbp_reply_edit_reason" />
+									</div>
+								</fieldset>
+
+							<?php else : ?>
+
+								<?php bbp_topic_admin_links(); ?>
+
+							<?php endif; ?>
+
+							<div class="bbp-submit-wrapper">
+								<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_reply_submit" name="bbp_reply_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+							</div>
 						</div>
-					</div>
 
-					<?php bbp_reply_form_fields(); ?>
+						<?php bbp_reply_form_fields(); ?>
 
-				</fieldset>
-			</form>
-		</div>
+					</fieldset>
+				</form>
+			</div>
+
+		<?php else : ?>
+
+			<div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply">
+				<div class="bbp-template-notice">
+					<p><?php is_user_logged_in() ? _e( 'You cannot reply to this topic.', 'bbpress' ) : _e( 'You must be logged in to reply to this topic.', 'bbpress' ); ?></p>
+				</div>
+			</div>
+
+		<?php endif; ?>
 
 	<?php else : ?>
 
 		<div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply">
 			<div class="bbp-template-notice">
-				<p><?php is_user_logged_in() ? _e( 'You cannot reply to this topic.', 'bbpress' ) : _e( 'You must be logged in to reply to this topic.', 'bbpress' ); ?></p>
+				<p><?php _e( 'This topic has been closed to new replies.', 'bbpress' ); ?></p>
 			</div>
 		</div>
 
 	<?php endif; ?>
-
-<?php else : ?>
-
-	<div id="no-reply-<?php bbp_topic_id(); ?>" class="bbp-no-reply">
-		<div class="bbp-template-notice">
-			<p><?php _e( 'This topic has been closed to new replies.', 'bbpress' ); ?></p>
-		</div>
-	</div>
-
-<?php endif; ?>

bbpress/form-split.php

-<?php
-
-/**
- * Split Topic
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
-
-	<div id="split-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-split">
-
-		<form id="split_topic" name="split_topic" method="post" action="">
-
-			<fieldset class="bbp-form">
-
-				<legend><?php printf( __( 'Split topic "%s"', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
-
-				<div>
-
-					<div class="bbp-template-notice info">
-						<p><?php _e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'bbpress' ); ?></p>
-					</div>
-
-					<div class="bbp-template-notice">
-						<p><?php _e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'bbpress' ); ?></p>
-					</div>
-
-					<fieldset class="bbp-form">
-						<legend><?php _e( 'Split Method', 'bbpress' ); ?></legend>
-
-						<div>
-							<input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" tabindex="<?php bbp_tab_index(); ?>" />
-							<label for="bbp_topic_split_option_reply"><?php printf( __( 'New topic in <strong>%s</strong> titled:', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id( bbp_get_topic_id() ) ) ); ?></label>
-							<input type="text" id="bbp_topic_split_destination_title" value="<?php printf( __( 'Split: %s', 'bbpress' ), bbp_get_topic_title() ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="35" name="bbp_topic_split_destination_title" />
-						</div>
-
-						<?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
-
-							<div>
-								<input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" tabindex="<?php bbp_tab_index(); ?>" />
-								<label for="bbp_topic_split_option_existing"><?php _e( 'Use an existing topic in this forum:', 'bbpress' ); ?></label>
-
-								<?php
-									bbp_dropdown( array(
-										'post_type'   => bbp_get_topic_post_type(),
-										'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
-										'selected'    => -1,
-										'exclude'     => bbp_get_topic_id(),
-										'select_id'   => 'bbp_destination_topic',
-										'none_found'  => __( 'No other topics found!', 'bbpress' )
-									) );
-								?>
-
-							</div>
-
-						<?php endif; ?>
-
-					</fieldset>
-
-					<fieldset class="bbp-form">
-						<legend><?php _e( 'Topic Extras', 'bbpress' ); ?></legend>
-
-						<div>
-
-							<?php if ( bbp_is_subscriptions_active() ) : ?>
-
-								<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
-								<label for="bbp_topic_subscribers"><?php _e( 'Copy subscribers to the new topic', 'bbpress' ); ?></label><br />
-
-							<?php endif; ?>
-
-							<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
-							<label for="bbp_topic_favoriters"><?php _e( 'Copy favoriters to the new topic', 'bbpress' ); ?></label><br />
-
-							<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
-							<label for="bbp_topic_tags"><?php _e( 'Copy topic tags to the new topic', 'bbpress' ); ?></label><br />
-
-						</div>
-					</fieldset>
-
-					<div class="bbp-template-notice error">
-						<p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
-					</div>
-
-					<div class="bbp-submit-wrapper">
-						<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
-					</div>
-				</div>
-
-				<?php bbp_split_topic_form_fields(); ?>
-
-			</fieldset>
-		</form>
-	</div>
-
-<?php else : ?>
-
-	<div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
-		<div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'bbpress' ) : _e( 'You cannot edit this topic.', 'bbpress' ); ?></div>
-	</div>
-
-<?php endif; ?>

bbpress/form-topic-merge.php

+<?php
+
+/**
+ * Merge Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
+
+		<div id="merge-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-merge">
+
+			<form id="merge_topic" name="merge_topic" method="post" action="">
+
+				<fieldset class="bbp-form">
+
+					<legend><?php printf( __( 'Merge topic "%s"', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
+
+					<div>
+
+						<div class="bbp-template-notice info">
+							<p><?php _e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'bbpress' ); ?></p>
+							<p><?php _e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'bbpress' ); ?></p>
+						</div>
+
+						<div class="bbp-template-notice">
+							<p><?php _e( 'All replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted. If the destination topic was created after this one, it\'s post date will be updated to second earlier than this one.', 'bbpress' ); ?></p>
+						</div>
+
+						<fieldset class="bbp-form">
+							<legend><?php _e( 'Destination', 'bbpress' ); ?></legend>
+							<div>
+								<?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
+
+									<label for="bbp_destination_topic"><?php _e( 'Merge with this topic:', 'bbpress' ); ?></label>
+
+									<?php
+										bbp_dropdown( array(
+											'post_type'   => bbp_get_topic_post_type(),
+											'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+											'selected'    => -1,
+											'exclude'     => bbp_get_topic_id(),
+											'select_id'   => 'bbp_destination_topic',
+											'none_found'  => __( 'No topics were found to which the topic could be merged to!', 'bbpress' )
+										) );
+									?>
+
+								<?php else : ?>
+
+									<label><?php _e( 'There are no other topics in this forum to merge with.', 'bbpress' ); ?></label>
+
+								<?php endif; ?>
+
+							</div>
+						</fieldset>
+
+						<fieldset class="bbp-form">
+							<legend><?php _e( 'Topic Extras', 'bbpress' ); ?></legend>
+
+							<div>
+
+								<?php if ( bbp_is_subscriptions_active() ) : ?>
+
+									<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+									<label for="bbp_topic_subscribers"><?php _e( 'Merge topic subscribers', 'bbpress' ); ?></label><br />
+
+								<?php endif; ?>
+
+								<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+								<label for="bbp_topic_favoriters"><?php _e( 'Merge topic favoriters', 'bbpress' ); ?></label><br />
+
+								<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+								<label for="bbp_topic_tags"><?php _e( 'Merge topic tags', 'bbpress' ); ?></label><br />
+
+							</div>
+						</fieldset>
+
+						<div class="bbp-template-notice error">
+							<p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+						</div>
+
+						<div class="bbp-submit-wrapper">
+							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+						</div>
+					</div>
+
+					<?php bbp_merge_topic_form_fields(); ?>
+
+				</fieldset>
+			</form>
+		</div>
+
+	<?php else : ?>
+
+		<div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+			<div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'bbpress' ) : _e( 'You cannot edit this topic.', 'bbpress' ); ?></div>
+		</div>
+
+	<?php endif; ?>

bbpress/form-topic-split.php

+<?php
+
+/**
+ * Split Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+	<?php bbp_breadcrumb(); ?>
+
+	<?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
+
+		<div id="split-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-split">
+
+			<form id="split_topic" name="split_topic" method="post" action="">
+
+				<fieldset class="bbp-form">
+
+					<legend><?php printf( __( 'Split topic "%s"', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
+
+					<div>
+
+						<div class="bbp-template-notice info">
+							<p><?php _e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'bbpress' ); ?></p>
+						</div>
+
+						<div class="bbp-template-notice">
+							<p><?php _e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'bbpress' ); ?></p>
+						</div>
+
+						<fieldset class="bbp-form">
+							<legend><?php _e( 'Split Method', 'bbpress' ); ?></legend>
+
+							<div>
+								<input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" tabindex="<?php bbp_tab_index(); ?>" />
+								<label for="bbp_topic_split_option_reply"><?php printf( __( 'New topic in <strong>%s</strong> titled:', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id( bbp_get_topic_id() ) ) ); ?></label>
+								<input type="text" id="bbp_topic_split_destination_title" value="<?php printf( __( 'Split: %s', 'bbpress' ), bbp_get_topic_title() ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="35" name="bbp_topic_split_destination_title" />
+							</div>
+
+							<?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
+
+								<div>
+									<input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" tabindex="<?php bbp_tab_index(); ?>" />
+									<label for="bbp_topic_split_option_existing"><?php _e( 'Use an existing topic in this forum:', 'bbpress' ); ?></label>
+
+									<?php
+										bbp_dropdown( array(
+											'post_type'   => bbp_get_topic_post_type(),
+											'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+											'selected'    => -1,
+											'exclude'     => bbp_get_topic_id(),
+											'select_id'   => 'bbp_destination_topic',
+											'none_found'  => __( 'No other topics found!', 'bbpress' )
+										) );
+									?>
+
+								</div>
+
+							<?php endif; ?>
+
+						</fieldset>
+
+						<fieldset class="bbp-form">
+							<legend><?php _e( 'Topic Extras', 'bbpress' ); ?></legend>
+
+							<div>
+
+								<?php if ( bbp_is_subscriptions_active() ) : ?>
+
+									<input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+									<label for="bbp_topic_subscribers"><?php _e( 'Copy subscribers to the new topic', 'bbpress' ); ?></label><br />
+
+								<?php endif; ?>
+
+								<input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+								<label for="bbp_topic_favoriters"><?php _e( 'Copy favoriters to the new topic', 'bbpress' ); ?></label><br />
+
+								<input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+								<label for="bbp_topic_tags"><?php _e( 'Copy topic tags to the new topic', 'bbpress' ); ?></label><br />
+
+							</div>
+						</fieldset>
+
+						<div class="bbp-template-notice error">
+							<p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+						</div>
+
+						<div class="bbp-submit-wrapper">
+							<button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+						</div>
+					</div>
+
+					<?php bbp_split_topic_form_fields(); ?>
+
+				</fieldset>
+			</form>
+		</div>
+
+	<?php else : ?>
+
+		<div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+			<div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'bbpress' ) : _e( 'You cannot edit this topic.', 'bbpress' ); ?></div>
+		</div>
+
+	<?php endif; ?>

bbpress/form-topic.php

 
 ?>
 
+	<?php if ( !bbp_is_forum() ) : ?>
+
+		<?php bbp_breadcrumb(); ?>
+
+	<?php endif; ?>
+
+	<?php if ( bbp_is_topic_edit() ) : ?>
+
+		<?php bbp_topic_tag_list( bbp_get_topic_id() ); ?>
+
+		<?php bbp_single_topic_description( array( 'topic_id' => bbp_get_topic_id() ) ); ?>
+
+	<?php endif; ?>
+
 	<?php if ( bbp_current_user_can_access_create_topic_form() ) : ?>
 
 		<div id="new-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-form">
 						<?php bbp_get_template_part( 'bbpress/form', 'anonymous' ); ?>
 
 						<p>
-							<label for="bbp_topic_title"><?php _e( 'Topic Title:', 'bbpress' ); ?></label><br />
-							<input type="text" id="bbp_topic_title" value="<?php bbp_form_topic_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_title" />
+							<label for="bbp_topic_title"><?php printf( __( 'Topic Title (Maximum Length: %d):', 'bbpress' ), bbp_get_title_max_length() ); ?></label><br />
+							<input type="text" id="bbp_topic_title" value="<?php bbp_form_topic_title(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_title" maxlength="<?php bbp_title_max_length(); ?>" />
 						</p>
 
 						<p>

bbpress/form-user-login.php

 			</div>
 
 			<div class="bbp-remember-me">
-				<input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ), true, true ); ?> id="rememberme" tabindex="<?php bbp_tab_index(); ?>" />
+				<input type="checkbox" name="rememberme" value="forever" <?php checked( bbp_get_sanitize_val( 'rememberme', 'checkbox' ) ); ?> id="rememberme" tabindex="<?php bbp_tab_index(); ?>" />
 				<label for="rememberme"><?php _e( 'Keep me signed in', 'bbpress' ); ?></label>
 			</div>
 
 
 			</div>
 		</fieldset>
-	</form>
+	</form>

bbpress/loop-forums.php

 
 ?>
 
+	<?php do_action( 'bbp_template_before_forums_loop' ); ?>
+
 	<table class="bbp-forums">
 
 		<thead>
 		</thead>
 
 		<tfoot>
-			<tr><td colspan="4">&nbsp;<?php // @todo - Moderation links ?></td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
 		</tfoot>
 
 		<tbody>
 		</tbody>
 
 	</table>
+
+	<?php do_action( 'bbp_template_after_forums_loop' ); ?>

bbpress/loop-replies.php

 
 ?>
 
+	<?php do_action( 'bbp_template_before_replies_loop' ); ?>
+
 	<table class="bbp-replies" id="topic-<?php bbp_topic_id(); ?>-replies">
 		<thead>
 			<tr>
 		</tbody>
 
 	</table>
+
+	<?php do_action( 'bbp_template_after_replies_loop' ); ?>

bbpress/loop-topics.php

 
 ?>
 
+	<?php do_action( 'bbp_template_before_topics_loop' ); ?>
+
 	<table class="bbp-topics" id="bbp-forum-<?php bbp_topic_id(); ?>">
 		<thead>
 			<tr>
 		</tbody>
 
 	</table><!-- #bbp-forum-<?php bbp_topic_id(); ?> -->
+
+	<?php do_action( 'bbp_template_after_topics_loop' ); ?>
+

bbpress/no-access.php

-<?php
-
-/**
- * No access
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<div id="forum-private" class="bbp-forum-info">
-	<h1 class="entry-title"><?php _e( 'Private', 'bbpress' ); ?></h1>
-	<div class="entry-content">
-		<div class="bbp-template-notice info">
-			<p><?php _e( 'You do not have permission to view this forum.', 'bbpress' ); ?></p>
-		</div>
-	</div>
-</div><!-- #forum-private -->

bbpress/no-forums.php

-<?php
-
-/**
- * Oh bother!
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<div class="bbp-template-notice">
-	<p><?php _e( 'Oh bother! No forums were found here!', 'bbpress' ); ?></p>
-</div>

bbpress/no-topics.php

-<?php
-
-/**
- * Oh bother!
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<div class="bbp-template-notice">
-	<p><?php _e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></p>
-</div>

bbpress/pagination-replies.php

 
 ?>
 
+	<?php do_action( 'bbp_template_before_pagination_loop' ); ?>
+
 	<div class="bbp-pagination">
 		<div class="bbp-pagination-count">
 
 
 		</div>
 	</div>
+
+	<?php do_action( 'bbp_template_after_pagination_loop' ); ?>

bbpress/pagination-topics.php

 
 ?>
 
+	<?php do_action( 'bbp_template_before_pagination_loop' ); ?>
+
 	<div class="bbp-pagination">
 		<div class="bbp-pagination-count">
 
 
 		</div>
 	</div>
+
+	<?php do_action( 'bbp_template_after_pagination_loop' ); ?>

bbpress/single-forum.php

-<?php
-
-/**
- * Single Forum Part
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php if ( bbp_user_can_view_forum( array( 'forum_id' => bbp_get_topic_forum_id() ) ) ) : ?>
-
-	<?php bbp_breadcrumb(); ?>
-
-	<?php bbp_single_forum_description(); ?>
-
-	<?php if ( bbp_get_forum_subforum_count() ) : ?>
-
-		<?php if ( bbp_has_forums() ) : ?>
-
-			<?php bbp_get_template_part( 'bbpress/loop', 'forums' ); ?>
-
-		<?php endif; ?>
-
-	<?php endif; ?>
-
-	<?php if ( !bbp_is_forum_category() && bbp_has_topics() ) : ?>
-
-		<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-		<?php bbp_get_template_part( 'bbpress/loop',       'topics' ); ?>
-
-		<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-		<?php bbp_get_template_part( 'bbpress/form',       'topic'  ); ?>
-
-	<?php endif; ?>
-
-<?php elseif ( bbp_is_forum_private( bbp_get_forum_id(), false ) ) : ?>
-
-	<?php bbp_get_template_part( 'bbpress/no', 'access'); ?>
-
-<?php endif; ?>

bbpress/single-topic.php

-<?php
-
-/**
- * Single Topic Part
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php if ( bbp_show_lead_topic() ) : ?>
-
-	<table class="bbp-topic" id="bbp-topic-<?php bbp_topic_id(); ?>">
-		<thead>
-			<tr>
-				<th class="bbp-topic-author"><?php _e( 'Creator', 'bbpress' ); ?></th>
-				<th class="bbp-topic-content">
-
-					<?php _e( 'Topic', 'bbpress' ); ?>
-
-					<?php bbp_user_subscribe_link(); ?>
-
-					<?php bbp_user_favorites_link(); ?>
-
-				</th>
-			</tr>
-		</thead>
-
-		<tfoot>
-			<tr>
-				<td colspan="2">
-
-					<?php bbp_topic_admin_links(); ?>
-
-				</td>
-			</tr>
-		</tfoot>
-
-		<tbody>
-
-			<tr class="bbp-topic-header">
-				<td colspan="2">
-
-					<?php printf( __( '%1$s at %2$s', 'bbpress' ), get_the_date(), esc_attr( get_the_time() ) ); ?>
-
-					<a href="#bbp-topic-<?php bbp_topic_id(); ?>" title="<?php bbp_topic_title(); ?>" class="bbp-topic-permalink">#<?php bbp_topic_id(); ?></a>
-
-				</td>
-			</tr>
-
-			<tr id="post-<?php bbp_topic_id(); ?>" <?php post_class( 'bbp-forum-topic' ); ?>>
-
-				<td class="bbp-topic-author">
-
-					<?php bbp_topic_author_link(); ?>
-
-					<?php if ( is_super_admin() ) : ?>
-
-						<div class="bbp-topic-ip"><?php bbp_author_ip( bbp_get_topic_id() ); ?></div>
-
-					<?php endif; ?>
-
-				</td>
-
-				<td class="bbp-topic-content">
-
-					<?php bbp_topic_content(); ?>
-
-				</td>
-
-			</tr><!-- #post-<?php bbp_topic_id(); ?> -->
-
-		</tbody>
-	</table><!-- #bbp-topic-<?php bbp_topic_id(); ?> -->
-
-<?php endif; ?>

bbpress/single-user.php

-<?php
-
-/**
- * Single User Part
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php do_action( 'bbp_template_notices' ); ?>
-
-<?php
-
-	// Profile details
-	bbp_get_template_part( 'bbpress/user', 'details' );
-
-	// Profile Edit
-	if ( bbp_is_user_profile_edit() ) :
-
-		// Subsciptions
-		bbp_get_template_part( 'bbpress/form', 'user-edit' );
-
-	// Profile Display
-	else :
-
-		// Subsciptions
-		bbp_get_template_part( 'bbpress/user', 'subscriptions'  );
-
-		// Favorite topics
-		bbp_get_template_part( 'bbpress/user', 'favorites'      );
-
-		// Topics created
-		bbp_get_template_part( 'bbpress/user', 'topics-created' );
-
-	endif;
-
-?>

bbpress/style.css

  * Theme URI: http://bbpress.org
  * Description: Adds bbPress forums to the Twenty Ten theme
  * Author: WordPress and bbPress teams
- * Version: 1.1
+ * Version: 1.2
  * Tags: bbpress, black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style
  * Template: twentyten
  *

bbpress/user-edit.php

-<?php
-
-/**
- * bbPress User Profile Edit
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php get_header(); ?>
-
-<?php get_template_part( 'bbp-wrapper-header' ); ?>
-
-				<?php do_action( 'bbp_template_notices' ); ?>
-
-				<?php bbp_get_template_part( 'bbpress/user', 'details' ); ?>
-
-				<div class="entry-content bbp-edit-user">
-
-					<?php bbp_get_template_part( 'bbpress/form', 'user-edit' ); ?>
-
-				</div>
-				
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>

bbpress/user.php

-<?php
-
-/**
- * User Profile
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php get_header(); ?>
-
-<?php get_template_part( 'bbp-wrapper-header' ); ?>
-
-				<div id="bbp-user-<?php bbp_current_user_id(); ?>" class="bbp-single-user">
-					<div class="entry-content">
-
-						<?php bbp_get_template_part( 'bbpress/single', 'user' ); ?>
-
-					</div><!-- .entry-content -->
-				</div><!-- #bbp-user-<?php bbp_current_user_id(); ?> -->
-
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>

bbpress/view.php

-<?php
-
-/**
- * View Handler
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-?>
-
-<?php get_header(); ?>
-
-<?php get_template_part( 'bbp-wrapper-header' ); ?>
-
-				<?php do_action( 'bbp_template_notices' ); ?>
-
-				<div id="bbp-view-<?php bbp_view_id(); ?>" class="bbp-view">
-					<h1 class="entry-title"><?php bbp_view_title(); ?></h1>
-					<div class="entry-content">
-
-						<?php bbp_breadcrumb(); ?>
-
-						<?php bbp_set_query_name( 'bbp_view' ); ?>
-
-						<?php if ( bbp_view_query() ) : ?>
-
-							<?php bbp_get_template_part( 'bbpress/loop', 'topics' ); ?>
-
-						<?php else : ?>
-
-							<p><?php _e( 'Oh bother! No topics were found here!', 'bbpress' ); ?></p>
-
-						<?php endif; ?>
-
-						<?php bbp_reset_query_name(); ?>
-
-					</div>
-				</div><!-- #bbp-view-<?php bbp_view_id(); ?> -->
-
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>

includes/functions/bbpress.php

  *
  * @uses bbp_is_topic() To check if it's the topic page
  * @uses get_stylesheet_directory_uri() To get the stylesheet directory uri
- * @uses bbp_is_user_profile_edit() To check if it's the profile edit page
+ * @uses bbp_is_single_user_edit() To check if it's the profile edit page
  * @uses wp_enqueue_script() To enqueue the scripts
  */
 function bbp_twentyten_enqueue_scripts () {
 	if ( bbp_is_topic() )
 		wp_enqueue_script( 'bbp_topic', get_stylesheet_directory_uri() . '/bbpress/js/topic.js', array( 'wp-lists' ), '20101202' );
 
-	if ( bbp_is_user_profile_edit() )
+	if ( bbp_is_single_user_edit() )
 		wp_enqueue_script( 'user-profile' );
 }
 add_action( 'wp_enqueue_scripts', 'bbp_twentyten_enqueue_scripts' );
  *
  * @uses bbp_is_topic() To check if it's the topic page
  * @uses admin_url() To get the admin url
- * @uses bbp_is_user_profile_edit() To check if it's the profile edit page
+ * @uses bbp_is_single_user_edit() To check if it's the profile edit page
  */
 function bbp_twentyten_scripts () {
 	if ( bbp_is_topic() ) : ?>
 		/* ]]> */
 	</script>
 
-	<?php elseif ( bbp_is_user_profile_edit() ) : ?>
+	<?php elseif ( bbp_is_single_user_edit() ) : ?>
 
 	<script type="text/javascript" charset="utf-8">
 		if ( window.location.hash == '#password' ) {

page-create-topic.php

 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-forum-statistics.php

 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-front-forums.php

 
 							<?php the_content(); ?>
 
-							<?php do_action( 'bbp_template_before_forums_index' ); ?>
-
-							<?php if ( bbp_has_forums() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/loop', 'forums' ); ?>
-
-							<?php else : ?>
-
-								<?php bbp_get_template_part( 'bbpress/no',   'forums' ); ?>
-
-							<?php endif; ?>
-
-							<?php do_action( 'bbp_template_after_forums_index' ); ?>
+							<?php bbp_get_template_part( 'bbpress/content', 'archive-forum' ); ?>
 
 						</div>
 					</div><!-- #forum-front -->
 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-front-topics.php

 
 							<?php the_content(); ?>
 
-							<?php bbp_breadcrumb(); ?>
-
-							<?php do_action( 'bbp_template_before_topics_index' ); ?>
-
-							<?php if ( bbp_has_topics() ) : ?>
-
-								<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-								<?php bbp_get_template_part( 'bbpress/loop',       'topics' ); ?>
-
-								<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-							<?php else : ?>
-
-								<?php bbp_get_template_part( 'bbpress/no', 'topics' ); ?>
-
-							<?php endif; ?>
-
-							<?php do_action( 'bbp_template_after_topics_index' ); ?>
+							<?php bbp_get_template_part( 'bbpress/content', 'archive-topic' ); ?>
 
 						</div>
 					</div><!-- #topics-front -->
 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-topic-tags.php

 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-topics-no-replies.php

 
 							<?php if ( bbp_has_topics( array( 'meta_key' => '_bbp_reply_count', 'meta_value' => '1', 'meta_compare' => '<', 'orderby' => 'date', 'show_stickies' => false ) ) ) : ?>
 
-								<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
+								<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
 
-								<?php bbp_get_template_part( 'bbpress/loop',       'topics' ); ?>
+								<?php bbp_get_template_part( 'bbpress/loop',       'topics'    ); ?>
 
-								<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
+								<?php bbp_get_template_part( 'bbpress/pagination', 'topics'    ); ?>
 
 							<?php else : ?>
 
-								<?php bbp_get_template_part( 'bbpress/no',         'topics' ); ?>
+								<?php bbp_get_template_part( 'bbpress/feedback',   'no-topics' ); ?>
 
 							<?php endif; ?>
 
 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-user-login.php

 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-user-lost-pass.php

 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

page-user-register.php

 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>
 							<h1 class="entry-title"><?php bbp_forum_title(); ?></h1>
 							<div class="entry-content">
 
-								<?php bbp_breadcrumb(); ?>
-
-								<?php if ( post_password_required() ) : ?>
-
-									<?php bbp_get_template_part( 'bbpress/form', 'protected' ); ?>
-
-								<?php else : ?>
-
-									<?php bbp_single_forum_description(); ?>
-
-									<?php if ( bbp_get_forum_subforum_count() && bbp_has_forums() ) : ?>
-
-										<?php bbp_get_template_part( 'bbpress/loop', 'forums' ); ?>
-
-									<?php endif; ?>
-
-									<?php if ( !bbp_is_forum_category() && bbp_has_topics() ) : ?>
-
-										<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-										<?php bbp_get_template_part( 'bbpress/loop',       'topics' ); ?>
-
-										<?php bbp_get_template_part( 'bbpress/pagination', 'topics' ); ?>
-
-										<?php bbp_get_template_part( 'bbpress/form',       'topic'  ); ?>
-
-									<?php elseif( !bbp_is_forum_category() ) : ?>
-
-										<?php bbp_get_template_part( 'bbpress/no',         'topics' ); ?>
-
-										<?php bbp_get_template_part( 'bbpress/form',       'topic'  ); ?>
-
-									<?php endif; ?>
-
-								<?php endif; ?>
+								<?php bbp_get_template_part( 'bbpress/content', 'single-forum' ); ?>
 
 							</div>
 						</div><!-- #forum-<?php bbp_forum_id(); ?> -->
 
 					<?php else : // Forum exists, user no access ?>
 
-						<?php bbp_get_template_part( 'bbpress/no', 'access' ); ?>
+						<?php bbp_get_template_part( 'bbpress/feedback', 'no-access' ); ?>
 
 					<?php endif; ?>
 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

single-reply-edit.php

+native
+<?php
+
+/**
+ * Edit handler for replies
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<?php get_header(); ?>
+
+<?php get_template_part( 'bbp-wrapper-header' ); ?>
+
+				<?php while ( have_posts() ) the_post(); ?>
+
+					<div id="bbp-edit-page" class="bbp-edit-page">
+						<h1 class="entry-title"><?php the_title(); ?></h1>
+						<div class="entry-content">
+
+							<?php bbp_breadcrumb(); ?>
+
+							<?php bbp_get_template_part( 'bbpress/form', 'reply' ); ?>
+
+						</div>
+					</div><!-- #bbp-edit-page -->
+
+			</div><!-- #content -->
+		</div><!-- #container -->
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
 
 				<?php endwhile; ?>
 
-<?php get_template_part( 'bbp-wrapper-footer' ); ?>
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

single-topic-edit.php

+<?php
+
+/**
+ * Edit handler for topics
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<?php get_header(); ?>
+
+<?php get_template_part( 'bbp-wrapper-header' ); ?>
+
+				<?php while ( have_posts() ) the_post(); ?>
+
+					<div id="bbp-edit-page" class="bbp-edit-page">
+						<h1 class="entry-title"><?php the_title(); ?></h1>
+						<div class="entry-content">
+
+							<?php bbp_get_template_part( 'bbpress/form', 'topic' ); ?>
+
+						</div>
+					</div><!-- #bbp-edit-page -->
+
+<?php get_template_part( 'bbp-wrapper-footer' ); ?>

single-topic-merge.php

+native
+<?php
+
+/**
+ * Merge topic page
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<?php get_header(); ?>
+
+<?php get_template_part( 'bbp-wrapper-header' ); ?>
+
+				<?php do_action( 'bbp_template_notices' ); ?>
+
+				<?php while ( have_posts() ) the_post(); ?>
+
+					<div id="bbp-edit-page" class="bbp-edit-page">
+						<h1 class="entry-title"><?php the_title(); ?></h1>