<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5388] trunk/bp-themes/bp-default/groups/single/forum/topic.php: Rearrange groups/single/forum/topic.php template so that admin links and reply markup appears even when, because of a malfunction, there are no posts in the topic.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5388">5388</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-27 16:16:12 +0000 (Sun, 27 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rearrange groups/single/forum/topic.php template so that admin links and reply markup appears even when, because of a malfunction, there are no posts in the topic. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3675">#3675</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumtopicphp">trunk/bp-themes/bp-default/groups/single/forum/topic.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultgroupssingleforumtopicphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum/topic.php (5387 => 5388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum/topic.php 2011-11-27 16:05:49 UTC (rev 5387)
+++ trunk/bp-themes/bp-default/groups/single/forum/topic.php 2011-11-27 16:16:12 UTC (rev 5388)
</span><span class="lines">@@ -1,56 +1,56 @@
</span><span class="cx"> <?php do_action( 'bp_before_group_forum_topic' ); ?>
</span><span class="cx">
</span><del>-<?php if ( bp_has_forum_topic_posts() ) : ?>
-
- <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">
-
- <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
- <ul>
- <?php if ( is_user_logged_in() ) : ?>
-
- <li>
- <a href="<?php bp_forum_topic_new_reply_link() ?>" class="new-reply-link"><?php _e( 'New Reply', 'buddypress' ) ?></a>
- </li>
-
- <?php endif; ?>
-
- <?php if ( bp_forums_has_directory() ) : ?>
-
- <li>
- <a href="<?php bp_forums_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress') ?></a>
- </li>
-
- <?php endif; ?>
-
- </ul>
- </div>
-
- <div id="topic-meta">
- <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
-
- <?php if ( bp_forum_topic_has_tags() ) : ?>
-
- <div class="topic-tags">
-
- <?php _e( 'Topic tags:', 'buddypress' ) ?> <?php bp_forum_topic_tag_list() ?>
-
- </div>
-
</del><ins>+<form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">
+ <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
+ <ul>
+ <?php if ( is_user_logged_in() ) : ?>
+
+ <li>
+ <a href="<?php bp_forum_topic_new_reply_link() ?>" class="new-reply-link"><?php _e( 'New Reply', 'buddypress' ) ?></a>
+ </li>
+
</ins><span class="cx"> <?php endif; ?>
</span><del>-
- <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
-
- <div class="last admin-links">
-
- <?php bp_the_topic_admin_links() ?>
-
- </div>
-
</del><ins>+
+ <?php if ( bp_forums_has_directory() ) : ?>
+
+ <li>
+ <a href="<?php bp_forums_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress') ?></a>
+ </li>
+
</ins><span class="cx"> <?php endif; ?>
</span><ins>+
+ </ul>
+ </div>
+
+ <div id="topic-meta">
+ <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
+
+ <?php if ( bp_forum_topic_has_tags() ) : ?>
+
+ <div class="topic-tags">
+
+ <?php _e( 'Topic tags:', 'buddypress' ) ?> <?php bp_forum_topic_tag_list() ?>
+
+ </div>
+
+ <?php endif; ?>
+
+ <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
+
+ <div class="last admin-links">
+
+ <?php bp_the_topic_admin_links() ?>
+
+ </div>
+
+ <?php endif; ?>
+
+ <?php do_action( 'bp_group_forum_topic_meta' ); ?>
+
+ </div>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_group_forum_topic_meta' ); ?>
</del><span class="cx">
</span><del>- </div>
</del><ins>+ <?php if ( bp_has_forum_topic_posts() ) : ?>
</ins><span class="cx">
</span><span class="cx"> <div class="pagination no-ajax">
</span><span class="cx">
</span><span class="lines">@@ -113,54 +113,54 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( ( is_user_logged_in() && 'public' == bp_get_group_status() ) || bp_group_is_member() ) : ?>
</del><ins>+ <?php else: ?>
+
+ <div id="message" class="info">
+ <p><?php _e( 'There are no posts for this topic.', 'buddypress' ) ?></p>
+ </div>
+
+ <?php endif;?>
</ins><span class="cx">
</span><del>- <?php if ( bp_get_the_topic_is_last_page() ) : ?>
</del><ins>+ <?php if ( ( is_user_logged_in() && 'public' == bp_get_group_status() ) || bp_group_is_member() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( bp_get_the_topic_is_topic_open() && !bp_group_is_user_banned() ) : ?>
</del><ins>+ <?php if ( bp_get_the_topic_is_last_page() ) : ?>
</ins><span class="cx">
</span><del>- <div id="post-topic-reply">
- <p id="post-reply"></p>
</del><ins>+ <?php if ( bp_get_the_topic_is_topic_open() && !bp_group_is_user_banned() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
- <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ) ?></p>
- <?php endif; ?>
</del><ins>+ <div id="post-topic-reply">
+ <p id="post-reply"></p>
</ins><span class="cx">
</span><del>- <?php do_action( 'groups_forum_new_reply_before' ) ?>
</del><ins>+ <?php if ( bp_groups_auto_join() && !bp_group_is_member() ) : ?>
+ <p><?php _e( 'You will auto join this group when you reply to this topic.', 'buddypress' ) ?></p>
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <h4><?php _e( 'Add a reply:', 'buddypress' ) ?></h4>
</del><ins>+ <?php do_action( 'groups_forum_new_reply_before' ) ?>
</ins><span class="cx">
</span><del>- <textarea name="reply_text" id="reply_text"></textarea>
</del><ins>+ <h4><?php _e( 'Add a reply:', 'buddypress' ) ?></h4>
</ins><span class="cx">
</span><del>- <div class="submit">
- <input type="submit" name="submit_reply" id="submit" value="<?php _e( 'Post Reply', 'buddypress' ) ?>" />
- </div>
</del><ins>+ <textarea name="reply_text" id="reply_text"></textarea>
</ins><span class="cx">
</span><del>- <?php do_action( 'groups_forum_new_reply_after' ) ?>
-
- <?php wp_nonce_field( 'bp_forums_new_reply' ) ?>
</del><ins>+ <div class="submit">
+ <input type="submit" name="submit_reply" id="submit" value="<?php _e( 'Post Reply', 'buddypress' ) ?>" />
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php elseif ( !bp_group_is_user_banned() ) : ?>
</del><ins>+ <?php do_action( 'groups_forum_new_reply_after' ) ?>
</ins><span class="cx">
</span><del>- <div id="message" class="info">
- <p><?php _e( 'This topic is closed, replies are no longer accepted.', 'buddypress' ) ?></p>
- </div>
</del><ins>+ <?php wp_nonce_field( 'bp_forums_new_reply' ) ?>
+ </div>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <?php elseif ( !bp_group_is_user_banned() ) : ?>
</ins><span class="cx">
</span><ins>+ <div id="message" class="info">
+ <p><?php _e( 'This topic is closed, replies are no longer accepted.', 'buddypress' ) ?></p>
+ </div>
+
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- </form><!-- #forum-topic-form -->
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>-<?php else: ?>
</del><ins>+</form><!-- #forum-topic-form -->
</ins><span class="cx">
</span><del>- <div id="message" class="info">
- <p><?php _e( 'There are no posts for this topic.', 'buddypress' ) ?></p>
- </div>
-
-<?php endif;?>
-
</del><span class="cx"> <?php do_action( 'bp_after_group_forum_topic' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>