<!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>[965] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums: WPBBP: bbPress v2.x Theme for International Support Forums</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/965">965</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/965","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>netweb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-07 01:54:49 +0000 (Fri, 07 Nov 2014)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WPBBP: bbPress v2.x Theme for International Support Forums
* Based on bbPress/BuddyPress `bb-base` theme [https://meta.trac.wordpress.org/browser/sites/trunk/buddypress.org/public_html/wp-content /sites/trunk/buddypress.org/public_html/wp-content]

There is more to do here, this gives us a working theme to get going with now and to iterate on further as we go.

Props johnjamesjacoby, netweb. Fixes <a href="http://meta.trac.wordpress.org/ticket/376">#376</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentarchiveforumphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-forum.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopforumsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-forums.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopsingleforumphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-forum.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfooterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/footer.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsheaderphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/header.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagefrontsupportphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-front-support.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsstylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentarchivetopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingleforumphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-forum.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingletopicleadphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic-lead.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingletopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingleviewphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-view.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressfeedbacksearchphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/feedback-search.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressformtopicmergephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-merge.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressformtopicsplitphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-split.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressformtopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresslooprepliesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-replies.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopsinglereplyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-reply.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopsingletopicphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-topic.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagehomepagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsscreenshotpng">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/screenshot.png</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumssidebarphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/sidebar.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumssingleuserphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/single-user.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentarchiveforumphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-forum.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-forum.php        2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-forum.php  2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,73 +1,19 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Archive Forum Content Part
- *
- * @package WPBBP
- */
-?>
-<header class="masthead">
-       <hgroup class="hentry wrap wporg-support">
-               <h5><?php _e('We&rsquo;ve got a variety of resources to help you get the most out of WordPress. Your first stop should be our <a href="http://codex.wordpress.org">documentation</a>, where you&rsquo;ll find information on everything from installing WordPress for the first time to creating your own themes&nbsp;and&nbsp;plugins.', 'wporg'); ?></h5>
-               <h5><?php _e('If you need help getting started with WordPress, try these articles.', 'wporg'); ?>
-                       <ul>
-                               <li><?php _e('<a href="http://codex.wordpress.org/Forum_Welcome">Welcome to the WordPress Support Forum</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/New_To_WordPress_-_Where_to_Start">New to WordPress &mdash; Where to Start</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/FAQ_Installation">Frequently Asked Questions about Installing WordPress</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/Writing_Posts">Writing Posts</a>', 'wporg'); ?></li>
-                       </ul>
-               </h5>
-       </hgroup><!-- .hentry .wrap .wporg-support -->
-</header><!-- .masthead -->
-<nav class="subhead">
-       <div class="wrapper">
-               <form role="search" method="get" action="<?php bbp_search_url(); ?>">
-                       <fieldset>
-                               <label class="screen-reader-text hidden" for="bbp_search"><?php _e( 'Search for:', 'wporg' ); ?></label>
-                               <input type="hidden" name="action" value="bbp-search-request" />
-                               <label for="forumsearchbox"><?php _e('Search the Support Forums', 'wporg'); ?></label>
-                               <input type="text" class="text" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" name="bbp_search" id="forumsearchbox" />
-                               <button type="submit" class="button button-primary"><?php esc_attr_e( 'Search', 'wporg' ); ?></button>
-                       </fieldset>
-               </form>
-       </div>
-</nav>
-<section id="bbpress-forums" class="wporg-support-forumlist">
-       <div class="wrapper">
-               <h2 class="section-title"><?php bbp_breadcrumb(); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="bbpress-forums">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <article id="forums-id-tags" class="forums-id-tags">
-                       <h2><?php _e('Hot Topics', 'wporg'); ?></h2>
-                       <div class="tag-description">
-                               <p><?php wp_tag_cloud( array( 'smallest' => 12, 'largest' => 16, 'number' => 16, 'taxonomy' => bbp_get_topic_tag_tax_id() ) ); ?></p>
-                       </div><!-- . -->
-               </article><!-- .forums-id-tags -->
-               <article id="forums-id-views" class="forums-id-views">
-                       <h2><?php _e('Views', 'wporg'); ?></h2>
-                       <div class="view-description">
-                               <ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bbp_breadcrumb(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php foreach ( array_keys( bbp_get_views() ) as $view ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_action( 'bbp_template_before_forums_index' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li>
-                                                       <p><a href="<?php bbp_view_url( $view ); ?>">- <?php bbp_view_title( $view ); ?> </a></p>
-                                               </li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( bbp_has_forums() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php endforeach; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php bbp_get_template_part( 'loop',     'forums'    ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                </ul>
-                       </div><!-- . -->
-               </article><!-- .forums-id-views -->
-               <?php do_action( 'wporg_support_before_forumlist' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php else : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( bbp_has_forums() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php bbp_get_template_part( 'feedback', 'no-forums' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php bbp_get_template_part( 'loop',     'forums'    ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_action( 'bbp_template_after_forums_index' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php do_action( 'wporg_support_after_forumlist' ); ?>
-
-       </div><!-- .wrapper -->
-</section><!-- #bbpress-forums .wporg-support-forumlist -->
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentarchivetopicphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-topic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-topic.php                                (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-archive-topic.php  2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,31 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( bbp_is_forum_archive() || bbp_is_topic_archive() || bbp_is_search() ) : ?>
+
+       <div class="bbp-search-form">
+
+               <?php bbp_get_template_part( 'form', 'search' ); ?>
+
+       </div>
+
+<?php endif; ?>
+
+<div id="bbpress-forums">
+
+       <?php if ( bbp_is_topic_tag() ) bbp_topic_tag_description(); ?>
+
+       <?php do_action( 'bbp_template_before_topics_index' ); ?>
+
+       <?php if ( bbp_has_topics() ) : ?>
+
+               <?php bbp_get_template_part( 'loop',       'topics'    ); ?>
+
+               <?php bbp_get_template_part( 'pagination', 'topics'    ); ?>
+
+       <?php else : ?>
+
+               <?php bbp_get_template_part( 'feedback',   'no-topics' ); ?>
+
+       <?php endif; ?>
+
+       <?php do_action( 'bbp_template_after_topics_index' ); ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsearchphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-search.php                               (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-search.php 2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,38 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( bbp_is_forum_archive() || bbp_is_topic_archive() || bbp_is_search() ) : ?>
+
+       <div class="bbp-search-form">
+
+               <?php bbp_get_template_part( 'form', 'search' ); ?>
+
+       </div>
+
+<?php endif; ?>
+
+<div id="bbpress-forums">
+
+       <?php bbp_set_query_name( 'bbp_search' ); ?>
+
+       <?php do_action( 'bbp_template_before_search' ); ?>
+
+       <?php if ( bbp_has_search_results() ) : ?>
+
+                <?php bbp_get_template_part( 'pagination', 'search' ); ?>
+
+                <?php bbp_get_template_part( 'loop',       'search' ); ?>
+
+                <?php bbp_get_template_part( 'pagination', 'search' ); ?>
+
+       <?php elseif ( bbp_get_search_terms() ) : ?>
+
+                <?php bbp_get_template_part( 'feedback',   'no-search' ); ?>
+
+       <?php else : ?>
+
+               <?php bbp_get_template_part( 'feedback',   'search' ); ?>
+
+       <?php endif; ?>
+
+       <?php do_action( 'bbp_template_after_search_results' ); ?>
+
+</div>
+
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingleforumphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-forum.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-forum.php                         (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-forum.php   2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,46 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Single Topic Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+       <?php if ( post_password_required() ) : ?>
+
+               <?php bbp_get_template_part( 'form', 'protected' ); ?>
+
+       <?php else : ?>
+
+               <?php if ( bbp_get_forum_subforum_count() && bbp_has_forums() ) : ?>
+
+                       <?php bbp_get_template_part( 'loop', 'forums' ); ?>
+
+               <?php endif; ?>
+
+               <?php if ( !bbp_is_forum_category() && bbp_has_topics() ) : ?>
+
+                       <?php bbp_get_template_part( 'pagination', 'topics'    ); ?>
+
+                       <?php bbp_get_template_part( 'loop',       'topics'    ); ?>
+
+                       <?php bbp_get_template_part( 'pagination', 'topics'    ); ?>
+
+                       <?php if ( ! bb_base_topic_search_query( false ) ) bbp_get_template_part( 'form',       'topic'     ); ?>
+
+               <?php elseif( !bbp_is_forum_category() ) : ?>
+
+                       <?php bbp_get_template_part( 'feedback',   'no-topics' ); ?>
+
+                       <?php if ( ! bb_base_topic_search_query( false ) ) bbp_get_template_part( 'form',       'topic'     ); ?>
+
+               <?php endif; ?>
+
+       <?php endif; ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingletopicleadphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic-lead.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic-lead.php                            (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic-lead.php      2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,62 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Single Topic Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<?php do_action( 'bbp_template_before_lead_topic' ); ?>
+
+<ul id="bbp-topic-<?php bbp_topic_id(); ?>-lead" class="bbp-lead-topic">
+
+       <li class="bbp-body">
+
+               <div id="post-<?php bbp_topic_id(); ?>" <?php bbp_topic_class(); ?>>
+
+                       <div class="bbp-topic-author">
+
+                               <?php do_action( 'bbp_theme_before_topic_author_details' ); ?>
+
+                               <?php bbp_topic_author_link( array( 'sep' => '<br />', 'show_role' => true ) ); ?>
+
+                               <?php bbp_user_nicename( bbp_get_topic_author_id(), array( 'before' => '<p class="bbp-user-nicename">@', 'after' => '</p>' ) ); ?>
+
+                               <p class="bbp-topic-post-date"><a href="<?php bbp_topic_permalink(); ?>" title="#<?php bbp_topic_id(); ?>" class="bbp-topic-permalink"><?php bbp_topic_post_date( bbp_get_topic_id(), true ); ?></a></p>
+
+                               <?php if ( is_super_admin() ) : ?>
+
+                                       <?php do_action( 'bbp_theme_before_topic_author_admin_details' ); ?>
+
+                                       <div class="bbp-topic-ip"><?php bbp_author_ip( bbp_get_topic_id() ); ?></div>
+
+                                       <?php do_action( 'bbp_theme_after_topic_author_admin_details' ); ?>
+
+                               <?php endif; ?>
+
+                               <?php do_action( 'bbp_theme_after_topic_author_details' ); ?>
+
+                       </div><!-- .bbp-topic-author -->
+
+                       <div class="bbp-topic-content">
+
+                               <?php do_action( 'bbp_theme_before_topic_content' ); ?>
+
+                               <?php bbp_topic_content(); ?>
+
+                               <?php do_action( 'bbp_theme_after_topic_content' ); ?>
+
+                       </div><!-- .bbp-topic-content -->
+
+                       <?php bbp_topic_admin_links(); ?>
+
+               </div><!-- #post-<?php bbp_topic_id(); ?> -->
+
+       </li><!-- .bbp-body -->
+
+</ul><!-- #topic-<?php bbp_topic_id(); ?>-replies -->
+
+<?php do_action( 'bbp_template_after_lead_topic' ); ?>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingletopicphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic.php                         (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-topic.php   2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,48 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Single Topic Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+       <?php do_action( 'bbp_template_before_single_topic' ); ?>
+
+       <?php if ( post_password_required() ) : ?>
+
+               <?php bbp_get_template_part( 'form', 'protected' ); ?>
+
+       <?php else : ?>
+
+               <?php if ( bbp_show_lead_topic() ) : ?>
+
+                       <?php bbp_get_template_part( 'content', 'single-topic-lead' ); ?>
+
+               <?php endif; ?>
+
+               <?php if ( bbp_has_replies() ) : ?>
+
+                       <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
+
+                       <?php bbp_get_template_part( 'loop',       'replies' ); ?>
+
+                       <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
+
+               <?php elseif( bb_base_reply_search_query() ) : ?>
+
+                       <?php bbp_get_template_part( 'feedback',   'no-replies' ); ?>
+
+               <?php endif; ?>
+
+               <?php bbp_get_template_part( 'form', 'reply' ); ?>
+
+       <?php endif; ?>
+
+       <?php do_action( 'bbp_template_after_single_topic' ); ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresscontentsingleviewphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-view.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-view.php                          (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/content-single-view.php    2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,34 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Single View Content Part
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+       <?php bbp_breadcrumb(); ?>
+
+       <?php bbp_set_query_name( 'bbp_view' ); ?>
+
+       <?php if ( bbp_view_query() ) : ?>
+
+               <?php if ( 1 != bbp_get_paged() ) bbp_get_template_part( 'pagination', 'topics' ); ?>
+
+               <?php bbp_get_template_part( 'loop',       'topics'    ); ?>
+
+               <?php bbp_get_template_part( 'pagination', 'topics'    ); ?>
+
+       <?php else : ?>
+
+               <?php bbp_get_template_part( 'feedback',   'no-topics' ); ?>
+
+       <?php endif; ?>
+
+       <?php bbp_reset_query_name(); ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressfeedbacksearchphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/feedback-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/feedback-search.php                              (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/feedback-search.php        2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="bbp-template-notice">
+       <p><?php _e( 'Please enter some search terms above', 'bbpress' ); ?></p>
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressformtopicmergephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-merge.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-merge.php                             (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-merge.php       2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,115 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Merge Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+       <?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="<?php the_permalink(); ?>">
+
+                               <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 the topics will be merged chronologically. The order of the merged replies is based on the time they were posted. If the destination topic was created after this one, its post date will be updated to a 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() ),
+                                                                                       'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
+                                                                                       'selected'    => -1,
+                                                                                       'numberposts' => 100,
+                                                                                       'orderby'     => 'date',
+                                                                                       'order'       => 'DESC',
+                                                                                       'exclude'     => bbp_get_topic_id(),
+                                                                                       'select_id'   => 'bbp_destination_topic'
+                                                                               ) );
+                                                                       ?>
+
+                                                               <?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 />
+
+                                                               <?php if ( bbp_allow_topic_tags() ) : ?>
+
+                                                                       <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 />
+
+                                                               <?php endif; ?>
+
+                                                       </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" class="button 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; ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressformtopicsplitphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-split.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-split.php                             (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic-split.php       2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,118 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Split Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+       <?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="<?php the_permalink(); ?>">
+
+                               <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() ),
+                                                                                       'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
+                                                                                       'selected'    => -1,
+                                                                                       'numberposts' => 100,
+                                                                                       'orderby'     => 'date',
+                                                                                       'exclude'     => bbp_get_topic_id(),
+                                                                                       'select_id'   => 'bbp_destination_topic'
+                                                                               ) );
+                                                                       ?>
+
+                                                               </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 />
+
+                                                               <?php if ( bbp_allow_topic_tags() ) : ?>
+
+                                                                       <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 />
+
+                                                               <?php endif; ?>
+
+                                                       </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" class="button 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; ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressformtopicphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic.php                           (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/form-topic.php     2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,223 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( !bbp_is_single_forum() ) : ?>
+
+<div id="bbpress-forums">
+
+<?php endif; ?>
+
+<?php if ( bbp_current_user_can_access_create_topic_form() ) : ?>
+
+       <div id="new-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-form">
+
+               <form id="new-post" name="new-post" method="post" action="">
+
+                       <?php do_action( 'bbp_theme_before_topic_form' ); ?>
+
+                       <fieldset class="bbp-form">
+                               <legend>
+
+                                       <?php
+                                               if ( bbp_is_topic_edit() )
+                                                       printf( __( 'Now Editing &ldquo;%s&rdquo;', 'bbpress' ), bbp_get_topic_title() );
+                                               else
+                                                       bbp_is_single_forum() ? printf( __( 'Create New Topic in &ldquo;%s&rdquo;', 'bbpress' ), bbp_get_forum_title() ) : _e( 'Create New Topic', 'bbpress' );
+                                       ?>
+
+                               </legend>
+
+                               <?php do_action( 'bbp_theme_before_topic_form_notices' ); ?>
+
+                               <?php if ( ! bbp_is_topic_edit() && ! bbp_is_forum_closed() ) : ?>
+
+                                       <div class="bbp-template-notice">
+                                               <p><?php _e( 'If asking for help, please include your WordPress version, and a link to your site.',                              'bbporg' ); ?></p>
+                                               <p><?php _e( 'If you found a bug, please create a <a href="http://bbpress.trac.wordpress.org/">trac ticket</a> with detailed duplication steps.', 'bbporg' ); ?></p>
+                                       </div>
+
+                               <?php endif; ?>
+
+                               <?php if ( !bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?>
+
+                                       <div class="bbp-template-notice">
+                                               <p><?php _e( 'This forum is marked as closed to new topics, however your posting capabilities still allow you to do so.', 'bbpress' ); ?></p>
+                                       </div>
+
+                               <?php endif; ?>
+
+                               <?php if ( current_user_can( 'unfiltered_html' ) ) : ?>
+
+                                       <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>
+
+                                       <?php bbp_get_template_part( 'form', 'anonymous' ); ?>
+
+                                       <?php do_action( 'bbp_theme_before_topic_form_title' ); ?>
+
+                                       <p>
+                                               <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>
+
+                                       <?php do_action( 'bbp_theme_after_topic_form_title' ); ?>
+
+                                       <?php do_action( 'bbp_theme_before_topic_form_content' ); ?>
+
+                                       <?php if ( !function_exists( 'wp_editor' ) ) : ?>
+
+                                               <p>
+                                                       <label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br />
+                                                       <textarea id="bbp_topic_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_topic_content" cols="60" rows="6"><?php bbp_form_topic_content(); ?></textarea>
+                                               </p>
+
+                                       <?php else : ?>
+
+                                               <?php bbp_the_content( array( 'context' => 'topic' ) ); ?>
+
+                                       <?php endif; ?>
+
+                                       <?php do_action( 'bbp_theme_after_topic_form_content' ); ?>
+
+                                       <?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; ?>
+
+                                       <?php do_action( 'bbp_theme_before_topic_form_tags' ); ?>
+
+                                       <p>
+                                               <label for="bbp_topic_tags"><?php _e( 'Topic Tags:', 'bbpress' ); ?></label><br />
+                                               <input type="text" value="<?php bbp_form_topic_tags(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_tags" id="bbp_topic_tags" <?php disabled( bbp_is_topic_spam() ); ?> />
+                                       </p>
+
+                                       <?php do_action( 'bbp_theme_after_topic_form_tags' ); ?>
+
+                                       <?php if ( !bbp_is_single_forum() ) : ?>
+
+                                               <?php do_action( 'bbp_theme_before_topic_form_forum' ); ?>
+
+                                               <p>
+                                                       <label for="bbp_forum_id"><?php _e( 'Forum:', 'bbpress' ); ?></label><br />
+                                                       <?php bbp_dropdown( array( 'selected' => bbp_get_form_topic_forum() ) ); ?>
+                                               </p>
+
+                                               <?php do_action( 'bbp_theme_after_topic_form_forum' ); ?>
+
+                                       <?php endif; ?>
+
+                                       <?php if ( current_user_can( 'moderate' ) ) : ?>
+
+                                               <?php do_action( 'bbp_theme_before_topic_form_type' ); ?>
+
+                                               <p>
+
+                                                       <label for="bbp_stick_topic"><?php _e( 'Topic Type:', 'bbpress' ); ?></label><br />
+
+                                                       <?php bbp_topic_type_select(); ?>
+
+                                               </p>
+
+                                               <?php do_action( 'bbp_theme_after_topic_form_type' ); ?>
+
+                                       <?php endif; ?>
+
+                                       <?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_topic_edit() || ( bbp_is_topic_edit() && !bbp_is_topic_anonymous() ) ) ) : ?>
+
+                                               <?php do_action( 'bbp_theme_before_topic_form_subscriptions' ); ?>
+
+                                               <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_topic_edit() && ( get_the_author_meta( 'ID' ) != 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 do_action( 'bbp_theme_after_topic_form_subscriptions' ); ?>
+
+                                       <?php endif; ?>
+
+                                       <?php if ( bbp_allow_revisions() && bbp_is_topic_edit() ) : ?>
+
+                                               <?php do_action( 'bbp_theme_before_topic_form_revisions' ); ?>
+
+                                               <fieldset class="bbp-form">
+                                                       <legend><?php _e( 'Revision', 'bbpress' ); ?></legend>
+                                                       <div>
+                                                               <input name="bbp_log_topic_edit" id="bbp_log_topic_edit" type="checkbox" value="1" <?php bbp_form_topic_log_edit(); ?> tabindex="<?php bbp_tab_index(); ?>" />
+                                                               <label for="bbp_log_topic_edit"><?php _e( 'Keep a log of this edit:', 'bbpress' ); ?></label><br />
+                                                       </div>
+
+                                                       <div>
+                                                               <label for="bbp_topic_edit_reason"><?php printf( __( 'Optional reason for editing:', 'bbpress' ), bbp_get_current_user_name() ); ?></label><br />
+                                                               <input type="text" value="<?php bbp_form_topic_edit_reason(); ?>" tabindex="<?php bbp_tab_index(); ?>" size="40" name="bbp_topic_edit_reason" id="bbp_topic_edit_reason" />
+                                                       </div>
+                                               </fieldset>
+
+                                               <?php do_action( 'bbp_theme_after_topic_form_revisions' ); ?>
+
+                                       <?php endif; ?>
+
+                                       <?php do_action( 'bbp_theme_before_topic_form_submit_wrapper' ); ?>
+
+                                       <div class="bbp-submit-wrapper">
+
+                                               <?php do_action( 'bbp_theme_before_topic_form_submit_button' ); ?>
+
+                                               <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_topic_submit" name="bbp_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+
+                                               <?php do_action( 'bbp_theme_after_topic_form_submit_button' ); ?>
+
+                                       </div>
+
+                                       <?php do_action( 'bbp_theme_after_topic_form_submit_wrapper' ); ?>
+
+                               </div>
+
+                               <?php bbp_topic_form_fields(); ?>
+
+                       </fieldset>
+
+                       <?php do_action( 'bbp_theme_after_topic_form' ); ?>
+
+               </form>
+       </div>
+
+<?php elseif ( bbp_is_forum_closed() ) : ?>
+
+       <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+               <div class="bbp-template-notice">
+                       <p><?php printf( __( 'The forum &#8216;%s&#8217; is closed to new topics and replies.', 'bbpress' ), bbp_get_forum_title() ); ?></p>
+               </div>
+       </div>
+
+<?php else : ?>
+
+       <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+               <div class="bbp-template-notice">
+                       <p><?php is_user_logged_in() ? _e( 'You cannot create new topics at this time.', 'bbpress' ) : _e( 'You must be logged in to create new topics.', 'bbpress' ); ?></p>
+               </div>
+       </div>
+
+<?php endif; ?>
+
+<?php if ( !bbp_is_single_forum() ) : ?>
+
+</div>
+
+<?php endif; ?>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopforumsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-forums.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-forums.php  2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-forums.php    2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,17 +1,35 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Loop Forums Content Part
- *
- * @package WPBBP
- */
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php do_action( 'bbp_template_before_forums_loop' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php while ( bbp_forums() ) : bbp_the_forum(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<ul id="forums-list-<?php bbp_forum_id(); ?>" class="bbp-forums">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <article id="forums-list-<?php bbp_forum_id(); ?>" class="forums-id-<?php bbp_forum_id(); ?> bbp-forums">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="bbp-header">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php bbp_get_template_part( 'loop', 'single-forum' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <ul class="forum-titles">
+                       <li class="bbp-forum-info"><?php _e( 'Forum', 'bbpress' ); ?></li>
+                       <li class="bbp-forum-topic-count"><?php _e( 'Topics', 'bbpress' ); ?></li>
+                       <li class="bbp-forum-reply-count"><?php _e( 'Posts', 'bbpress' ); ?></li>
+               </ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        </article><!-- . -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </li><!-- .bbp-header -->
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endwhile; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="bbp-body">
+
+               <?php while ( bbp_forums() ) : bbp_the_forum(); ?>
+
+                       <?php bbp_get_template_part( 'loop', 'single-forum' ); ?>
+
+               <?php endwhile; ?>
+
+       </li><!-- .bbp-body -->
+
+       <li class="bbp-footer">
+
+               <div class="tr">
+                       <p class="td colspan4">&nbsp;</p>
+               </div><!-- .tr -->
+
+       </li><!-- .bbp-footer -->
+
+</ul><!-- .forums-directory -->
+
+<?php do_action( 'bbp_template_after_forums_loop' ); ?>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpresslooprepliesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-replies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-replies.php                         (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-replies.php   2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,17 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php do_action( 'bbp_template_before_replies_loop' ); ?>
+
+<ul id="topic-<?php bbp_topic_id(); ?>-replies" class="forums bbp-replies">
+
+       <li class="bbp-body">
+
+               <?php while ( bbp_replies() ) : bbp_the_reply(); ?>
+
+                       <?php bbp_get_template_part( 'loop', 'single-reply' ); ?>
+
+               <?php endwhile; ?>
+
+       </li><!-- .bbp-body -->
+
+</ul><!-- #topic-<?php bbp_topic_id(); ?>-replies -->
+
+<?php do_action( 'bbp_template_after_replies_loop' ); ?>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopsingleforumphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-forum.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-forum.php    2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-forum.php      2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,17 +1,8 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Single Forum Content Part
- *
- * @package WPBBP
- */
-?>
-<h2 id="bbp-forum-<?php bbp_forum_id(); ?>"><a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>"><?php bbp_forum_title(); ?></a></h2>
-       <div class="count-description">
-               <p>
-                       <span><?php _e( 'Topics: ', 'wporg' ); ?><?php bbp_forum_topic_count(); ?></span>
-                       <span><?php _e( 'Posts: ', 'wporg' ); ?><?php bbp_forum_post_count(); ?></span>
-               </p>
-       </div>
-       <small>
-               <p class="bbp-forum-content"><?php bbp_forum_content(); ?></p>
-       </small>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<ul id="bbp-forum-<?php bbp_forum_id(); ?>" <?php bbp_forum_class(); ?>>
+       <li class="bbp-forum-info">
+               <a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><?php bbp_forum_title(); ?></a>
+               <br><?php bbp_forum_content(); ?>
+       </li>
+       <li class="bbp-forum-topic-count"><?php bbp_forum_topic_count(); ?></li>
+       <li class="bbp-forum-reply-count"><?php bbp_forum_post_count(); ?></li>
+</ul><!-- #bbp-forum-<?php bbp_forum_id(); ?> -->
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopsinglereplyphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-reply.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-reply.php                            (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-reply.php      2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,50 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Replies Loop - Single Reply
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="post-<?php bbp_reply_id(); ?>" <?php bbp_reply_class(); ?>>
+
+       <div class="bbp-reply-author">
+
+               <?php do_action( 'bbp_theme_before_reply_author_details' ); ?>
+
+               <?php bbp_reply_author_link( array( 'sep' => '<br />', 'show_role' => true, 'size' => 100 ) ); ?>
+
+               <?php bbp_user_nicename( bbp_get_reply_author_id(), array( 'before' => '<p class="bbp-user-nicename">@', 'after' => '</p>' ) ); ?>
+
+               <p class="bbp-reply-post-date"><a href="<?php bbp_reply_url(); ?>" title="#<?php bbp_reply_id(); ?>" class="bbp-reply-permalink"><?php bbp_reply_post_date( bbp_get_reply_id(), true ); ?></a></p>
+
+               <?php if ( is_super_admin() ) : ?>
+
+                       <?php do_action( 'bbp_theme_before_reply_author_admin_details' ); ?>
+
+                       <div class="bbp-reply-ip"><?php bbp_author_ip( bbp_get_reply_id() ); ?></div>
+
+                       <?php do_action( 'bbp_theme_after_reply_author_admin_details' ); ?>
+
+               <?php endif; ?>
+
+               <?php do_action( 'bbp_theme_after_reply_author_details' ); ?>
+
+       </div><!-- .bbp-reply-author -->
+
+       <div class="bbp-reply-content">
+
+               <?php do_action( 'bbp_theme_before_reply_content' ); ?>
+
+               <?php bbp_reply_content(); ?>
+
+               <?php do_action( 'bbp_theme_after_reply_content' ); ?>
+
+       </div><!-- .bbp-reply-content -->
+
+       <?php bbp_reply_admin_links(); ?>
+
+</div><!-- #post-<?php bbp_reply_id(); ?> -->
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressloopsingletopicphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-topic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-topic.php                            (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress/loop-single-topic.php      2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,94 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<ul id="bbp-topic-<?php bbp_topic_id(); ?>" <?php bbp_topic_class(); ?>>
+
+       <li class="bbp-topic-title">
+
+               <?php if ( bbp_is_user_home() ) : ?>
+
+                       <?php if ( bbp_is_favorites() ) : ?>
+
+                               <span class="bbp-topic-action">
+
+                                       <?php do_action( 'bbp_theme_before_topic_favorites_action' ); ?>
+
+                                       <?php bbp_user_favorites_link( array( 'before' => '', 'favorite' => '+', 'favorited' => '&times;' ) ); ?>
+
+                                       <?php do_action( 'bbp_theme_after_topic_favorites_action' ); ?>
+
+                               </span>
+
+                       <?php elseif ( bbp_is_subscriptions() ) : ?>
+
+                               <span class="bbp-topic-action">
+
+                                       <?php do_action( 'bbp_theme_before_topic_subscription_action' ); ?>
+
+                                       <?php bbp_user_subscribe_link( array( 'before' => '', 'subscribe' => '+', 'unsubscribe' => '&times;' ) ); ?>
+
+                                       <?php do_action( 'bbp_theme_after_topic_subscription_action' ); ?>
+
+                               </span>
+
+                       <?php endif; ?>
+
+               <?php endif; ?>
+
+               <?php do_action( 'bbp_theme_before_topic_title' ); ?>
+
+               <a class="bbp-topic-permalink" href="<?php bbp_topic_permalink(); ?>" title="<?php bbp_topic_title(); ?>"><?php bbp_topic_title(); ?></a>
+
+               <?php do_action( 'bbp_theme_after_topic_title' ); ?>
+
+               <?php bbp_topic_pagination(); ?>
+
+               <?php do_action( 'bbp_theme_before_topic_meta' ); ?>
+
+               <p class="bbp-topic-meta">
+
+                       <?php do_action( 'bbp_theme_before_topic_started_by' ); ?>
+
+                       <span class="bbp-topic-started-by"><?php printf( __( 'Started by: %1$s', 'bbpress' ), bbp_get_topic_author_link( array( 'size' => '14' ) ) ); ?></span>
+
+                       <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
+
+                       <?php if ( !bbp_is_single_forum() || ( bbp_get_topic_forum_id() != bbp_get_forum_id() ) ) : ?>
+
+                               <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>
+
+                               <span class="bbp-topic-started-in"><?php printf( __( 'in: <a href="%1$s">%2$s</a>', 'bbpress' ), bbp_get_forum_permalink( bbp_get_topic_forum_id() ), bbp_get_forum_title( bbp_get_topic_forum_id() ) ); ?></span>
+
+                               <?php do_action( 'bbp_theme_after_topic_started_in' ); ?>
+
+                       <?php endif; ?>
+
+               </p>
+
+               <?php do_action( 'bbp_theme_after_topic_meta' ); ?>
+
+               <?php bbp_topic_row_actions(); ?>
+
+       </li>
+
+       <li class="bbp-topic-voice-count"><?php bbp_topic_voice_count(); ?></li>
+
+       <li class="bbp-topic-reply-count"><?php bbp_show_lead_topic() ? bbp_topic_reply_count() : bbp_topic_post_count(); ?></li>
+
+       <li class="bbp-topic-freshness">
+
+               <?php do_action( 'bbp_theme_before_topic_freshness_link' ); ?>
+
+               <?php bbp_topic_freshness_link(); ?>
+
+               <?php do_action( 'bbp_theme_after_topic_freshness_link' ); ?>
+
+               <p class="bbp-topic-meta">
+
+                       <?php do_action( 'bbp_theme_before_topic_freshness_author' ); ?>
+
+                       <span class="bbp-topic-freshness-author"><?php bbp_author_link( array( 'post_id' => bbp_get_topic_last_active_id(), 'size' => 14 ) ); ?></span>
+
+                       <?php do_action( 'bbp_theme_after_topic_freshness_author' ); ?>
+
+               </p>
+       </li>
+
+</ul><!-- #bbp-topic-<?php bbp_topic_id(); ?> -->
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsbbpressphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress.php      2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/bbpress.php        2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +7,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php while( have_posts() ): the_post(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div id="pagebody">
+       <div class="wrapper">
+               <div class="content">
+                       <div id="lang-guess-wrap" style="margin-bottom: 1em;"></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php the_content(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endwhile; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php the_content(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php endwhile; ?>
+
+               </div>
+
+               <?php get_sidebar(); ?>
+
+       </div>
+</div>
+
+<?php get_footer();
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/footer.php       2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/footer.php 2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,9 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * The Footer for our theme.
- *
- * @package WPBBP
- */
-?>
-
-<?php require WPORGPATH . 'footer.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The Footer for our theme.
+ *
+ * @package WPBBP
+ */
+?>
+
+<?php require WPORGPATH . 'footer.php';
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php    2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php      2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,21 +8,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Enqueue scripts and styles.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses bbp_register_view() To register the view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue existing wordpress.org/support stylesheets
</ins><span class="cx" style="display: block; padding: 0 10px">  * @link http://meta.trac.wordpress.org/browser/sites/trunk/wordpress.org/public_html/style
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_support_scripts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        wp_enqueue_style( 'wporg-support', get_stylesheet_uri() );
-       wp_enqueue_style( 'dashicons',     get_template_directory_uri() . '/css/dashicons.css' );
-       wp_enqueue_style( 'wp4-style',     get_template_directory_uri() . '/css/wp4.css'       );
-       wp_enqueue_style( 'open-sans', '//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+//       wp_enqueue_style( 'wporg-support',       get_stylesheet_uri() );
+//     wp_enqueue_style( 'wp4-style',           get_template_directory_uri() . '/css/wp4.css'       );
+//     wp_enqueue_style( 'wp4-rtl-style',       get_template_directory_uri() . '/css/wp4-rtl.css'       );
+//     wp_enqueue_style( 'iphone-style',        get_template_directory_uri() . '/css/iphone.css'        );
+       wp_enqueue_style( 'forum-wp4-style',     get_template_directory_uri() . '/css/forum-wp4.css'     );
+//     wp_enqueue_style( 'forum-wp4-rtl-style', get_template_directory_uri() . '/css/forum-wp4-rtl.css' );
+//     wp_enqueue_style( 'forum-ie7-style',     get_template_directory_uri() . '/css/forum-ie7.css'     );
+//     wp_enqueue_style( 'ie-style',            get_template_directory_uri() . '/css/ie.css'            );
+//     wp_enqueue_style( 'bbpress-style',       get_template_directory_uri() . '/css/bbpress.css'            );
+//     wp_enqueue_style( 'bbpress-rtl-style',   get_template_directory_uri() . '/css/bbpress-rtl.css'            );
+//     wp_enqueue_style( 'bbpress-wpbbp-style', get_template_directory_uri() . '/css/bbpress-wpbbp.css'            );
+//     wp_enqueue_style( 'dashicons',           get_template_directory_uri() . '/css/dashicons.css' );
+//     wp_enqueue_style( 'open-sans',           '//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'wporg_support_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Customized breadcrumb arguments
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *  Root Text: WordPress Support
- *  Custom seperator `«` and `»`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Breadcrumb Root Text: "WordPress Support"
+ * Custom seperator `«` and `»`
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @uses bbp_before_get_breadcrumb_parse_args() To parse the custom arguments
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,4 +90,177 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $classes[] = 'wporg-support';
</span><span class="cx" style="display: block; padding: 0 10px">        return $classes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'get_body_class','wporg_support_body_class' );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'get_body_class','wporg_support_body_class' );
+
+/**
+ * The Header for our theme.
+ *
+ * @package WPBBP
+ */
+function wporg_get_global_header() {
+       $GLOBALS['pagetitle'] = wp_title( '&laquo;', false, 'right' ) . ' ' . get_bloginfo( 'name' );
+       require WPORGPATH . 'header.php';
+}
+
+/** bb Base *******************************************************************/
+
+function bb_base_topic_search_form() {
+?>
+
+       <form role="search" method="get" id="searchform" action="">
+               <div>
+                       <h3><?php _e( 'Forum Search', 'bbporg'); ?></h3>
+                       <label class="screen-reader-text hidden" for="ts"><?php _e( 'Search for:', 'bbporg' ); ?></label>
+                       <input type="text" value="<?php echo bb_base_topic_search_query(); ?>" name="ts" id="ts" />
+                       <input class="button" type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'bbporg' ); ?>" />
+               </div>
+       </form>
+
+<?php
+}
+
+function bb_base_reply_search_form() {
+?>
+
+       <form role="search" method="get" id="searchform" action="">
+               <div>
+                       <h3><?php _e( 'Reply Search', 'bbporg'); ?></h3>
+                       <label class="screen-reader-text hidden" for="rs"><?php _e( 'Search for:', 'bbporg' ); ?></label>
+                       <input type="text" value="<?php echo bb_base_reply_search_query(); ?>" name="rs" id="rs" />
+                       <input class="button" type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'bbporg' ); ?>" />
+               </div>
+       </form>
+
+<?php
+}
+
+function bb_base_plugin_search_form() {
+?>
+       
+       <form role="search" method="get" id="searchform" action="">
+               <div>
+                       <h3><?php _e( 'Plugin Search', 'bbporg'); ?></h3>
+                       <label class="screen-reader-text hidden" for="ps"><?php _e( 'Search for:', 'bbporg' ); ?></label>
+                       <input type="text" value="<?php echo bb_base_plugin_search_query(); ?>" name="ps" id="ts" />
+                       <input class="button" type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'bbporg' ); ?>" />
+               </div>
+       </form>
+
+<?php
+}
+
+function bb_base_topic_search_query( $escaped = true ) {
+       
+       if ( empty( $_GET['ts'] ) ) {
+               return false;
+       }
+
+       $query = apply_filters( 'bb_base_topic_search_query', $_GET['ts'] );
+       if ( true === $escaped ) {
+               $query = stripslashes( esc_attr( $query ) );
+       }
+
+       return $query;
+}
+
+function bb_base_reply_search_query( $escaped = true ) {
+       
+       if ( empty( $_GET['rs'] ) ) {
+               return false;
+       }
+
+       $query = apply_filters( 'bb_base_reply_search_query', $_GET['rs'] );
+       if ( true === $escaped ) {
+               $query = stripslashes( esc_attr( $query ) );
+       }
+
+       return $query;
+}
+
+function bb_base_plugin_search_query( $escaped = true ) {
+       
+       if ( empty( $_GET['ps'] ) ) {
+               return false;
+       }
+
+       $query = apply_filters( 'bb_base_plugin_search_query', $_GET['ps'] );
+       if ( true === $escaped ) {
+               $query = stripslashes( esc_attr( $query ) );
+       }
+
+       return $query;
+}
+
+function bb_base_single_topic_description() {
+
+       // Validate topic_id
+       $topic_id = bbp_get_topic_id();
+
+       // Unhook the 'view all' query var adder
+       remove_filter( 'bbp_get_topic_permalink', 'bbp_add_view_all' );
+
+       // Build the topic description
+       $voice_count = bbp_get_topic_voice_count   ( $topic_id, true );
+       $reply_count = bbp_get_topic_replies_link  ( $topic_id );
+       $time_since  = bbp_get_topic_freshness_link( $topic_id );
+
+       // Singular/Plural
+       $voice_count = sprintf( _n( '%s participant', '%s participants', $voice_count, 'bbpress' ), bbp_number_format( $voice_count ) );
+       $last_reply  = bbp_get_topic_last_active_id( $topic_id );
+
+       ?>
+
+       <li class="topic-forum">In: <a href="<?php bbp_forum_permalink( bbp_get_topic_forum_id() ); ?>"><?php bbp_topic_forum_title(); ?></a></li>
+       <?php if ( !empty( $reply_count ) ) : ?><li class="reply-count"><?php echo $reply_count; ?></li><?php endif; ?>
+       <?php if ( !empty( $voice_count ) ) : ?><li class="voice-count"><?php echo $voice_count; ?></li><?php endif; ?>
+       <?php if ( !empty( $last_reply  ) ) : ?>
+               <li class="topic-freshness-author"><?php printf( __( 'Last reply from: %s', 'bbporg' ), bbp_get_author_link( array( 'type' => 'name', 'post_id' => $last_reply, 'size' => '15' ) ) ); ?></li>
+       <?php endif; ?>
+       <?php if ( !empty( $time_since  ) ) : ?><li class="topic-freshness-time"><?php printf( __( 'Last activity: %s', 'bbporg' ), $time_since ); ?></li><?php endif; ?>
+       <?php if ( is_user_logged_in() ) : ?>
+               <?php $_topic_id = bbp_is_reply_edit() ? bbp_get_reply_topic_id() : $topic_id; ?>
+               <li class="topic-subscribe"><?php bbp_topic_subscription_link( array( 'before' => '', 'topic_id' => $_topic_id ) ); ?></li>
+               <li class="topic-favorite"><?php bbp_topic_favorite_link( array( 'topic_id' => $_topic_id ) ); ?></li>
+       <?php endif;
+}
+
+function bb_base_single_forum_description() {
+
+       // Validate forum_id
+       $forum_id = bbp_get_forum_id();
+
+       // Unhook the 'view all' query var adder
+       remove_filter( 'bbp_get_forum_permalink', 'bbp_add_view_all' );
+
+       // Get some forum data
+       $topic_count = bbp_get_forum_topic_count( $forum_id, true, true );
+       $reply_count = bbp_get_forum_reply_count( $forum_id, true, true );
+       $last_active = bbp_get_forum_last_active_id( $forum_id );
+
+       // Has replies
+       if ( !empty( $reply_count ) ) {
+               $reply_text = sprintf( _n( '%s reply', '%s replies', $reply_count, 'bbpress' ), bbp_number_format( $reply_count ) );
+       }
+
+       // Forum has active data
+       if ( !empty( $last_active ) ) {
+               $topic_text      = bbp_get_forum_topics_link( $forum_id );
+               $time_since      = bbp_get_forum_freshness_link( $forum_id );
+
+       // Forum has no last active data
+       } else {
+               $topic_text      = sprintf( _n( '%s topic', '%s topics', $topic_count, 'bbpress' ), bbp_number_format( $topic_count ) );
+       }
+       ?>
+
+       <?php if ( bbp_get_forum_parent_id() ) : ?><li class="topic-parent">In: <a href="<?php bbp_forum_permalink( bbp_get_forum_parent_id() ); ?>"><?php bbp_forum_title( bbp_get_forum_parent_id() ); ?></a></li><?php endif; ?>
+       <?php if ( !empty( $topic_count ) ) : ?><li class="topic-count"><?php echo $topic_text; ?></li><?php endif; ?>
+       <?php if ( !empty( $reply_count ) ) : ?><li class="reply-count"><?php echo $reply_text; ?></li><?php endif; ?>
+       <?php if ( !empty( $last_active  ) ) : ?>
+               <li class="forum-freshness-author"><?php printf( __( 'Last post by: %s', 'bbporg' ), bbp_get_author_link( array( 'type' => 'name', 'post_id' => $last_active ) ) ); ?></li>
+       <?php endif; ?>
+       <?php if ( !empty( $time_since  ) ) : ?><li class="forum-freshness-time"><?php printf( __( 'Last activity: %s', 'bbporg' ), $time_since ); ?></li><?php endif; ?>
+       <?php if ( is_user_logged_in() ) : ?>
+               <li class="forum-subscribe"><?php bbp_forum_subscription_link( array( 'forum_id' => $forum_id ) ); ?></li>
+       <?php endif;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/header.php       2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/header.php 2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,21 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * The Header for our theme.
- *
- * @package WPBBP
- */
-$GLOBALS['pagetitle'] = wp_title( '&laquo;', false, 'right' ) . ' ' . get_bloginfo( 'name' );
-require WPORGPATH . 'header.php';
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php wporg_get_global_header(); ?>
+
+<div id="headline">
+       <div class="wrapper">
+               <h2><a href="<?php bbp_forums_url(); ?>">Forums</a></h2>
+               <p class="login">
+                       <?php if ( is_user_logged_in() ) : ?>
+                               <?php echo sprintf( esc_html__( 'Howdy, %s', 'wporg' ), '<a href="' . bbp_get_user_profile_url( bbp_get_current_user_id() ) . '">' . bbp_get_current_user_name() . '</a>' ); ?>
+
+                               <small>(
+                               <?php if ( bbp_is_user_keymaster() ) : ?>
+                                       <a href="<?php echo esc_url( admin_url() ); ?>"><?php esc_html_e( 'Admin', 'wporg' ); ?></a> |
+                               <?php endif; ?>
+                                       <a href="<?php bbp_logout_url(); ?>"><?php esc_html_e( 'Sign Out', 'wporg' ); ?></a>
+                               )</small><br>
+                       <?php else : ?>
+                               
+                       <?php endif; ?>
+               </p>
+       </div>
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagefrontsupportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-front-support.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-front-support.php   2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-front-support.php     2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,94 +1,79 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Template Name: bbPress - Support (Index) page-front-support.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Template Name: Fooooo
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @package WPBBP
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @package bbPress
+ * @subpackage Theme
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> get_header(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<header class="masthead">
-       <hgroup class="hentry wrap wporg-support">
-               <h5><?php _e('We&rsquo;ve got a variety of resources to help you get the most out of WordPress. Your first stop should be our <a href="http://codex.wordpress.org">documentation</a>, where you&rsquo;ll find information on everything from installing WordPress for the first time to creating your own themes&nbsp;and&nbsp;plugins.', 'wporg'); ?></h5>
-               <h5><?php _e('If you need help getting started with WordPress, try these articles.', 'wporg'); ?>
-                       <ul>
-                               <li><?php _e('<a href="http://codex.wordpress.org/Forum_Welcome">Welcome to the WordPress Support Forum</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/New_To_WordPress_-_Where_to_Start">New to WordPress &mdash; Where to Start</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/FAQ_Installation">Frequently Asked Questions about Installing WordPress</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>', 'wporg'); ?></li>
-                               <li><?php _e('<a href="http://codex.wordpress.org/Writing_Posts">Writing Posts</a>', 'wporg'); ?></li>
-                       </ul>
-               </h5>
-       </hgroup><!-- .hentry .wrap .wporg-support -->
-</header><!-- .masthead -->
-<nav class="subhead">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<div id="pagebody">
</ins><span class="cx" style="display: block; padding: 0 10px">         <div class="wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <form role="search" method="get" action="<?php bbp_search_url(); ?>">
-                       <fieldset>
-                               <label class="screen-reader-text hidden" for="bbp_search"><?php _e( 'Search for:', 'wporg' ); ?></label>
-                               <input type="hidden" name="action" value="bbp-search-request" />
-                               <label for="forumsearchbox"><?php _e('Search the Support Forums', 'wporg'); ?></label>
-                               <input type="text" class="text" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" name="bbp_search" id="forumsearchbox" />
-                               <button type="submit" class="button button-primary"><?php esc_attr_e( 'Search', 'wporg' ); ?></button>
-                       </fieldset>
-               </form>
-       </div>
-</nav>
-<section id="bbpress-forums" class="wporg-support-forumlist">
-       <div class="wrapper">
-               <h2 class="section-title"><?php bbp_breadcrumb(); ?></h2>
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <article id="forums-id-tags" class="forums-id-tags">
-                       <h2><?php _e('Hot Topics', 'wporg'); ?></h2>
-                       <div class="tag-description">
-                               <p><?php wp_tag_cloud( array( 'smallest' => 12, 'largest' => 16, 'number' => 16, 'taxonomy' => bbp_get_topic_tag_tax_id() ) ); ?></p>
-                       </div><!-- . -->
-               </article><!-- .forums-id-tags -->
-               <article id="forums-id-views" class="forums-id-views">
-                       <h2><?php _e('Views', 'wporg'); ?></h2>
-                       <div class="view-description">
-                               <ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php do_action( 'bbp_before_main_content' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php foreach ( array_keys( bbp_get_views() ) as $view ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php do_action( 'bbp_template_notices' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                <li>
-                                                       <p><a href="<?php bbp_view_url( $view ); ?>">- <?php bbp_view_title( $view ); ?> </a></p>
-                                               </li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div class="col-6" id="forum-welcome">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php endforeach; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <p class="intro"><?php _e('We&rsquo;ve got a variety of resources to help you get the most out of WordPress. Your first stop should be our <a href="http://codex.wordpress.org">documentation</a>, where you&rsquo;ll find information on everything from installing WordPress for the first time to creating your own themes&nbsp;and&nbsp;plugins.', 'wporg'); ?></p>
+                       <h3><?php _e('Getting Started Resources', 'wporg'); ?></h3>
+                       <p><?php _e('If you need help getting started with WordPress, try these articles.', 'wporg'); ?></p>
+                       <ul>
+                               <li><?php _e('<a href="//codex.wordpress.org/Forum_Welcome">Welcome to the WordPress Support Forum</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/New_To_WordPress_-_Where_to_Start">New to WordPress &mdash; Where to Start</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/FAQ_Installation">Frequently Asked Questions about Installing WordPress</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/Writing_Posts">Writing Posts</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//make.wordpress.org/support/handbook/">Support Handbook</a>', 'wporg'); ?></li>
+                       </ul>
+                       <h3><?php _e('Search the Support Forums', 'wporg'); ?></h3>
+                       <p><?php _e('Enter a few words that describe the problem you&rsquo;re having.', 'wporg'); ?></p>
+                       <form id="forumsearch" method="get" action="<?php bbp_search_url(); ?>">
+                               <input name="search" class="text" id="forumsearchbox" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" type="text">
+                               <input id="go" name="go" class="button" value="<?php esc_attr_e( 'Search', 'wporg' ); ?>" type="submit">
+                               <input value="1" name="forums" type="hidden">
+                       </form>
+                       <h3><?php _e('Hot Topics', 'wporg'); ?></h3>
+                       <p class="frontpageheatmap">
+                               <?php wp_tag_cloud( array( 'smallest' => 14, 'largest' => 24, 'number' => 22, 'taxonomy' => bbp_get_topic_tag_tax_id() ) ); ?>
+                       </p>
+               </div><!-- #forum-welcome -->
+               <div class="col-6">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                </ul>
-                       </div><!-- . -->
-               </article><!-- .forums-id-views -->
-               <?php do_action( 'wporg_support_before_forumlist' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div id="bbpress-forums">
+                               <?php bbp_get_template_part( 'loop', 'forums' ); ?>
+                       </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( bbp_has_forums() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div id="viewdiv">
+                               <ul id="views">
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php while ( bbp_forums() ) : bbp_the_forum(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <article id="forums-list-<?php bbp_forum_id(); ?>" class="forums-id-<?php bbp_forum_id(); ?> bbp-forums">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $view_iterator = 0;
+                                       $topic_views   = array_keys( array_reverse( bbp_get_views() ) );
+                                       $view_count    = count( $topic_views );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <h2 id="bbp-forum-<?php bbp_forum_id(); ?>"><a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>"><?php bbp_forum_title(); ?></a></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 foreach ( $topic_views as $view ) : $view_iterator++; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <div class="count-description">
-                                               <p>
-                                                       <span><?php _e( 'Topics: ', 'wporg' ); ?><?php bbp_forum_topic_count(); ?></span>
-                                                       <span><?php _e( 'Posts: ', 'wporg' ); ?><?php bbp_forum_post_count(); ?></span>
-                                               </p>
-                                       </div>
-                                       <small>
-                                               <p class="bbp-forum-content"><?php bbp_forum_content(); ?></p>
-                                       </small>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <li class="view"><a href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                </article><!-- . -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php if ( $view_iterator < $view_count ) : ?>|<?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php endwhile; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php endforeach;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Unset variables
+                                       unset( $view_count, $topic_views ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php do_action( 'wporg_support_after_forumlist' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         </ul>
+                       </div><!-- #viewdiv -->
+               </div><!-- #col-6 -->
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        </div><!-- .wrapper -->
-</section><!-- #bbpress-forums .wporg-support-forumlist -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php do_action( 'bbp_after_main_content' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php get_footer(); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div><!-- #wrapper -->
+</div><!-- #pagebody -->
+
+<?php get_footer();
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagehomepagephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php                                (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php  2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,76 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Template Name: bbPress - Support (Index)
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+get_header(); ?>
+
+<div id="pagebody">
+       <div class="wrapper">
+
+               <?php do_action( 'bbp_before_main_content' ); ?>
+
+               <?php do_action( 'bbp_template_notices' ); ?>
+
+               <div class="col-6" id="forum-welcome">
+
+                       <p class="intro"><?php _e('We&rsquo;ve got a variety of resources to help you get the most out of WordPress. Your first stop should be our <a href="http://codex.wordpress.org">documentation</a>, where you&rsquo;ll find information on everything from installing WordPress for the first time to creating your own themes&nbsp;and&nbsp;plugins.', 'wporg'); ?></p>
+                       <h3><?php _e('Getting Started Resources', 'wporg'); ?></h3>
+                       <p><?php _e('If you need help getting started with WordPress, try these articles.', 'wporg'); ?></p>
+                       <ul>
+                               <li><?php _e('<a href="//codex.wordpress.org/Forum_Welcome">Welcome to the WordPress Support Forum</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/New_To_WordPress_-_Where_to_Start">New to WordPress &mdash; Where to Start</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/FAQ_Installation">Frequently Asked Questions about Installing WordPress</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>', 'wporg'); ?></li>
+                               <li><?php _e('<a href="//codex.wordpress.org/Writing_Posts">Writing Posts</a>', 'wporg'); ?></li>
+                       </ul>
+                       <h3><?php _e('Search the Support Forums', 'wporg'); ?></h3>
+                       <p><?php _e('Enter a few words that describe the problem you&rsquo;re having.', 'wporg'); ?></p>
+                       <form id="forumsearch" method="get" action="<?php bbp_search_url(); ?>">
+                               <input name="search" class="text" id="forumsearchbox" value="<?php echo esc_attr( bbp_get_search_terms() ); ?>" type="text">
+                               <input id="go" name="go" class="button" value="<?php esc_attr_e( 'Search', 'wporg' ); ?>" type="submit">
+                               <input value="1" name="forums" type="hidden">
+                       </form>
+                       <h3><?php _e('Hot Topics', 'wporg'); ?></h3>
+                       <p class="frontpageheatmap">
+                               <?php wp_tag_cloud( array( 'smallest' => 14, 'largest' => 24, 'number' => 22, 'taxonomy' => bbp_get_topic_tag_tax_id() ) ); ?>
+                       </p>
+               </div><!-- #forum-welcome -->
+               <div class="col-6">
+
+                       <?php bbp_get_template_part( 'content', 'archive-forum' ); ?>
+
+                       <div id="viewdiv">
+                               <ul id="views">
+
+                                       <?php
+
+                                       $view_iterator = 0;
+                                       $topic_views   = array_keys( array_reverse( bbp_get_views() ) );
+                                       $view_count    = count( $topic_views );
+
+                                       foreach ( $topic_views as $view ) : $view_iterator++; ?>
+
+                                               <li class="view"><a href="<?php bbp_view_url( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
+
+                                               <?php if ( $view_iterator < $view_count ) : ?>|<?php endif; ?>
+
+                                       <?php endforeach;
+
+                                       // Unset variables
+                                       unset( $view_count, $topic_views ); ?>
+
+                               </ul>
+                       </div><!-- #viewdiv -->
+               </div><!-- #col-6 -->
+
+               <?php do_action( 'bbp_after_main_content' ); ?>
+
+       </div><!-- #wrapper -->
+</div><!-- #pagebody -->
+
+<?php get_footer();
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumspagephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page.php                         (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page.php   2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,29 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The template for displaying all pages.
+ *
+ * This is the template that displays all pages by default.
+ * Please note that this is the WordPress construct of pages
+ * and that other 'pages' on your WordPress site will use a
+ * different template.
+ *
+ * @package _s
+ */
+
+get_header(); ?>
+
+<div id="pagebody">
+       <div class="wrapper">
+               <div id="lang-guess-wrap" style="margin-bottom: 1em;"></div>
+
+                       <?php while ( have_posts() ) : the_post(); ?>
+
+                               <?php the_content(); ?>
+
+                       <?php endwhile; // end of the loop. ?>
+
+       </div>
+</div>
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsscreenshotpng"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/screenshot.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/screenshot.png
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/screenshot.png      2014-11-07 01:42:23 UTC (rev 964)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/screenshot.png       2014-11-07 01:54:49 UTC (rev 965)
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/screenshot.png
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mime-type</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+application/octet-stream
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumssidebarphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/sidebar.php                              (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/sidebar.php        2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,124 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="sidebar">
+
+       <?php if ( function_exists( 'is_bbpress' ) && ( is_bbpress() ) || is_page( 'new-topic' ) ) : ?>
+       
+               <?php if ( bbp_is_single_forum() || bb_base_topic_search_query( false ) ) : ?>
+
+                       <div>
+                               <h3><?php _e( 'Forum Info', 'bbporg'); ?></h3>
+                               <ul class="forum-info">
+                                       <?php bb_base_single_forum_description(); ?>
+                               </ul>
+                       </div>
+
+                       <?php bb_base_topic_search_form(); ?>
+
+                       <div>
+                               <h3><?php _e( 'Forum Feeds', 'bbporg'); ?></h3>
+                               <ul class="forum-feeds">
+                                       <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/" title="Forum Posts">Recent Posts</a></li>
+                                       <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic" title="Forum Topics">Recent Topics</a></li>
+                               </ul>
+                       </div>
+
+               <?php elseif ( bbp_is_single_topic() || bbp_is_topic_edit() || bbp_is_reply_edit() ) : ?>
+
+                       <div>
+                               <h3><?php _e( 'Topic Info', 'bbporg'); ?></h3>
+                               <ul class="topic-info">
+                                       <?php bb_base_single_topic_description(); ?>
+                               </ul>
+                       </div>
+
+                       <div>
+                               <?php bbp_topic_tag_list( 0, array(
+                                       'before' => '<h3>Topic Tags</h3><ul class="topic-tags"><li>',
+                                       'after'  => '</li></ul>',
+                                       'sep'    => '</li><li>',
+                               ) ); ?>
+                       </div>
+
+                       <?php bb_base_reply_search_form(); ?>
+
+                       <?php if ( current_user_can( 'moderate', bbp_get_topic_id() ) ) : ?>
+
+                               <div>
+                                       <?php bbp_topic_admin_links( array (
+                                               'id'     => bbp_get_topic_id(),
+                                               'before' => '<h3>Topic Admin</h3><ul class="topic-admin-links"><li>',
+                                               'after'  => '</li></ul>',
+                                               'sep'    => '</li><li>',
+                                               'links'  => array()
+                                       ) ); ?>
+                               </div>
+
+                       <?php endif; ?>
+
+               <?php elseif ( ! bbp_is_single_user() ) : ?>
+
+                       <div>
+                               <h3><?php _e( 'Forums', 'bbporg'); ?></h3>
+                               <?php echo do_shortcode( '[bbp-forum-index]' ); ?>
+                       </div>
+                       <hr class="hidden" />
+
+                       <div>
+                               <h3><?php _e( 'Views', 'bbporg'); ?></h3>
+                               <ul class="topic-views">
+
+                                       <?php foreach ( bbp_get_views() as $view => $args ) : ?>
+
+                                               <li><a class="bbp-view-title" href="<?php bbp_view_url( $view ); ?>" title="<?php bbp_view_title( $view ); ?>"><?php bbp_view_title( $view ); ?></a></li>
+
+                                       <?php endforeach; ?>
+
+                               </ul>
+                       </div>
+
+                       <div>
+                               <h3><?php _e( 'Feeds', 'bbporg'); ?></h3>
+                               <ul class="forum-feeds">
+                                       <li><a class="feed" href="<?php bbp_forums_url(); ?>feed/" title="All Recent Posts">All Recent Posts</a></li>
+                                       <li><a class="feed" href="<?php bbp_topics_url(); ?>feed/" title="All Recent Topics">All Recent Topics</a></li>
+                               </ul>
+                       </div>
+
+                       <div>
+                               <h3><?php _e( 'Tags', 'bbporg'); ?></h3>
+                               <?php echo do_shortcode( '[bbp-topic-tags]' ); ?>
+                       </div>
+
+               <?php endif; ?>
+
+       <?php elseif ( is_front_page() || is_404() ) : ?>
+
+               <div class="feature">
+                       <h3><?php _e('WordPress', 'bbporg'); ?></h3>
+                       <p><a href="http://wordpress.org"><img width="78" height="58" alt="" src="<?php echo get_template_directory_uri(); ?>/images/wordpress.gif"/></a>The world&#8217;s most powerful web publishing software.</p>
+               </div>
+               <div class="feature">
+                       <h3><?php _e('bbPress', 'bbporg'); ?></h3>
+                       <p><a href="http://bbpress.org"><img width="78" height="58" alt="" src="<?php echo get_template_directory_uri(); ?>/images/bbpress.gif"/></a>Simple and elegant forum software from the creators of WordPress.</p>
+               </div>
+               <div style="margin-right: 0pt;" class="feature">
+                       <h3><?php _e('BuddyPress', 'bbporg'); ?></h3>
+                       <p><a href="http://buddypress.org"><img width="78" height="58" alt="" src="<?php echo get_template_directory_uri(); ?>/images/buddypress.gif"/></a>Create a fully featured niche social-network with a few easy clicks.</p>
+               </div>
+
+       <?php elseif ( ( ! is_page( 'login' ) && ! is_page( 'register' ) && ! is_page( 'lost-password' ) ) || is_home() || is_singular( 'post' ) || is_archive() ) : ?>
+
+               <div>
+                       <h3><?php _e( 'Categories', 'bbporg'); ?></h3>
+                       <ul class="blog-categories">
+                               <?php wp_list_categories( array( 'title_li' => false ) ); ?>
+                       </ul>
+               </div>
+
+               <div>
+                       <h3><?php _e( 'Tags', 'bbporg'); ?></h3>
+                       <?php wp_tag_cloud(); ?>
+               </div>
+
+       <?php endif; ?>
+
+</div>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumssingleuserphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/single-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/single-user.php                          (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/single-user.php    2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,15 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php get_header(); ?>
+
+<div id="pagebody">
+       <div class="wrapper">
+               <div id="bbp-user-<?php bbp_current_user_id(); ?>" class="bbp-single-user">
+                       <div class="entry-content">
+
+                               <?php bbp_get_template_part( 'content', 'single-user' ); ?>
+
+                       </div><!-- .entry-content -->
+               </div><!-- #bbp-user-<?php bbp_current_user_id(); ?> -->
+       </div>
+</div>
+
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css        2014-11-07 01:42:23 UTC (rev 964)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css  2014-11-07 01:54:49 UTC (rev 965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,29 +1,35 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
-Theme Name: WPBBP
-Theme URI: http://wordpress.org/
-Author: The WordPress & bbPress teams
-Author URI: http://wordpress.org/
-Description: A theme for bbPress v2.x Support Forums on wordpress.org sites
-Version: 1.0
-License: GNU General Public License v2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: WordPress, bbPress, Support, Forums
-Text Domain: wpbbp
-Domain Path: /languages/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Theme Name: WPBBP
+ * Theme URI: http://wordpress.org/
+ * Author: The WordPress & bbPress teams
+ * Author URI: http://wordpress.org/
+ * Description: A theme for bbPress v2.x Support Forums on wordpress.org sites
+ * Version: 1.0
+ * License: GNU General Public License v2 or later
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ * Tags: WordPress, bbPress, Support, Forums
+ * Text Domain: wpbbp
+ * Domain Path: /languages/
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-This theme, like WordPress, is licensed under the GPL.
-Use it to make something cool, have fun, and share what you've learned with others.
-*/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * This theme, like WordPress, is licensed under the GPL.
+ * Use it to make something cool, have fun, and share what you've learned with others.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> html,
</span><span class="cx" style="display: block; padding: 0 10px"> body {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        background: #efefef;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background: #fff;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#headline {
+       background: #f7f7f7;
+       border-bottom: 1px solid #dfdfdf;       
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * 1.0 Dashicons
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> body #headline h2 a:before {
</span><span class="cx" style="display: block; padding: 0 10px">        -webkit-font-smoothing: antialiased;
</span><span class="cx" style="display: block; padding: 0 10px">        display: inline-block;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,31 +39,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> body #headline h2 a:before { content: '\f110'; }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-section.wporg-support-forumlist article h2:before {
-       font-family: 'dashicons';
-       content: '\f110';
-       margin-right: 0.4em;
-       vertical-align: -3px;
-       font-weight:normal;
-}
-
-section.wporg-support-forumlist article.forums-id-tags  h2:before { content: '\f323'; }
-section.wporg-support-forumlist article.forums-id-views h2:before { content: '\f177'; }
-section.wporg-support-forumlist article.forums-id-7     h2:before { content: '\f107'; }
-section.wporg-support-forumlist article.forums-id-17    h2:before { content: '\f339'; }
-section.wporg-support-forumlist article.forums-id-19    h2:before { content: '\f100'; }
-section.wporg-support-forumlist article.forums-id-21    h2:before { content: '\f106'; }
-section.wporg-support-forumlist article.forums-id-23    h2:before { content: '\f308'; }
-section.wporg-support-forumlist article.forums-id-25    h2:before { content: '\f118'; }
-section.wporg-support-forumlist article.forums-id-27    h2:before { content: '\f112'; }
-section.wporg-support-forumlist article.forums-id-29    h2:before { content: '\f102'; }
-section.wporg-support-forumlist article.forums-id-31    h2:before { content: '\f120'; }
-section.wporg-support-forumlist article.forums-id-33    h2:before { content: '\f223'; }
-section.wporg-support-forumlist article.forums-id-35    h2:before { content: '\f175'; }
-section.wporg-support-forumlist article.forums-id-37    h2:before { content: '\f220'; }
-section.wporg-support-forumlist article.forums-id-39    h2:before { content: '\f307'; }
-section.wporg-support-forumlist article.forums-id-41    h2:before { content: '\f473'; }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * 2.0 Accesability
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,284 +65,39 @@
</span><span class="cx" style="display: block; padding: 0 10px">        clear: both;
</span><span class="cx" style="display: block; padding: 0 10px">        height: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.wrapper {
-       display: inline-block;
-}
-/* start commented backslash hack \*/
-* html .wrapper { height: 1%; }
-.wrapper { display: block; }
-/* close commented backslash hack */
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-* 4.0 header.masthead
-*/
-header.masthead {
-       clear: both;
-       background: rgb(1, 116, 162);
-       border: 1px solid rgb(6, 122, 166);
-       border-width: 1px 0;
-       position: relative;
-       overflow: hidden;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 4.0 Overrides
+ */
+@media only screen and (min-width: 960px) {
+       #bbpress-forums {
+               margin-left: 20px;
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header.masthead > .wrap {
-       max-width: 950px;
-       padding: 20px 10px;
-       margin: 0 auto;
-       overflow: hidden;
-       position: relative;
-       z-index: 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .col-6 #bbpress-forums {
+               margin-left: 0;
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header.masthead img {
-       float: right;
-       display: block;
-       border: 3px solid #fff;
-       box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-       margin-left: 40px;
-       max-width: 98%;
-       max-width: calc( 100% - 6px );
-       height: auto;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#bbpress-forums li.bbp-forum-info {
+       width: 60%;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header.masthead h1 {
-       float: left;
-       font-size: 24px;
-       line-height: 1.5;
-       color: #fff;
-       font-family: 'Open Sans', sans-serif;
-       font-weight: 100;
-       max-width: 48%;
-       margin: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#bbpress-forums li.bbp-forum-topic-count,
+#bbpress-forums li.bbp-forum-reply-count {
+       width: 20%;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header.masthead h5 {
-       float: left;
-       margin: 0 5px 10px;
-       font-family: 'Open Sans', sans-serif;
-       font-weight: 300;
-       color: #fff;
-       font-size: 16px;
-       line-height: 1.5;
-       width: 450px;
-       width: calc( 100% / 2 - 10px );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#pagebody ul.forum-info,
+#pagebody ul.forum-feeds,
+#pagebody ul.topic-info,
+#pagebody ul.topic-tags,
+#pagebody ul.topic-views,
+#pagebody ul.topic-admin-links {
+       margin-left: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-header.masthead ul {
-       font-size: 14px;
-       line-height: 1.5;
-       font-family: 'Open Sans', sans-serif;
-       font-weight: 100;
-       padding: 0px 20px;
-}
-
-header.masthead ul li {
-       margin-right: 10px;
-}
-
-header.masthead ul li a {
-       color: #fff;
-       font-weight: 100;
-}
-
-header.masthead ul li a:hover {
-       opacity: 0.8;
-}
-
-header.masthead ul ul {
-       display: none;
-}
-
-/**
-* 5.0 nav.subhead ===
-*/
-
-nav.subhead {
-       background: rgb(51, 51, 51);
-       border-top: 1px solid #0a4c6b;
-       border-bottom: 1px solid #003245;
-       position: relative;
-}
-
-nav.subhead .nav-menu ul {
-       float: left;
-       padding: 5px 0;
-       margin: 0 auto;
-       font-family: 'Open Sans', sans-serif;
-       font-weight: 300;
-       font-size: 16px;
-}
-
-nav.subhead .nav-menu ul li {
-       display: inline-block;
-       margin-right: 10px;
-}
-
-nav.subhead .nav-menu ul li a {
-       color: #fff;
-       text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.4);
-       text-decoration: none;
-       display: inline-block;
-       padding: 5px 10px;
-}
-
-nav.subhead .nav-menu ul li a:hover {
-       opacity: 0.8;
-}
-
-nav.subhead .nav-menu ul ul {
-       display: none;
-}
-
-nav.subhead form {
-       float: right;
-       display: block;
-       padding: 2px 10px 8px;
-}
-
-nav.subhead form fieldset {
-       display: block;
-       height: 23px;
-       padding-bottom: 9px;
-}
-
-nav.subhead form label {
-       color: #fff;
-       display: inline-block;
-       font-size: 14px;
-       padding: 9px 5px 0;
-}
-
-nav.subhead input[type=text] {
-       display: inline-block;
-       background: rgb(18, 18, 18);
-       border: 0;
-       border-bottom: 1px solid rgb(78, 78, 78);
-       color: #aaa;
-       padding: 5px;
-       font-size: 12px;
-       vertical-align: baseline;
-}
-
-nav.subhead button {
-       display: inline-block;
-}
-
-/**
-* 6.0 section.wporg-support-forumlist
-*/
-
-section.wporg-support-forumlist {
-       padding: 20px 0 60px;
-}
-
-section.wporg-support-forumlist h2 {
-       font-family: "Open Sans", sans-serif;
-       font-weight: 600;
-       padding-bottom: 0.5em;
-}
-
-section.wporg-support-forumlist h2.section-title {
-       padding: 20px 10px;
-}
-
-section.wporg-support-forumlist article {
-       margin: 10px;
-       padding: 20px;
-       width: 420px;
-       width: calc( 100% / 2 - 60px );
-       font-size: 1.5em;
-       background: #fff;
-       float: left;
-       box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-       -webkit-transition: none 0.4s ease;
-       -moz-transition: none 0.4s ease;
-       -ms-transition: none 0.4s ease;
-       -o-transition: none 0.4s ease;
-       transition: none 0.4s ease;
-       -webkit-transition-property: background, box-shadow;
-       -moz-transition-property: background, box-shadow;
-       -ms-transition-property: background, box-shadow;
-       -o-transition-property: background, box-shadow;
-       transition-property: background, box-shadow;
-}
-
-section.wporg-support-forumlist article:hover {
-       background: #fcfcfc;
-       box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
-}
-
-section.wporg-support-forumlist article:nth-of-type(odd) {
-       clear: left;
-}
-
-section.wporg-support-forumlist article h2 a {
-       font-weight: 600;
-       color: #444444;
-}
-
-section.wporg-support-forumlist article div.tag-description p,
-section.wporg-support-forumlist article div.view-description p {
-       display: inline;
-       font-size: 1em;
-       line-height: 1.5;
-}
-
-section.wporg-support-forumlist article div.count-description p {
-       display: inline;
-       font-size: 1em;
-       line-height: 1.5;
-}
-
-section.wporg-support-forumlist article small {
-       display: block;
-       font-size: 0.8em;
-       font-style: italic;
-       opacity: 0.5;
-       padding-top: 0.5em;
-}
-
-section.wporg-support-forumlist article small p {
-       line-height: 1.5;
-}
-
-@media ( max-width: 960px ) {
-       section.wporg-support-forumlist article {
-               width: 43%;
-               width: calc( 100% / 2 - 60px );
-       }
-}
-
-@media ( max-width: 600px ) {
-
-       header.masthead img {
-               float: none;
-               margin: 0 auto 10px;
-       }
-
-       header.masthead h5 {
-               width: 90%;
-               width: calc( 100% - 60px );
-               float: none;
-       }
-
-       nav.subhead ul,
-       nav.subhead form {
-               float: none;
-               text-align: center;
-       }
-
-       nav.subhead form fieldset {
-               height: auto;
-       }
-
-       nav.subhead form label {
-               display: block;
-       }
-
-       section.wporg-support-forumlist article {
-               width: 90%;
-               width: calc( 100% - 60px );
-               float: none;
-       }
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#pagebody ul a.feed {
+       background: none;
+       padding-left: 0;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>