<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2197] trunk: Default theme css fixes and template updates.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2197</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-18 09:34:41 +0000 (Fri, 18 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Default theme css fixes and template updates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumeditphp">trunk/bp-themes/bp-default/groups/single/forum/edit.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumphp">trunk/bp-themes/bp-default/groups/single/forum.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglehomephp">trunk/bp-themes/bp-default/groups/single/home.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglepluginsphp">trunk/bp-themes/bp-default/groups/single/plugins.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglehomephp">trunk/bp-themes/bp-default/members/single/home.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglepluginsphp">trunk/bp-themes/bp-default/members/single/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-core/bp-core-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx"> function bp_is_user_activity() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_ACTIVITY_SLUG == $bp->current_component && ( !$bp->current_action || 'my-activity' == $bp->current_action ) )
</del><ins>+ if ( BP_ACTIVITY_SLUG == $bp->current_component )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1451,7 +1451,7 @@
</span><span class="cx"> function bp_is_user_groups() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_GROUPS_SLUG == $bp->current_component && ( !$bp->current_action || 'my-groups' == $bp->current_action ) )
</del><ins>+ if ( BP_GROUPS_SLUG == $bp->current_component )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1521,6 +1521,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_is_group_forum_topic_edit() {
+ global $bp;
+
+ if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] && 'edit' == $bp->action_variables[2] )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_group_members() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -1533,12 +1542,21 @@
</span><span class="cx"> function bp_is_group_invites() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_GROUPS_SLUG == $bp->current_component && 'invites' == $bp->current_action )
</del><ins>+ if ( BP_GROUPS_SLUG == $bp->current_component && 'send-invites' == $bp->current_action )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_is_group_membership_request() {
+ global $bp;
+
+ if ( BP_GROUPS_SLUG == $bp->current_component && 'request-membership' == $bp->current_action )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_group_leave() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -1560,7 +1578,7 @@
</span><span class="cx"> function bp_is_user_blogs() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_BLOGS_SLUG == $bp->current_component && ( !$bp->current_action || 'my-blogs' == $bp->current_action ) )
</del><ins>+ if ( BP_BLOGS_SLUG == $bp->current_component )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1596,7 +1614,7 @@
</span><span class="cx"> function bp_is_user_friends() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_FRIENDS_SLUG == $bp->current_component && ( !$bp->current_action || 'my-friends' == $bp->current_action ) )
</del><ins>+ if ( BP_FRIENDS_SLUG == $bp->current_component )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1611,6 +1629,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_is_user_messages() {
+ global $bp;
+
+ if ( BP_MESSAGES_SLUG == $bp->current_component )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_messages_inbox() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -1768,6 +1795,9 @@
</span><span class="cx"> if ( bp_is_group_forum_topic() )
</span><span class="cx"> $bp_classes[] = 'group-forum-topic';
</span><span class="cx">
</span><ins>+ if ( bp_is_group_forum_topic_edit() )
+ $bp_classes[] = 'group-forum-topic-edit';
+
</ins><span class="cx"> if ( bp_is_group_forum() )
</span><span class="cx"> $bp_classes[] = 'group-forum';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumeditphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum/edit.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum/edit.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-themes/bp-default/groups/single/forum/edit.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -1,100 +1,68 @@
</span><del>-<?php get_header() ?>
</del><ins>+<?php if ( bp_has_topic_posts() ) : ?>
</ins><span class="cx">
</span><del>-<div class="content-header">
-
-</div>
</del><ins>+ <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form" class="standard-form">
</ins><span class="cx">
</span><del>-<div id="content">
- <?php do_action( 'template_notices' ) // (error/success feedback) ?>
-
- <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
-
- <div class="left-menu">
- <?php locate_template( array( 'groups/single/menu.php' ), true ) ?>
- </div>
</del><ins>+ <div id="topic-meta">
+ <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></span>
</ins><span class="cx">
</span><del>- <div class="main-column">
- <div class="inner-tube">
-
- <div id="group-name">
- <h1><a href="<?php bp_group_permalink() ?>"><?php bp_group_name() ?></a></h1>
- <p class="status"><?php bp_group_type() ?></p>
- </div>
</del><ins>+ <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
+ <div class="admin-links"><?php bp_the_topic_admin_links() ?></div>
+ <?php endif; ?>
+ </div>
</ins><span class="cx">
</span><del>- <div class="bp-widget">
- <?php if ( bp_has_topic_posts() ) : ?>
- <form action="<?php bp_forum_topic_action() ?>" method="post" id="forum-topic-form">
-
- <h4><?php _e( 'Forum', 'buddypress' ); ?></h4>
-
- <ul id="topic-post-list" class="item-list">
- <li id="topic-meta">
- <a href="<?php bp_forum_permalink() ?>"><?php _e( 'Forum', 'buddypress') ?></a> &raquo;
- <strong><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</strong>
- </li>
- </ul>
-
- <?php if ( bp_group_is_member() ) : ?>
-
- <?php if ( bp_is_edit_topic() ) : ?>
-
- <div id="edit-topic">
</del><ins>+ <?php if ( bp_group_is_member() ) : ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'groups_forum_edit_topic_before' ) ?>
-
- <p><strong><?php _e( 'Edit Topic:', 'buddypress' ) ?></strong></p>
-
- <label for="topic_title"><?php _e( 'Title:', 'buddypress' ) ?></label>
- <input type="text" name="topic_title" id="topic_title" value="<?php bp_the_topic_title() ?>" />
-
- <label for="topic_text"><?php _e( 'Content:', 'buddypress' ) ?></label>
- <textarea name="topic_text" id="topic_text"><?php bp_the_topic_text() ?></textarea>
-
- <?php do_action( 'groups_forum_edit_topic_after' ) ?>
-
- <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" /></p>
-
- <?php wp_nonce_field( 'bp_forums_edit_topic' ) ?>
-
- </div>
-
- <?php else : ?>
-
- <div id="edit-post">
</del><ins>+ <?php if ( bp_is_edit_topic() ) : ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'groups_forum_edit_post_before' ) ?>
-
- <p><strong><?php _e( 'Edit Post:', 'buddypress' ) ?></strong></p>
</del><ins>+ <div id="edit-topic">
</ins><span class="cx">
</span><del>- <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text() ?></textarea>
-
- <?php do_action( 'groups_forum_edit_post_after' ) ?>
-
- <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" /></p>
-
- <?php wp_nonce_field( 'bp_forums_edit_post' ) ?>
-
- </div>
-
- <?php endif; ?>
-
- <?php endif; ?>
-
- </form>
- <?php else: ?>
</del><ins>+ <?php do_action( 'groups_forum_edit_topic_before' ) ?>
</ins><span class="cx">
</span><del>- <div id="message" class="info">
- <p><?php _e( 'This topic does not exist.', 'buddypress' ) ?></p>
- </div>
</del><ins>+ <p><strong><?php _e( 'Edit Topic:', 'buddypress' ) ?></strong></p>
</ins><span class="cx">
</span><del>- <?php endif;?>
</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>- </div>
-
- </div>
- </div>
</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>- <?php endwhile; endif; ?>
-</div>
</del><ins>+ <?php do_action( 'groups_forum_edit_topic_after' ) ?>
</ins><span class="cx">
</span><del>-<?php get_footer() ?>
</del><ins>+ <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" /></p>
+
+ <?php wp_nonce_field( 'bp_forums_edit_topic' ) ?>
+
+ </div>
+
+ <?php else : ?>
+
+ <div id="edit-post">
+
+ <?php do_action( 'groups_forum_edit_post_before' ) ?>
+
+ <p><strong><?php _e( 'Edit Post:', 'buddypress' ) ?></strong></p>
+
+ <textarea name="post_text" id="post_text"><?php bp_the_topic_post_edit_text() ?></textarea>
+
+ <?php do_action( 'groups_forum_edit_post_after' ) ?>
+
+ <p class="submit"><input type="submit" name="save_changes" id="save_changes" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" /></p>
+
+ <?php wp_nonce_field( 'bp_forums_edit_post' ) ?>
+
+ </div>
+
+ <?php endif; ?>
+
+ <?php endif; ?>
+
+ </form>
+
+<?php else: ?>
+
+ <div id="message" class="info">
+ <p><?php _e( 'This topic does not exist.', 'buddypress' ) ?></p>
+ </div>
+
+<?php endif;?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-themes/bp-default/groups/single/forum.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><del>-<?php if ( bp_is_group_forum_topic() ) : ?>
</del><ins>+<?php if ( bp_is_group_forum_topic_edit() ) : ?>
+ <?php locate_template( array( 'groups/single/forum/edit.php' ), true ) ?>
</ins><span class="cx">
</span><ins>+<?php elseif ( bp_is_group_forum_topic() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/forum/topic.php' ), true ) ?>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/home.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/home.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-themes/bp-default/groups/single/home.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -23,19 +23,19 @@
</span><span class="cx"> <div id="item-body">
</span><span class="cx"> <?php do_action( 'template_notices' ) ?>
</span><span class="cx">
</span><del>- <?php if ( 'admin' == bp_current_action() ) : ?>
</del><ins>+ <?php if ( bp_is_group_admin_page() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/admin.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'members' == bp_current_action() ) : ?>
</del><ins>+ <?php elseif ( bp_is_group_members() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'send-invites' == bp_current_action() ) : ?>
</del><ins>+ <?php elseif ( bp_is_group_invites() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/send-invites.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'request-membership' == bp_current_action() ) : ?>
</del><ins>+ <?php elseif ( bp_is_group_membership_request() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'forum' == bp_current_action() ) : ?>
</del><ins>+ <?php elseif ( bp_is_group_forum() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglepluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/plugins.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/plugins.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-themes/bp-default/groups/single/plugins.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -6,13 +6,30 @@
</span><span class="cx"> <div class="padder">
</span><span class="cx"> <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
</span><span class="cx">
</span><del>- <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
</del><ins>+ <div id="item-header">
+ <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
+ </div>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_template_content' ) ?>
</del><ins>+ <div id="item-nav">
+ <div class="item-list-tabs no-ajax" id="user-nav">
+ <ul>
+ <?php bp_get_options_nav() ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_directory_members_content' ) ?>
</del><ins>+ <?php do_action( 'bp_members_directory_member_types' ) ?>
+ </ul>
+ </div>
+ </div>
</ins><span class="cx">
</span><ins>+ <div id="item-body">
+
+ <?php do_action( 'bp_template_content' ) ?>
+
+ <?php do_action( 'bp_directory_members_content' ) ?>
+
+ </div><!-- #item-body -->
+
</ins><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></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/home.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/home.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-themes/bp-default/members/single/home.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -20,28 +20,24 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="item-body">
</span><del>-
- <?php if ( 'home' == bp_current_component() || 'activity' == bp_current_component() || !bp_current_component() ) : ?>
</del><ins>+ <?php if ( bp_is_user_activity() || !bp_current_component() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'members/single/activity.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'blogs' == bp_current_component() ) : ?>
</del><ins>+ <?php elseif ( bp_is_user_blogs() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'members/single/blogs.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'friends' == bp_current_component() ) : ?>
</del><ins>+ <?php elseif ( bp_is_user_friends() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'members/single/friends.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'groups' == bp_current_component() ) : ?>
</del><ins>+ <?php elseif ( bp_is_user_groups() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'members/single/groups.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'messages' == bp_current_component() ) : ?>
</del><ins>+ <?php elseif ( bp_is_user_messages() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'members/single/messages.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( 'profile' == bp_current_component() ) : ?>
</del><ins>+ <?php elseif ( bp_is_user_profile() ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'members/single/profile.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php else : ?>
- <?php locate_template( array( 'members/single/plugins.php' ), true ) ?>
-
</del><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_directory_members_content' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglepluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/plugins.php (2196 => 2197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/plugins.php 2009-12-17 14:11:11 UTC (rev 2196)
+++ trunk/bp-themes/bp-default/members/single/plugins.php 2009-12-18 09:34:41 UTC (rev 2197)
</span><span class="lines">@@ -1,9 +1,43 @@
</span><del>-<div class="item-list-tabs no-ajax" id="user-subnav">
- <ul>
- <?php bp_get_options_nav() ?>
- </ul>
-</div>
</del><ins>+<?php get_header() ?>
</ins><span class="cx">
</span><del>-<?php do_action( 'bp_template_content' ) ?>
</del><ins>+ <?php do_action( 'bp_before_directory_members_content' ) ?>
</ins><span class="cx">
</span><del>-<?php do_action( 'bp_directory_members_content' ) ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+ <div id="content">
+ <div class="padder">
+
+ <div id="item-header">
+ <?php locate_template( array( 'members/single/member-header.php' ), true ) ?>
+ </div>
+
+ <div id="item-nav">
+ <div class="item-list-tabs no-ajax" id="user-nav">
+ <ul>
+ <?php bp_get_user_nav() ?>
+
+ <?php do_action( 'bp_members_directory_member_types' ) ?>
+ </ul>
+ </div>
+ </div>
+
+ <div id="item-body">
+
+ <div class="item-list-tabs no-ajax" id="user-subnav">
+ <ul>
+ <?php bp_get_options_nav() ?>
+ </ul>
+ </div>
+
+ <?php do_action( 'bp_template_content' ) ?>
+
+ <?php do_action( 'bp_directory_members_content' ) ?>
+
+ </div><!-- #item-body -->
+
+ </div><!-- .padder -->
+ </div><!-- #content -->
+
+ <?php locate_template( array( 'sidebar.php' ), true ) ?>
+
+ <?php do_action( 'bp_after_directory_members_content' ) ?>
+
+<?php get_footer() ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>