<!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][3912] trunk/bp-themes/bp-default: Normalize single topic and topic/post edit templates, and clean up associated CSS</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>3912</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 14:45:58 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Normalize single topic and topic/post edit templates, and clean up associated CSS</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumeditphp">trunk/bp-themes/bp-default/groups/single/forum/edit.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumtopicphp">trunk/bp-themes/bp-default/groups/single/forum/topic.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglehomephp">trunk/bp-themes/bp-default/groups/single/home.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (3911 => 3912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-01-24 14:34:53 UTC (rev 3911)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-01-24 14:45:58 UTC (rev 3912)
</span><span class="lines">@@ -1880,7 +1880,7 @@
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> ul#topic-post-list {
</span><del>- margin: 15px -20px;
</del><ins>+ margin: 0px -19px 15px;
</ins><span class="cx"> width: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1890,7 +1890,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul#topic-post-list li.alt {
</span><del>- background: #f4f4f4;
</del><ins>+ background: #f8f8f8;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul#topic-post-list li div.poster-meta {
</span><span class="lines">@@ -1910,19 +1910,20 @@
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-div#topic-meta div.admin-links {
- bottom: 0;
- right: 0;
- top: auto;
-}
-
</del><span class="cx"> div#topic-meta {
</span><ins>+ padding: 5px 19px 30px;
+ margin: -10px -19px;
</ins><span class="cx"> position: relative;
</span><del>- padding: 5px 0;
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+div#topic-meta div.admin-links {
+ right: 19px;
+ top: -36px;
+}
+
</ins><span class="cx"> div#topic-meta h3 {
</span><span class="cx"> font-size: 20px;
</span><ins>+ margin: 5px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#new-topic-post {
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumeditphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum/edit.php (3911 => 3912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum/edit.php 2011-01-24 14:34:53 UTC (rev 3911)
+++ trunk/bp-themes/bp-default/groups/single/forum/edit.php 2011-01-24 14:45:58 UTC (rev 3912)
</span><span class="lines">@@ -1,16 +1,41 @@
</span><del>-<?php do_action( 'bp_before_group_forum_edit_form' ) ?>
</del><ins>+<?php do_action( 'bp_before_group_forum_edit_form' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_has_forum_topic_posts() ) : ?>
</span><span class="cx">
</span><del>- <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">
</del><ins>+ <form action="<?php bp_forum_topic_action(); ?>" method="post" id="forum-topic-form" class="standard-form">
</ins><span class="cx">
</span><ins>+ <div class="item-list-tabs" id="subnav" role="navigation">
+ <ul>
+ <li>
+ <a href="#post-topic-reply">&darr; <?php _e( 'Reply', 'buddypress' ); ?></a>
+ </li>
+
+ <?php if ( !bp_forum_directory_is_disabled() ) : ?>
+
+ <li>
+ <a href="<?php bp_forum_directory_permalink(); ?>"><?php _e( 'Forum Directory', 'buddypress'); ?></a>
+ </li>
+
+ <?php endif; ?>
+
+ </ul>
+ </div>
+
</ins><span class="cx"> <div id="topic-meta">
</span><del>- <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
- <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a>
</del><ins>+ <h3><?php _e( 'Edit:', 'buddypress' ); ?> <?php bp_the_topic_title(); ?> (<?php bp_the_topic_total_post_count(); ?>)</h3>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
</span><del>- <div class="admin-links"><?php bp_the_topic_admin_links() ?></div>
</del><ins>+
+ <div class="last admin-links">
+
+ <?php bp_the_topic_admin_links(); ?>
+
+ </div>
+
</ins><span class="cx"> <?php endif; ?>
</span><ins>+
+ <?php do_action( 'bp_group_forum_topic_meta' ); ?>
+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_group_is_member() ) : ?>
</span><span class="lines">@@ -19,39 +44,35 @@
</span><span class="cx">
</span><span class="cx"> <div id="edit-topic">
</span><span class="cx">
</span><del>- <?php do_action( 'bp_group_before_edit_forum_topic' ) ?>
</del><ins>+ <?php do_action( 'bp_group_before_edit_forum_topic' ); ?>
</ins><span class="cx">
</span><del>- <p><strong><?php _e( 'Edit Topic:', 'buddypress' ) ?></strong></p>
</del><ins>+ <label for="topic_title"><?php _e( 'Title:', 'buddypress' ); ?></label>
+ <input type="text" name="topic_title" id="topic_title" value="<?php bp_the_topic_title(); ?>" />
</ins><span class="cx">
</span><del>- <label for="topic_title"><?php _e( 'Title:', 'buddypress' ) ?></label>
- <input type="text" name="topic_title" id="topic_title" value="<?php bp_the_topic_title() ?>" />
</del><ins>+ <label for="topic_text"><?php _e( 'Content:', 'buddypress' ); ?></label>
+ <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text(); ?></textarea>
</ins><span class="cx">
</span><del>- <label for="topic_text"><?php _e( 'Content:', 'buddypress' ) ?></label>
- <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text() ?></textarea>
</del><ins>+ <?php do_action( 'bp_group_after_edit_forum_topic' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_group_after_edit_forum_topic' ) ?>
</del><ins>+ <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" /></p>
</ins><span class="cx">
</span><del>- <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" /></p>
</del><ins>+ <?php wp_nonce_field( 'bp_forums_edit_topic' ); ?>
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'bp_forums_edit_topic' ) ?>
-
</del><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="cx"> <div id="edit-post">
</span><span class="cx">
</span><del>- <?php do_action( 'bp_group_before_edit_forum_post' ) ?>
</del><ins>+ <?php do_action( 'bp_group_before_edit_forum_post' ); ?>
</ins><span class="cx">
</span><del>- <p><strong><?php _e( 'Edit Post:', 'buddypress' ) ?></strong></p>
</del><ins>+ <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text(); ?></textarea>
</ins><span class="cx">
</span><del>- <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text() ?></textarea>
-
</del><span class="cx"> <?php do_action( 'bp_group_after_edit_forum_post' ) ?>
</span><span class="cx">
</span><del>- <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" /></p>
</del><ins>+ <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ); ?>" /></p>
</ins><span class="cx">
</span><del>- <?php wp_nonce_field( 'bp_forums_edit_post' ) ?>
</del><ins>+ <?php wp_nonce_field( 'bp_forums_edit_post' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -64,9 +85,9 @@
</span><span class="cx"> <?php else: ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span><del>- <p><?php _e( 'This topic does not exist.', 'buddypress' ) ?></p>
</del><ins>+ <p><?php _e( 'This topic does not exist.', 'buddypress' ); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php endif;?>
</span><span class="cx">
</span><del>-<?php do_action( 'bp_after_group_forum_edit_form' ) ?>
</del><ins>+<?php do_action( 'bp_after_group_forum_edit_form' ); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumtopicphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum/topic.php (3911 => 3912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum/topic.php 2011-01-24 14:34:53 UTC (rev 3911)
+++ trunk/bp-themes/bp-default/groups/single/forum/topic.php 2011-01-24 14:45:58 UTC (rev 3912)
</span><span class="lines">@@ -1,32 +1,57 @@
</span><del>-<?php do_action( 'bp_before_group_forum_topic' ) ?>
</del><ins>+<?php do_action( 'bp_before_group_forum_topic' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_has_forum_topic_posts() ) : ?>
</span><span class="cx">
</span><span class="cx"> <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">
</span><span class="cx">
</span><del>- <div class="pagination no-ajax">
</del><ins>+ <div class="item-list-tabs" id="subnav" role="navigation">
+ <ul>
+ <li>
+ <a href="#post-topic-reply">&darr; <?php _e( 'Reply', 'buddypress' ) ?></a>
+ </li>
</ins><span class="cx">
</span><del>- <div id="post-count" class="pag-count">
- <?php bp_the_topic_pagination_count() ?>
- </div>
</del><ins>+ <?php if ( !bp_forum_directory_is_disabled() ) : ?>
</ins><span class="cx">
</span><del>- <div class="pagination-links" id="topic-pag">
- <?php bp_the_topic_pagination() ?>
- </div>
</del><ins>+ <li>
+ <a href="<?php bp_forum_directory_permalink() ?>"><?php _e( 'Forum Directory', 'buddypress') ?></a>
+ </li>
</ins><span class="cx">
</span><ins>+ <?php endif; ?>
+
+ </ul>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="topic-meta">
</span><span class="cx"> <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
</span><del>- <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <?php if ( !bp_forum_directory_is_disabled() ) : ?><a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a><?php endif; ?>
</del><span class="cx">
</span><del>- <div class="admin-links">
- <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
</del><ins>+ <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
+
+ <div class="last admin-links">
+
</ins><span class="cx"> <?php bp_the_topic_admin_links() ?>
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php do_action( 'bp_group_forum_topic_meta' ); ?>
</del><ins>+ </div>
+
+ <?php endif; ?>
+
+ <?php do_action( 'bp_group_forum_topic_meta' ); ?>
+
+ </div>
+
+ <div class="pagination no-ajax">
+
+ <div id="post-count" class="pag-count">
+
+ <?php bp_the_topic_pagination_count() ?>
+
</ins><span class="cx"> </div>
</span><ins>+
+ <div class="pagination-links" id="topic-pag">
+
+ <?php bp_the_topic_pagination() ?>
+
+ </div>
+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_forum_topic_posts' ) ?>
</span><span class="lines">@@ -115,6 +140,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </form><!-- #forum-topic-form -->
</span><ins>+
</ins><span class="cx"> <?php else: ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/home.php (3911 => 3912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/home.php 2011-01-24 14:34:53 UTC (rev 3911)
+++ trunk/bp-themes/bp-default/groups/single/home.php 2011-01-24 14:45:58 UTC (rev 3912)
</span><span class="lines">@@ -1,73 +1,79 @@
</span><del>-<?php get_header() ?>
</del><ins>+<?php get_header(); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><ins>+
</ins><span class="cx"> <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_home_content' ) ?>
</span><span class="cx">
</span><span class="cx"> <div id="item-header" role="complementary">
</span><del>- <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
</del><ins>+
+ <?php locate_template( array( 'groups/single/group-header.php' ), true ); ?>
+
</ins><span class="cx"> </div><!-- #item-header -->
</span><span class="cx">
</span><span class="cx"> <div id="item-nav">
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <?php bp_get_options_nav() ?>
</del><span class="cx">
</span><del>- <?php do_action( 'bp_group_options_nav' ) ?>
</del><ins>+ <?php bp_get_options_nav(); ?>
+
+ <?php do_action( 'bp_group_options_nav' ); ?>
+
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- #item-nav -->
</span><span class="cx">
</span><span class="cx"> <div id="item-body">
</span><del>- <?php do_action( 'bp_before_group_body' ) ?>
</del><span class="cx">
</span><del>- <?php if ( bp_is_group_admin_page() && bp_group_is_visible() ) : ?>
- <?php locate_template( array( 'groups/single/admin.php' ), true ) ?>
</del><ins>+ <?php do_action( 'bp_before_group_body' );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_group_members() && bp_group_is_visible() ) : ?>
- <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
</del><ins>+ if ( bp_is_group_admin_page() && bp_group_is_visible() ) :
+ locate_template( array( 'groups/single/admin.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_group_invites() && bp_group_is_visible() ) : ?>
- <?php locate_template( array( 'groups/single/send-invites.php' ), true ) ?>
</del><ins>+ elseif ( bp_is_group_members() && bp_group_is_visible() ) :
+ locate_template( array( 'groups/single/members.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_group_forum() && bp_group_is_visible() ) : ?>
- <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
</del><ins>+ elseif ( bp_is_group_invites() && bp_group_is_visible() ) :
+ locate_template( array( 'groups/single/send-invites.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_group_membership_request() ) : ?>
- <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
</del><ins>+ elseif ( bp_is_group_forum() && bp_group_is_visible() ) :
+ locate_template( array( 'groups/single/forum.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_group_is_visible() && bp_is_active( 'activity' ) ) : ?>
- <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
</del><ins>+ elseif ( bp_is_group_membership_request() ) :
+ locate_template( array( 'groups/single/request-membership.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( !bp_group_is_visible() ) : ?>
- <?php /* The group is not visible, show the status message */ ?>
</del><ins>+ elseif ( bp_group_is_visible() && bp_is_active( 'activity' ) ) :
+ locate_template( array( 'groups/single/activity.php' ), true );
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_group_status_message' ) ?>
</del><ins>+ elseif ( !bp_group_is_visible() ) :
+ // The group is not visible, show the status message
</ins><span class="cx">
</span><ins>+ do_action( 'bp_before_group_status_message' ); ?>
+
</ins><span class="cx"> <div id="message" class="info">
</span><del>- <p><?php bp_group_status_message() ?></p>
</del><ins>+ <p><?php bp_group_status_message(); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_group_status_message' ) ?>
</del><ins>+ <?php do_action( 'bp_after_group_status_message' );
</ins><span class="cx">
</span><del>- <?php else : ?>
- <?php
- /* If nothing sticks, just load a group front template if one exists. */
- locate_template( array( 'groups/single/front.php' ), true );
- ?>
- <?php endif; ?>
</del><ins>+ else :
+ // If nothing sticks, just load a group front template if one exists.
+ locate_template( array( 'groups/single/front.php' ), true );
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_after_group_body' ) ?>
</del><ins>+ endif;
+
+ do_action( 'bp_after_group_body' ); ?>
+
</ins><span class="cx"> </div><!-- #item-body -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_group_home_content' ) ?>
</del><ins>+ <?php do_action( 'bp_after_group_home_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php endwhile; endif; ?>
</span><ins>+
</ins><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>- <?php get_sidebar() ?>
-
-<?php get_footer() ?>
</del><ins>+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
</ins></span></pre>
</div>
</div>
</body>
</html>