<!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] [2204] trunk/bp-themes/bp-default: Updated blog styles.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2204</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-18 14:28:54 +0000 (Fri, 18 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated blog styles.</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="#trunkbpthemesbpdefaultcommentsphp">trunk/bp-themes/bp-default/comments.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultindexphp">trunk/bp-themes/bp-default/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultsinglephp">trunk/bp-themes/bp-default/single.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 (2203 => 2204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2009-12-18 14:11:08 UTC (rev 2203)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2009-12-18 14:28:54 UTC (rev 2204)
</span><span class="lines">@@ -1370,12 +1370,12 @@
</span><span class="cx"> background: #f4f4f4;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ul#topic-post-list li div.poster-meta {
</del><ins>+ ul#topic-post-list li divdiv.poster-meta {
</ins><span class="cx"> margin-bottom: 10px;
</span><span class="cx"> color: #888;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ul#topic-post-list li div.post-content {
</del><ins>+ ul#topic-post-list li divdiv.post-content {
</ins><span class="cx"> margin-left: 54px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1407,52 +1407,72 @@
</span><span class="cx"> /* > WordPress Blog Styles
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-.post {
- margin: 0 0 40px 0;
</del><ins>+div.post {
+ margin: 0 0 60px 0;
</ins><span class="cx"> }
</span><del>- .post h3 {
</del><ins>+ div.post div.author-box, div.comment-avatar-box {
+ background: #f0f0f0;
+ padding: 10px;
+ float: left;
+ margin: 0 15px 15px 0;
+ text-align: center;
+ width: 70px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ }
+ div.post div.author-box img, div.comment-avatar-box img {
+ float: none;
+ border: 4px solid #fff;
+ }
+
+ div.post div.post-content, div.comment-content {
+ margin-left: 105px;
+ }
+
+ div.post h3 {
</ins><span class="cx"> font-size: 24px;
</span><span class="cx"> margin-bottom: 5px;
</span><ins>+ line-height: 120%;
</ins><span class="cx"> }
</span><del>- .post h3 a {
</del><ins>+ div.post h3 a {
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> color: #666;
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post p.date, .post p.postmetadata {
</del><ins>+ div.post p.date, div.post p.postmetadata, div.comment-meta, div.comment-options {
</ins><span class="cx"> color: #888;
</span><span class="cx"> font-size: 11px;
</span><del>- padding-bottom: 5px;
</del><ins>+ padding: 3px 0;
+ margin: 10px 0;
</ins><span class="cx"> border-bottom: 1px solid #e4e4e4;
</span><ins>+ border-top: 1px solid #e4e4e4;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- .post p.postmetadata {
- padding-top: 5px;
- border-top: 1px solid #e4e4e4;
- border-bottom: none;
</del><ins>+ div.post p.postmetadata {
</ins><span class="cx"> margin-top: 15px;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post .tags { float: left; }
- .post .comments { float: right; }
</del><ins>+ div.post .tags { float: left; }
+ div.post .comments { float: right; }
</ins><span class="cx">
</span><del>- .post img.wp-smiley { padding: 0 !important; margin: 0 !important; border: none !important; float: none !important; clear: none !important; }
</del><ins>+ div.post img.wp-smiley { padding: 0 !important; margin: 0 !important; border: none !important; float: none !important; clear: none !important; }
</ins><span class="cx">
</span><del>- .post img.centered, img.aligncenter {
</del><ins>+ div.post img.centered, img.aligncenter {
</ins><span class="cx"> display: block;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post img.alignright {
</del><ins>+ div.post img.alignright {
</ins><span class="cx"> padding: 4px;
</span><span class="cx"> margin: 0 0 2px 7px;
</span><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post img.alignleft {
</del><ins>+ div.post img.alignleft {
</ins><span class="cx"> padding: 4px;
</span><span class="cx"> margin: 0 7px 2px 0;
</span><span class="cx"> display: inline;
</span><span class="lines">@@ -1469,77 +1489,75 @@
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post .aligncenter, .post div.aligncenter {
</del><ins>+ div.post .aligncenter, div.post div.aligncenter {
</ins><span class="cx"> display: block;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post .wp-caption {
</del><ins>+ div.post .wp-caption {
</ins><span class="cx"> border: 1px solid #ddd;
</span><span class="cx"> text-align: center;
</span><span class="cx"> background-color: #f3f3f3;
</span><span class="cx"> padding-top: 4px;
</span><span class="cx"> margin: 10px 0;
</span><span class="cx"> -moz-border-radius: 3px;
</span><del>- -khtml-border-radius: 3px;
</del><span class="cx"> -webkit-border-radius: 3px;
</span><span class="cx"> border-radius: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post .wp-caption img {
</del><ins>+ div.post .wp-caption img {
</ins><span class="cx"> margin: 0;
</span><span class="cx"> padding: 0;
</span><span class="cx"> border: 0 none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .post dd.wp-caption p.wp-caption-text, .post .wp-caption p.wp-caption-text {
</del><ins>+ div.post dd.wp-caption p.wp-caption-text, div.post .wp-caption p.wp-caption-text {
</ins><span class="cx"> font-size: 0.9em;
</span><span class="cx"> line-height: 17px;
</span><span class="cx"> padding: 0 4px 5px 0;
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* WordPress comment form styles */
</del><ins>+/* > WordPress Blog Comment Styles
+-------------------------------------------------------------- */
</ins><span class="cx">
</span><del>- #commentform { padding: 1em 1.5em; }
- #commentform textarea { width: 100%;}
- #comment-textarea { float: right; width: 80%; }
</del><ins>+#trackbacks {
+ margin-top: 30px;
+}
</ins><span class="cx">
</span><del>- .comment-details { float: left; width: 20%; }
- .comment-content { float: right; width: 80%; }
</del><ins>+#comments h3, #trackbacks h3, #respond h3 {
+ font-size: 20px;
+ margin: 5px 0 25px 0;
+ font-weight: normal;
+ color: #555;
+}
</ins><span class="cx">
</span><del>- .commentlist li {
- padding: 15px;
- background: #fff;
- margin-bottom: 1em;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- }
</del><ins>+#comments span.title, #trackbacks span.title {
+ color: #aaa;
+}
</ins><span class="cx">
</span><del>- .commentlist li.alt { background: #f0f0f0; }
- .commentlist li img.avatar {
- padding: 0;
- margin: 0 10px 10px 0;
- float: left;
</del><ins>+ol.commentlist li {
+ margin: 0 0 30px 0;
+}
</ins><span class="cx">
</span><del>- }
- .commentlist li.alt img.avatar { border-color: #fff !important; }
</del><ins>+ div.comment-meta {
+ border-top: none;
+ padding-top: 0;
+ }
</ins><span class="cx">
</span><del>- .commentmetadata {
- font-size: 0.9em;
- border-bottom: 1px solid #ddd;
- padding-bottom: 10px;
- margin-bottom: 15px;
</del><ins>+ div.comment-meta h5 {
+ font-weight: normal;
</ins><span class="cx"> }
</span><del>- .commentmetadata a { color: #888; }
</del><span class="cx">
</span><del>- #commentform input, #commentform textarea {
- margin: 0 5px 8px 0;
</del><ins>+ div.comment-meta em {
+ float: right;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ div.comment-options {
+ border-bottom: none;
+ }
+
</ins><span class="cx"> /* > Footer
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/comments.php (2203 => 2204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/comments.php 2009-12-18 14:11:08 UTC (rev 2203)
+++ trunk/bp-themes/bp-default/comments.php 2009-12-18 14:28:54 UTC (rev 2204)
</span><span class="lines">@@ -9,61 +9,80 @@
</span><span class="cx"> return;
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <div id="comments-template">
</del><ins>+ <?php if ( have_comments() ) : ?>
</ins><span class="cx">
</span><del>- <?php if ( have_comments() ) : ?>
</del><ins>+ <div id="comments">
</ins><span class="cx">
</span><del>- <div id="comments">
</del><ins>+ <?php
+ $numTrackBacks = 0; $numComments = 0;
+ foreach ( $comments as $comment ) if ( get_comment_type() != "comment") $numTrackBacks++; else $numComments++;
+ ?>
</ins><span class="cx">
</span><del>- <h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __('No responses to %1$s', 'buddypress'), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __('One response to %1$s', 'buddypress'), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __('%1$s responses to %2$s', 'buddypress'), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
</del><ins>+ <span class="title"><?php the_title() ?></span>
+ <h3 id="comments"><?php comments_number( 'No Comments', 'One Comment', $numComments . ' Comments' );?></h3>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_blog_comment_list' ) ?>
</del><ins>+ <?php do_action( 'bp_before_blog_comment_list' ) ?>
</ins><span class="cx">
</span><del>- <ol class="commentlist">
- <?php wp_list_comments( array( 'style' => 'ol', 'type' => 'all' ) ); ?>
- </ol><!-- .comment-list -->
</del><ins>+ <ol class="commentlist">
+ <?php wp_list_comments( array( 'callback' => 'bp_dtheme_comments' ) ); ?>
+ </ol><!-- .comment-list -->
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_after_blog_comment_list' ) ?>
</del><ins>+ <?php do_action( 'bp_after_blog_comment_list' ) ?>
</ins><span class="cx">
</span><del>- <?php if ( get_option( 'page_comments' ) ) : ?>
</del><ins>+ <?php if ( get_option( 'page_comments' ) ) : ?>
</ins><span class="cx">
</span><del>- <div class="comment-navigation paged-navigation">
</del><ins>+ <div class="comment-navigation paged-navigation">
</ins><span class="cx">
</span><del>- <?php paginate_comments_links(); ?>
</del><ins>+ <?php paginate_comments_links(); ?>
</ins><span class="cx">
</span><del>- </div>
- <?php endif; ?>
</del><ins>+ </div>
</ins><span class="cx">
</span><del>- </div><!-- #comments -->
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php else : ?>
</del><ins>+ </div><!-- #comments -->
</ins><span class="cx">
</span><del>- <?php if ( pings_open() && !comments_open() && is_single() ) : ?>
</del><ins>+ <?php else : ?>
</ins><span class="cx">
</span><del>- <p class="comments-closed pings-open">
- <?php printf( __('Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress'), trackback_url( '0' ) ); ?>
- </p>
</del><ins>+ <?php if ( pings_open() && !comments_open() && is_single() ) : ?>
</ins><span class="cx">
</span><del>- <?php elseif ( !comments_open() && is_single() ) : ?>
</del><ins>+ <p class="comments-closed pings-open">
+ <?php printf( __('Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress'), trackback_url( '0' ) ); ?>
+ </p>
</ins><span class="cx">
</span><del>- <p class="comments-closed">
- <?php _e('Comments are closed.', 'buddypress'); ?>
- </p>
</del><ins>+ <?php elseif ( !comments_open() && is_single() ) : ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ <p class="comments-closed">
+ <?php _e('Comments are closed.', 'buddypress'); ?>
+ </p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ <?php endif; ?>
+
</ins><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx">
</span><del>- <div id="respond">
</del><ins>+ <div id="respond">
</ins><span class="cx">
</span><ins>+ <div class="comment-avatar-box">
+ <div class="avb">
+ <?php if ( bp_loggedin_user_id() ) : ?>
+ <a href="<?php echo bp_loggedin_user_domain() ?>">
+ <?php echo get_avatar( bp_loggedin_user_id(), 50 ); ?>
+ </a>
+ <?php else : ?>
+ <?php echo get_avatar( 0, 50 ); ?>
+ <?php endif; ?>
+ </div>
+ </div>
+
+ <div class="comment-content">
+
</ins><span class="cx"> <h3 id="reply" class="comments-header">
</span><del>- <?php comment_form_title( __('Leave a Reply', 'buddypress'), __('Leave a Reply to %s', 'buddypress'), true ); ?>
</del><ins>+ <?php comment_form_title( __( 'Leave a Reply', 'buddypress' ), __( 'Leave a Reply to %s', 'buddypress' ), true ); ?>
</ins><span class="cx"> </h3>
</span><span class="cx">
</span><span class="cx"> <p id="cancel-comment-reply">
</span><del>- <?php cancel_comment_reply_link( __('Click here to cancel reply.', 'buddypress') ); ?>
</del><ins>+ <?php cancel_comment_reply_link( __( 'Click here to cancel reply.', 'buddypress' ) ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php if ( get_option( 'comment_registration' ) && !$user_ID ) : ?>
</span><span class="lines">@@ -127,8 +146,29 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- </div>
</del><ins>+ </div><!-- .comment-content -->
+ </div><!-- #respond -->
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- </div>
</del><ins>+ <?php if ( $numTrackBacks ) : ?>
+ <div id="trackbacks">
+
+ <span class="title"><?php the_title() ?></span>
+
+ <?php if ( 1 == $numTrackBacks ) : ?>
+ <h3><?php printf( __( '%d Trackback', 'buddypress' ), $numTrackBacks ) ?></h3>
+ <?php else : ?>
+ <h3><?php printf( __( '%d Trackbacks', 'buddypress' ), $numTrackBacks ) ?></h3>
+ <?php endif; ?>
+
+ <ul id="trackbacklist">
+ <?php foreach ( $comments as $comment ) : ?>
+
+ <?php if ( get_comment_type() != 'comment' ) : ?>
+ <li><h5><?php comment_author_link() ?></h5><em>on <?php comment_date() ?></em></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ <?php endif; ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (2203 => 2204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2009-12-18 14:11:08 UTC (rev 2203)
+++ trunk/bp-themes/bp-default/functions.php 2009-12-18 14:28:54 UTC (rev 2204)
</span><span class="lines">@@ -54,6 +54,53 @@
</span><span class="cx"> return $fullname[0];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_dtheme_add_blog_comments_js() {
+ if ( is_singular() ) wp_enqueue_script( 'comment-reply' );
+}
+add_action( 'template_redirect', 'bp_dtheme_add_blog_comments_js' );
+
+function bp_dtheme_comments( $comment, $args, $depth ) {
+ $GLOBALS['comment'] = $comment;
+ $comment_type = get_comment_type();
+
+ if ( $comment->user_id )
+ $userlink = bp_core_get_userurl( $comment->user_id );
+
+ if ( $comment_type == 'comment' ) { ?>
+ <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
+
+ <div class="comment-avatar-box<?php if ( $comment->user_id ) : ?> extra<?php endif; ?>">
+ <div class="avb">
+ <a href="<?php if ( $userlink ) : echo $userlink; else : echo get_comment_author_url(); endif;?>">
+ <?php echo get_avatar( $comment, 50 ); ?>
+ </a>
+ </div>
+ </div>
+
+ <div class="comment-content">
+
+ <div class="comment-meta">
+ <a href="<?php if ( $userlink ) : echo $userlink; else : echo get_comment_author_url(); endif;?>"><?php echo get_comment_author(); ?></a> <?php _e( 'said:', 'buddypress' ) ?>
+ <em><?php _e( 'On', 'buddypress' ) ?> <a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date() ?></a></em>
+ </div>
+
+ <?php if ($comment->comment_approved == '0') : ?>
+ <em class="moderate"><?php _e('Your comment is awaiting moderation.'); ?></em><br />
+ <?php endif; ?>
+
+ <?php comment_text() ?>
+
+ <div class="comment-options">
+ <?php echo comment_reply_link( array('depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
+ <?php edit_comment_link( __( 'Edit' ),'','' ); ?>
+ </div>
+
+ </div>
+ </li>
+ <?php } ?>
+<?php
+}
+
</ins><span class="cx"> function bp_dtheme_remove_redundant() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/index.php (2203 => 2204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/index.php 2009-12-18 14:11:08 UTC (rev 2203)
+++ trunk/bp-themes/bp-default/index.php 2009-12-18 14:28:54 UTC (rev 2204)
</span><span class="lines">@@ -15,16 +15,23 @@
</span><span class="cx">
</span><span class="cx"> <div class="post" id="post-<?php the_ID(); ?>">
</span><span class="cx">
</span><del>- <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent Link to', 'buddypress' ) ?> <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
</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="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>
</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>- <div class="entry">
- <?php the_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ); ?>
</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>
+
+ <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"><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>
-
</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="trunkbpthemesbpdefaultsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/single.php (2203 => 2204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/single.php 2009-12-18 14:11:08 UTC (rev 2203)
+++ trunk/bp-themes/bp-default/single.php 2009-12-18 14:28:54 UTC (rev 2204)
</span><span class="lines">@@ -18,20 +18,25 @@
</span><span class="cx">
</span><span class="cx"> <div class="post" id="post-<?php the_ID(); ?>">
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_blog_post' ) ?>
</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>- <h3><a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php _e( 'Permanent link to', 'buddypress' ) ?> <?php the_title(); ?>"><?php the_title(); ?></a></h3>
</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>- <div class="entry">
</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><del>- <?php the_content( __( '<p class="serif">Read the rest of this entry &raquo;</p>', 'buddypress' ) ); ?>
</del><ins>+ <div class="entry">
+ <?php the_content( __( 'Read the rest of this entry &raquo;', 'buddypress' ) ); ?>
</ins><span class="cx">
</span><del>- <?php wp_link_pages(array('before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
</del><ins>+ <?php wp_link_pages(array('before' => __( '<p><strong>Pages:</strong> ', 'buddypress' ), 'after' => '</p>', 'next_or_number' => 'number')); ?>
+ </div>
</ins><span class="cx">
</span><ins>+ <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>- <?php do_action( 'bp_after_blog_post' ) ?>
-
</del><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php comments_template(); ?>
</span></span></pre>
</div>
</div>
</body>
</html>