<!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] [2205] trunk/bp-themes/bp-default: Fixed blog tab highlighting
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2205</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-18 14:59:39 +0000 (Fri, 18 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed blog tab highlighting. Added blogs styles to archive and search results pages.</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="#trunkbpthemesbpdefaultarchivephp">trunk/bp-themes/bp-default/archive.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultsearchphp">trunk/bp-themes/bp-default/search.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 (2204 => 2205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css        2009-12-18 14:28:54 UTC (rev 2204)
+++ trunk/bp-themes/bp-default/_inc/css/default.css        2009-12-18 14:59:39 UTC (rev 2205)
</span><span class="lines">@@ -1519,6 +1519,16 @@
</span><span class="cx">                 margin: 0;
</span><span class="cx">         }
</span><span class="cx">
</span><ins>+        h2.pagetitle {
+                color: #888;
+                font-size: 18px;
+                padding: 10px 0;
+                margin: 10px 0;
+                border-bottom: 1px solid #e4e4e4;
+                border-top: 1px solid #e4e4e4;
+                font-weight: normal;
+        }
+
</ins><span class="cx"> /* > WordPress Blog Comment Styles
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/archive.php (2204 => 2205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/archive.php        2009-12-18 14:28:54 UTC (rev 2204)
+++ trunk/bp-themes/bp-default/archive.php        2009-12-18 14:59:39 UTC (rev 2205)
</span><span class="lines">@@ -7,12 +7,10 @@
</span><span class="cx">
</span><span class="cx">                 <div class="page" id="blog-archives">
</span><span class="cx">
</span><del>-                        <h2 class="pagetitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
</del><ins>+                        <h2 class="pagetitle"><?php printf( __( 'You are browsing the archive for %1$s.', 'buddypress' ), wp_title( false, false ) ); ?></h2>
</ins><span class="cx">
</span><span class="cx">                         <?php if ( have_posts() ) : ?>
</span><span class="cx">
</span><del>-                                <h3><?php printf( __( 'You are browsing the archive for %1$s.', 'buddypress' ), wp_title( false, false ) ); ?></h3>
-
</del><span class="cx">                                 <div class="navigation">
</span><span class="cx">
</span><span class="cx">                                         <div class="alignleft"><?php next_posts_link( __( '&laquo; Previous Entries', 'buddypress' ) ) ?></div>
</span><span class="lines">@@ -24,17 +22,25 @@
</span><span class="cx">
</span><span class="cx">                                         <?php do_action( 'bp_before_blog_post' ) ?>
</span><span class="cx">
</span><del>-                                        <div class="post">
</del><ins>+                                        <div class="post" id="post-<?php the_ID(); ?>">
</ins><span class="cx">
</span><del>-                                                <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
-                                                <small><?php the_time('F j, Y') ?></small>
</del><ins>+                                                <div class="author-box">
+                                                        <?php echo get_avatar( get_the_author_email(), '50' ); ?>
+                                                        <p><?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>
+                                                </div>
</ins><span class="cx">
</span><del>-                                                <div class="entry">
-                                                        <?php the_content() ?>
</del><ins>+                                                <div class="post-content">
+                                                        <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
+
+                                                        <p class="date"><?php the_time('F j, Y') ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
+
+                                                        <div class="entry">
+                                                                <?php the_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ); ?>
+                                                        </div>
+
+                                                        <p class="postmetadata"><span class="tags"><?php the_tags( __( 'Tags: ', 'buddypress' ), ', ', '<br />'); ?></span> <span class="comments"><?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></span></p>
</ins><span class="cx">                                                 </div>
</span><span class="cx">
</span><del>-                                                <p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link( __( 'Edit', 'buddypress' ), '', ' | '); ?> <?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></p>
-
</del><span class="cx">                                         </div>
</span><span class="cx">
</span><span class="cx">                                         <?php do_action( 'bp_after_blog_post' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (2204 => 2205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php        2009-12-18 14:28:54 UTC (rev 2204)
+++ trunk/bp-themes/bp-default/header.php        2009-12-18 14:59:39 UTC (rev 2205)
</span><span class="lines">@@ -33,23 +33,37 @@
</span><span class="cx">
</span><span class="cx">                 <div id="header">
</span><span class="cx">
</span><del>-                        <h1 id="logo"><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</del><ins>+                        <h1 id="logo"><a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</ins><span class="cx">
</span><span class="cx">                         <ul id="nav">
</span><del>-                                <li<?php if ( bp_is_page( 'home' ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
-                                <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
-                                <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) || bp_is_member() ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
</del><ins>+                                <li<?php if ( bp_is_page( 'home' ) ) : ?> class="selected"<?php endif; ?>>
+                                        <a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
+                                </li>
</ins><span class="cx">
</span><ins>+                                <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) || bp_is_blog_page() && !is_front_page() ) : ?> class="selected"<?php endif; ?>>
+                                        <a href="<?php echo site_url() ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a>
+                                </li>
+
+                                <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) || bp_is_member() ) : ?> class="selected"<?php endif; ?>>
+                                        <a href="<?php echo site_url() ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a>
+                                </li>
+
</ins><span class="cx">                                 <?php if ( function_exists( 'groups_install' ) ) : ?>
</span><del>-                                        <li<?php if ( bp_is_page( BP_GROUPS_SLUG ) || bp_is_group() ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_GROUPS_SLUG ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
</del><ins>+                                        <li<?php if ( bp_is_page( BP_GROUPS_SLUG ) || bp_is_group() ) : ?> class="selected"<?php endif; ?>>
+                                                <a href="<?php echo site_url() ?>/<?php echo BP_GROUPS_SLUG ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a>
+                                        </li>
</ins><span class="cx">                                 <?php endif; ?>
</span><span class="cx">
</span><span class="cx">                                 <?php if ( function_exists( 'groups_install' ) && ( function_exists( 'bp_forums_setup' ) && !(int) get_site_option( 'bp-disable-forum-directory' ) ) ) : ?>
</span><del>-                                        <li<?php if ( bp_is_page( BP_FORUMS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_FORUMS_SLUG ?>" title="<?php _e( 'Forums', 'buddypress' ) ?>"><?php _e( 'Forums', 'buddypress' ) ?></a></li>
</del><ins>+                                        <li<?php if ( bp_is_page( BP_FORUMS_SLUG ) ) : ?> class="selected"<?php endif; ?>>
+                                                <a href="<?php echo site_url() ?>/<?php echo BP_FORUMS_SLUG ?>" title="<?php _e( 'Forums', 'buddypress' ) ?>"><?php _e( 'Forums', 'buddypress' ) ?></a>
+                                        </li>
</ins><span class="cx">                                 <?php endif; ?>
</span><span class="cx">
</span><span class="cx">                                 <?php if ( function_exists( 'bp_blogs_install' ) ) : ?>
</span><del>-                                        <li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_BLOGS_SLUG ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a></li>
</del><ins>+                                        <li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) : ?> class="selected"<?php endif; ?>>
+                                                <a href="<?php echo site_url() ?>/<?php echo BP_BLOGS_SLUG ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a>
+                                        </li>
</ins><span class="cx">                                 <?php endif; ?>
</span><span class="cx">
</span><span class="cx">                                 <?php do_action( 'bp_nav_items' ); ?>
</span><span class="lines">@@ -78,4 +92,4 @@
</span><span class="cx">                 <?php do_action( 'bp_after_header' ) ?>
</span><span class="cx">                 <?php do_action( 'bp_before_container' ) ?>
</span><span class="cx">
</span><del>-                <div id="container">
</del><ins>+                <div id="container">
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultsearchphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/search.php (2204 => 2205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/search.php        2009-12-18 14:28:54 UTC (rev 2204)
+++ trunk/bp-themes/bp-default/search.php        2009-12-18 14:59:39 UTC (rev 2205)
</span><span class="lines">@@ -22,15 +22,25 @@
</span><span class="cx">
</span><span class="cx">                                         <?php do_action( 'bp_before_blog_post' ) ?>
</span><span class="cx">
</span><del>-                                        <div class="post">
</del><ins>+                                        <div class="post" id="post-<?php the_ID(); ?>">
</ins><span class="cx">
</span><del>-                                                <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
-                                                <small><?php the_time('l, F jS, Y') ?></small>
</del><ins>+                                                <div class="author-box">
+                                                        <?php echo get_avatar( get_the_author_email(), '50' ); ?>
+                                                        <p><?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></p>
+                                                </div>
</ins><span class="cx">
</span><del>-                                                <p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link( __( 'Edit', 'buddypress' ), '', ' | '); ?> <?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></p>
</del><ins>+                                                <div class="post-content">
+                                                        <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
</ins><span class="cx">
</span><del>-                                                <?php do_action( 'bp_blog_post' ) ?>
</del><ins>+                                                        <p class="date"><?php the_time('F j, Y') ?> <em><?php _e( 'in', 'buddypress' ) ?> <?php the_category(', ') ?> <?php printf( __( 'by %s', 'buddypress' ), bp_core_get_userlink( $post->post_author ) ) ?></em></p>
</ins><span class="cx">
</span><ins>+                                                        <div class="entry">
+                                                                <?php the_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ); ?>
+                                                        </div>
+
+                                                        <p class="postmetadata"><span class="tags"><?php the_tags( __( 'Tags: ', 'buddypress' ), ', ', '<br />'); ?></span> <span class="comments"><?php comments_popup_link( __( 'No Comments &#187;', 'buddypress' ), __( '1 Comment &#187;', 'buddypress' ), __( '% Comments &#187;', 'buddypress' ) ); ?></span></p>
+                                                </div>
+
</ins><span class="cx">                                         </div>
</span><span class="cx">
</span><span class="cx">                                         <?php do_action( 'bp_after_blog_post' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>