<!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] [2965] branches/1.2/bp-themes/bp-default/members/single:
Normalize root level single member template files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2965</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-28 21:22:26 +0000 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Normalize root level single member template files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpthemesbpdefaultmemberssingleblogsphp">branches/1.2/bp-themes/bp-default/members/single/blogs.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssinglefriendsphp">branches/1.2/bp-themes/bp-default/members/single/friends.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssinglegroupsphp">branches/1.2/bp-themes/bp-default/members/single/groups.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssinglehomephp">branches/1.2/bp-themes/bp-default/members/single/home.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssinglemessagesphp">branches/1.2/bp-themes/bp-default/members/single/messages.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssinglepluginsphp">branches/1.2/bp-themes/bp-default/members/single/plugins.php</a></li>
<li><a href="#branches12bpthemesbpdefaultmemberssingleprofilephp">branches/1.2/bp-themes/bp-default/members/single/profile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpthemesbpdefaultmemberssingleblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/blogs.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/blogs.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/blogs.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -19,6 +19,6 @@
</span><span class="cx">
</span><span class="cx"> <div class="blogs myblogs">
</span><span class="cx">         <?php locate_template( array( 'blogs/blogs-loop.php' ), true ) ?>
</span><del>-</div><!-- .blogs -->
</del><ins>+</div><!-- .blogs.myblogs -->
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_member_blogs_content' ) ?>
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssinglefriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/friends.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/friends.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/friends.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx">         <div class="members friends">
</span><span class="cx">                 <?php locate_template( array( 'members/members-loop.php' ), true ) ?>
</span><del>-        </div>
</del><ins>+        </div><!-- .members.friends -->
</ins><span class="cx">
</span><span class="cx">         <?php do_action( 'bp_after_member_friends_content' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssinglegroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/groups.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/groups.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/groups.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">                 </li>
</span><span class="cx">                 <?php endif; ?>
</span><span class="cx">         </ul>
</span><del>-</div>
</del><ins>+</div><!-- .item-list-tabs -->
</ins><span class="cx">
</span><span class="cx"> <?php if ( 'invites' == bp_current_action() ) : ?>
</span><span class="cx">         <?php locate_template( array( 'members/single/groups/invites.php' ), true ) ?>
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssinglehomephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/home.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/home.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/home.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -40,6 +40,11 @@
</span><span class="cx">                                 <?php elseif ( bp_is_user_profile() ) : ?>
</span><span class="cx">                                         <?php locate_template( array( 'members/single/profile.php' ), true ) ?>
</span><span class="cx">
</span><ins>+                                <?php else : ?>
+                                        <?php
+                                                /* If nothing sticks, just load a member front template if one exists. */
+                                                locate_template( array( 'members/single/front.php' ), true );
+                                        ?>
</ins><span class="cx">                                 <?php endif; ?>
</span><span class="cx">
</span><span class="cx">                                 <?php do_action( 'bp_after_member_body' ) ?>
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssinglemessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/messages.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/messages.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/messages.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">         <ul>
</span><span class="cx">                 <?php bp_get_options_nav() ?>
</span><span class="cx">         </ul>
</span><del>-</div>
</del><ins>+</div><!-- .item-list-tabs -->
</ins><span class="cx">
</span><span class="cx"> <?php if ( 'compose' == bp_current_action() ) : ?>
</span><span class="cx">         <?php locate_template( array( 'members/single/messages/compose.php' ), true ) ?>
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">                         <?php locate_template( array( 'members/single/messages/messages-loop.php' ), true ) ?>
</span><span class="cx">
</span><span class="cx">                 <?php endif; ?>
</span><del>-        </div>
</del><ins>+        </div><!-- .messages -->
</ins><span class="cx">
</span><span class="cx">         <?php do_action( 'bp_after_member_messages_content' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssinglepluginsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/plugins.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/plugins.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/plugins.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -7,17 +7,20 @@
</span><span class="cx">
</span><span class="cx">                         <div id="item-header">
</span><span class="cx">                                 <?php locate_template( array( 'members/single/member-header.php' ), true ) ?>
</span><del>-                        </div>
</del><ins>+                        </div><!-- #item-header -->
</ins><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">
</span><span class="cx">                                         <ul>
</span><span class="cx">                                                 <?php bp_get_displayed_user_nav() ?>
</span><ins>+
+                                                <?php do_action( 'bp_member_options_nav' ) ?>
</ins><span class="cx">                                         </ul>
</span><span class="cx">                                 </div>
</span><del>-                        </div>
</del><ins>+                        </div><!-- #item-nav -->
</ins><span class="cx">
</span><span class="cx">                         <div id="item-body">
</span><ins>+                                <?php do_action( 'bp_before_member_body' ) ?>
</ins><span class="cx">
</span><span class="cx">                                 <div class="item-list-tabs no-ajax" id="subnav">
</span><span class="cx">                                         <ul>
</span><span class="lines">@@ -25,10 +28,14 @@
</span><span class="cx">
</span><span class="cx">                                                 <?php do_action( 'bp_member_plugin_options_nav' ) ?>
</span><span class="cx">                                         </ul>
</span><del>-                                </div>
</del><ins>+                                </div><!-- .item-list-tabs -->
</ins><span class="cx">
</span><ins>+                                <?php do_action( 'bp_template_title' ) ?>
+
</ins><span class="cx">                                 <?php do_action( 'bp_template_content' ) ?>
</span><span class="cx">
</span><ins>+                                <?php do_action( 'bp_after_member_body' ) ?>
+
</ins><span class="cx">                         </div><!-- #item-body -->
</span><span class="cx">
</span><span class="cx">                         <?php do_action( 'bp_after_member_plugin_template' ) ?>
</span><span class="lines">@@ -38,6 +45,4 @@
</span><span class="cx">
</span><span class="cx">         <?php locate_template( array( 'sidebar.php' ), true ) ?>
</span><span class="cx">
</span><del>-        <?php do_action( 'bp_after_member_plugin_template' ) ?>
-
</del><span class="cx"> <?php get_footer() ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultmemberssingleprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/members/single/profile.php (2964 => 2965)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/members/single/profile.php        2010-04-28 20:47:33 UTC (rev 2964)
+++ branches/1.2/bp-themes/bp-default/members/single/profile.php        2010-04-28 21:22:26 UTC (rev 2965)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx">                 <ul>
</span><span class="cx">                         <?php bp_get_options_nav() ?>
</span><span class="cx">                 </ul>
</span><del>-        </div>
</del><ins>+        </div><!-- .item-list-tabs -->
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_profile_content' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>