<!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][3624] trunk/bp-themes/bp-default: Use comment_form() to comply with WP theme standards and improves code style in comments.php.</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>3624</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-30 21:29:17 +0000 (Thu, 30 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use comment_form() to comply with WP theme standards and improves code style in comments.php. Fixes #2978. Props denis.ogun (via Google Code In)</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="#trunkbpthemesbpdefaultrtlcss">trunk/bp-themes/bp-default/rtl.css</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 (3623 => 3624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-12-30 21:27:49 UTC (rev 3623)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-12-30 21:29:17 UTC (rev 3624)
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> border-color: #c4e9bd;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#signup_form div div.error {
</del><ins>+.standard-form#signup_form div div.error {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> background: #e41717;
</span><span class="cx"> -moz-border-radius: 3px;
</span><span class="lines">@@ -967,10 +967,10 @@
</span><span class="cx"> /* > Input Forms
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-form.standard-form textarea,
-form.standard-form input[type=text],
-form.standard-form select,
-form.standard-form input[type=password],
</del><ins>+.standard-form textarea,
+.standard-form input[type=text],
+.standard-form select,
+.standard-form input[type=password],
</ins><span class="cx"> .dir-search input[type=text] {
</span><span class="cx"> border: 1px inset #ccc;
</span><span class="cx"> -moz-border-radius: 3px;
</span><span class="lines">@@ -982,54 +982,54 @@
</span><span class="cx"> color: #888;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form select {
</del><ins>+.standard-form select {
</ins><span class="cx"> padding: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form input[type=password] {
</del><ins>+.standard-form input[type=password] {
</ins><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form label,
-form.standard-form span.label {
</del><ins>+.standard-form label,
+.standard-form span.label {
</ins><span class="cx"> display: block;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> margin: 15px 0 5px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.checkbox label,
-form.standard-form div.radio label {
</del><ins>+.standard-form div.checkbox label,
+.standard-form div.radio label {
</ins><span class="cx"> font-weight: normal;
</span><span class="cx"> margin: 5px 0 0 0;
</span><span class="cx"> font-size: 14px;
</span><span class="cx"> color: #888;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#sidebar-login-form label {
</del><ins>+.standard-form#sidebar-login-form label {
</ins><span class="cx"> margin-top: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form input[type=text] {
</del><ins>+.standard-form input[type=text] {
</ins><span class="cx"> width: 75%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#sidebar-login-form input[type=text],
-form.standard-form#sidebar-login-form input[type=password] {
</del><ins>+.standard-form#sidebar-login-form input[type=text],
+.standard-form#sidebar-login-form input[type=password] {
</ins><span class="cx"> padding: 4px;
</span><span class="cx"> width: 95%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #basic-details-section input[type=password],
-form.standard-form #blog-details-section input#signup_blog_url {
</del><ins>+.standard-form #basic-details-section input[type=password],
+.standard-form #blog-details-section input#signup_blog_url {
</ins><span class="cx"> width: 35%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#signup_form input[type=text],
-form.standard-form#signup_form textarea {
</del><ins>+.standard-form#signup_form input[type=text],
+.standard-form#signup_form textarea {
</ins><span class="cx"> width: 90%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#signup_form div.submit {
</del><ins>+.standard-form#signup_form div.submit {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1037,67 +1037,67 @@
</span><span class="cx"> margin: 0 15px 10px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form textarea {
</del><ins>+.standard-form textarea {
</ins><span class="cx"> width: 75%;
</span><span class="cx"> height: 120px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form textarea#message_content {
</del><ins>+.standard-form textarea#message_content {
</ins><span class="cx"> height: 200px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#send-reply textarea {
</del><ins>+.standard-form#send-reply textarea {
</ins><span class="cx"> width: 97.5%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form p.description {
</del><ins>+.standard-form p.description {
</ins><span class="cx"> font-size: 11px;
</span><span class="cx"> color: #888;
</span><span class="cx"> margin: 5px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.submit {
</del><ins>+.standard-form div.submit {
</ins><span class="cx"> padding: 15px 0;
</span><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.submit input {
</del><ins>+.standard-form div.submit input {
</ins><span class="cx"> margin-right: 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.radio ul {
</del><ins>+.standard-form div.radio ul {
</ins><span class="cx"> margin: 10px 0 15px 38px;
</span><span class="cx"> list-style: disc;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.radio ul li {
</del><ins>+.standard-form div.radio ul li {
</ins><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form a.clear-value {
</del><ins>+.standard-form a.clear-value {
</ins><span class="cx"> display: block;
</span><span class="cx"> margin-top: 5px;
</span><span class="cx"> outline: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #basic-details-section,
-form.standard-form #blog-details-section,
-form.standard-form #profile-details-section {
</del><ins>+.standard-form #basic-details-section,
+.standard-form #blog-details-section,
+.standard-form #profile-details-section {
</ins><span class="cx"> float: left;
</span><span class="cx"> width: 48%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #profile-details-section {
</del><ins>+.standard-form #profile-details-section {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #blog-details-section {
</del><ins>+.standard-form #blog-details-section {
</ins><span class="cx"> clear: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form input:focus,
-form.standard-form textarea:focus,
-form.standard-form select:focus {
</del><ins>+.standard-form input:focus,
+.standard-form textarea:focus,
+.standard-form select:focus {
</ins><span class="cx"> background: #fafafa;
</span><span class="cx"> color: #555;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/comments.php (3623 => 3624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/comments.php 2010-12-30 21:27:49 UTC (rev 3623)
+++ trunk/bp-themes/bp-default/comments.php 2010-12-30 21:29:17 UTC (rev 3624)
</span><span class="lines">@@ -1,183 +1,100 @@
</span><del>- <?php
- if ( post_password_required() ) :
- echo '<h3 class="comments-header">' . __('Password Protected', 'buddypress') . '</h3>';
- echo '<p class="alert password-protected">' . __('Enter the password to view comments.', 'buddypress') . '</p>';
- return;
- endif;
</del><ins>+<?php
+ if ( post_password_required() ) {
+ echo '<h3 class="comments-header">' . __( 'Password Protected', 'buddypress' ) . '</h3>';
+ echo '<p class="alert password-protected">' . __( 'Enter the password to view comments.', 'buddypress' ) . '</p>';
+ return;
+ }
</ins><span class="cx">
</span><del>- if ( is_page() && !have_comments() && !comments_open() && !pings_open() )
- return;
- ?>
</del><ins>+ if ( is_page() && !have_comments() && !comments_open() && !pings_open() )
+ return;
</ins><span class="cx">
</span><del>- <?php if ( have_comments() ) : ?>
</del><ins>+ if ( have_comments() ) :
+ $num_comments = 0;
+ $num_trackbacks = 0;
+ foreach ( (array)$comments as $comment ) {
+ if ( 'comment' != get_comment_type() )
+ $num_trackbacks++;
+ else
+ $num_comments++;
+ }
+?>
+ <div id="comments">
</ins><span class="cx">
</span><del>- <div id="comments">
</del><ins>+ <h3>
+ <?php printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', $num_comments, 'buddypress' ), number_format_i18n( $num_comments ), '<em>' . get_the_title() . '</em>' ) ?>
+ </h3>
</ins><span class="cx">
</span><del>- <?php
- // Only include comments
- $numTrackBacks = 0; $numComments = 0;
- foreach ( (array)$comments as $comment )
- if ( 'comment' != get_comment_type() )
- $numTrackBacks++;
- else
- $numComments++;
- ?>
</del><ins>+ <?php do_action( 'bp_before_blog_comment_list' ) ?>
</ins><span class="cx">
</span><del>- <h3 id="comments">
- <?php
- printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', $numComments, 'buddypress' ),
- number_format_i18n( $numComments ), '<em>' . get_the_title() . '</em>' );
- ?>
- </h3>
</del><ins>+ <ol class="commentlist">
+ <?php wp_list_comments( array( 'callback' => 'bp_dtheme_blog_comments' ) ) ?>
+ </ol><!-- .comment-list -->
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_blog_comment_list' ) ?>
</del><ins>+ <?php do_action( 'bp_after_blog_comment_list' ) ?>
</ins><span class="cx">
</span><del>- <ol class="commentlist">
- <?php wp_list_comments( array( 'callback' => 'bp_dtheme_blog_comments' ) ); ?>
- </ol><!-- .comment-list -->
-
- <?php do_action( 'bp_after_blog_comment_list' ) ?>
-
- <?php if ( get_option( 'page_comments' ) ) : ?>
-
- <div class="comment-navigation paged-navigation">
-
- <?php paginate_comments_links(); ?>
-
- </div>
-
- <?php endif; ?>
-
- </div><!-- #comments -->
-
- <?php else : ?>
-
- <?php if ( pings_open() && !comments_open() && is_single() ) : ?>
-
- <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>
-
- <?php elseif ( !comments_open() && is_single() ) : ?>
-
- <p class="comments-closed">
- <?php _e('Comments are closed.', 'buddypress'); ?>
- </p>
-
</del><ins>+ <?php if ( get_option( 'page_comments' ) ) : ?>
+ <div class="comment-navigation paged-navigation">
+ <?php paginate_comments_links() ?>
+ </div>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ </div><!-- #comments -->
+<?php else : ?>
+
+ <?php if ( pings_open() && !comments_open() && is_single() ) : ?>
+ <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>
+ <?php elseif ( !comments_open() && is_single() ) : ?>
+ <p class="comments-closed">
+ <?php _e( 'Comments are closed.', 'buddypress' ) ?>
+ </p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( comments_open() ) : ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><del>- <div id="respond">
</del><ins>+<?php if ( comments_open() ) : ?>
+ <div id="respond">
</ins><span class="cx">
</span><del>- <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">
-
- <h3 id="reply" class="comments-header">
- <?php comment_form_title( __( 'Leave a Reply', 'buddypress' ), __( 'Leave a Reply to %s', 'buddypress' ), true ); ?>
- </h3>
-
- <p id="cancel-comment-reply">
- <?php cancel_comment_reply_link( __( 'Click here to cancel reply.', 'buddypress' ) ); ?>
- </p>
-
- <?php if ( get_option( 'comment_registration' ) && !$user_ID ) : ?>
-
- <p class="alert">
- <?php printf( __('You must be <a href="%1$s" title="Log in">logged in</a> to post a comment.', 'buddypress'), wp_login_url( get_permalink() ) ); ?>
- </p>
-
</del><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>
</ins><span class="cx"> <?php else : ?>
</span><del>-
- <?php do_action( 'bp_before_blog_comment_form' ) ?>
-
- <form action="<?php echo site_url( 'wp-comments-post.php' ) ?>" method="post" id="commentform" class="standard-form">
-
- <?php if ( $user_ID ) : ?>
-
- <p class="log-in-out">
- <?php printf( __('Logged in as <a href="%1$s" title="%2$s">%2$s</a>.', 'buddypress'), bp_loggedin_user_domain(), $user_identity ); ?> <a href="<?php echo wp_logout_url( get_permalink() ); ?>" title="<?php _e('Log out of this account', 'buddypress'); ?>"><?php _e('Log out &rarr;', 'buddypress'); ?></a>
- </p>
-
- <?php else : ?>
-
- <?php $req = get_option( 'require_name_email' ); ?>
-
- <p class="form-author">
- <label for="author"><?php _e('Name', 'buddypress'); ?> <?php if ( $req ) : ?><span class="required"><?php _e('*', 'buddypress'); ?></span><?php endif; ?></label>
- <input type="text" class="text-input" name="author" id="author" value="<?php echo $comment_author; ?>" size="40" tabindex="1" />
- </p>
-
- <p class="form-email">
- <label for="email"><?php _e('Email', 'buddypress'); ?> <?php if ( $req ) : ?><span class="required"><?php _e('*', 'buddypress'); ?></span><?php endif; ?></label>
- <input type="text" class="text-input" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="40" tabindex="2" />
- </p>
-
- <p class="form-url">
- <label for="url"><?php _e('Website', 'buddypress'); ?></label>
- <input type="text" class="text-input" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="40" tabindex="3" />
- </p>
-
- <?php endif; ?>
-
- <p class="form-textarea">
- <label for="comment"><?php _e('Comment', 'buddypress'); ?></label>
- <textarea name="comment" id="comment" cols="60" rows="10" tabindex="4"></textarea>
- </p>
-
- <?php do_action( 'bp_blog_comment_form' ) ?>
-
- <p class="form-submit">
- <input class="submit-comment button" name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit', 'buddypress'); ?>" />
- <?php comment_id_fields(); ?>
- </p>
-
- <div class="comment-action">
- <?php do_action( 'comment_form', $post->ID ); ?>
- </div>
-
- </form>
-
- <?php do_action( 'bp_after_blog_comment_form' ) ?>
-
</del><ins>+ <?php echo get_avatar( 0, 50 ) ?>
</ins><span class="cx"> <?php endif; ?>
</span><ins>+ </div>
+ </div>
</ins><span class="cx">
</span><del>- </div><!-- .comment-content -->
- </div><!-- #respond -->
</del><ins>+ <div class="comment-content standard-form">
+ <?php comment_form() ?>
+ </div><!-- .comment-content -->
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ </div><!-- #respond -->
+<?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( isset( $numTrackBacks ) && $numTrackBacks ) : ?>
- <div id="trackbacks">
</del><ins>+<?php if ( !empty( $num_trackbacks ) ) : ?>
+ <div id="trackbacks">
+ <span class="title"><?php the_title() ?></span>
</ins><span class="cx">
</span><del>- <span class="title"><?php the_title() ?></span>
</del><ins>+ <h3>
+ <?php printf( _n( '%d Trackback', '%d Trackbacks', $num_trackbacks, 'buddypress' ), number_format_i18n( $num_trackbacks ) ) ?>
+ </h3>
</ins><span class="cx">
</span><del>- <?php if ( 1 == $numTrackBacks ) : ?>
- <h3><?php printf( __( '%d Trackback', 'buddypress' ), $numTrackBacks ) ?></h3>
- <?php else : ?>
- <h3><?php printf( __( '%d Trackbacks', 'buddypress' ), $numTrackBacks ) ?></h3>
- <?php endif; ?>
</del><ins>+ <ul id="trackbacklist">
+ <?php foreach ( (array)$comments as $comment ) : ?>
</ins><span class="cx">
</span><del>- <ul id="trackbacklist">
- <?php foreach ( (array)$comments as $comment ) : ?>
</del><ins>+ <?php if ( 'comment' != get_comment_type() ) : ?>
+ <li>
+ <h5><?php comment_author_link() ?></h5>
+ <em>on <?php comment_date() ?></em>
+ </li>
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?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; ?>
</del><ins>+ <?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 (3623 => 3624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2010-12-30 21:27:49 UTC (rev 3623)
+++ trunk/bp-themes/bp-default/functions.php 2010-12-30 21:29:17 UTC (rev 3624)
</span><span class="lines">@@ -477,8 +477,7 @@
</span><span class="cx"> * @see wp_nav_menu()
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><del>-function bp_dtheme_main_nav( $args ) {
-?>
</del><ins>+function bp_dtheme_main_nav( $args ) { ?>
</ins><span class="cx"> <ul id="nav">
</span><span class="cx"> <li<?php if ( is_front_page() ) : ?> class="selected"<?php endif; ?>>
</span><span class="cx"> <a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
</span><span class="lines">@@ -490,6 +489,46 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Applies BuddyPress customisations to the post comment form.
+ *
+ * @global string $user_identity The display name of the user
+ * @param array $default_labels The default options for strings, fields etc in the form
+ * @see comment_form()
+ * @since 1.3
+ */
+function bp_dtheme_comment_form( $default_labels ) {
+ global $user_identity;
+
+ $commenter = wp_get_current_commenter();
+ $req = get_option( 'require_name_email' );
+ $aria_req = ( $req ? " aria-required='true'" : '' );
+ $fields = array(
+ 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? '<span class="required"> *</span>' : '' ) . '</label> ' .
+ '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>',
+ 'email' => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? '<span class="required"> *</span>' : '' ) . '</label> ' .
+ '<input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
+ 'url' => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' .
+ '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
+ );
+
+ $new_labels = array(
+ 'cancel_reply_link' => '<p id="cancel-comment-reply">' . __( 'Cancel reply', 'buddypress' ) . '</p>',
+ 'comment_field' => '<p class="form-textarea"><label for="comment">' . __( 'Comment', 'buddypress' ) . '</label><textarea name="comment" id="comment" cols="60" rows="10" aria-required="true"></textarea></p>',
+ 'comment_notes_after' => '',
+ 'comment_notes_before' => '',
+ 'fields' => apply_filters( 'comment_form_default_fields', $fields ),
+ 'logged_in_as' => '<p class="log-in-out">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s">Log out?</a>', 'buddypress' ), bp_loggedin_user_domain(), $user_identity, wp_logout_url( get_permalink() ) ) . '</p>',
+ 'must_log_in' => '<p class="alert">' . sprintf( __( 'You must be <a href="%1$s">logged in</a> to post a comment.', 'buddypress' ), wp_login_url( get_permalink() ) ) . '</p>',
+ 'title_reply' => '<h3 id="reply" class="comments-header">' . __( 'Leave a reply', 'buddypress' ) . '</h3>',
+ 'title_reply_to' => '<h3 id="reply" class="comments-header">' . __( 'Leave a reply to %s', 'buddypress' ) . '</h3>'
+ );
+
+ return apply_filters( 'bp_dtheme_comment_form', array_merge( $default_labels, $new_labels ) );
+}
+add_filter( 'comment_form_defaults', 'bp_dtheme_comment_form', 10 );
+
+
</ins><span class="cx"> // Everything beyond this point is deprecated as of BuddyPress 1.3. This will be removed in a future version.
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/rtl.css (3623 => 3624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/rtl.css 2010-12-30 21:27:49 UTC (rev 3623)
+++ trunk/bp-themes/bp-default/rtl.css 2010-12-30 21:29:17 UTC (rev 3624)
</span><span class="lines">@@ -344,35 +344,35 @@
</span><span class="cx"> /* > Input Forms
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><del>-form.standard-form#signup_form div.submit {
</del><ins>+.standard-form#signup_form div.submit {
</ins><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form#signup_form div.signup-avatar {
</del><ins>+.standard-form#signup_form div.signup-avatar {
</ins><span class="cx"> margin-left: 15px;
</span><span class="cx"> margin-right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.submit input {
</del><ins>+.standard-form div.submit input {
</ins><span class="cx"> margin-left: 15px;
</span><span class="cx"> margin-right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form div.radio ul {
</del><ins>+.standard-form div.radio ul {
</ins><span class="cx"> margin: 10px 38px 15px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #basic-details-section,
-form.standard-form #blog-details-section,
-form.standard-form #profile-details-section {
</del><ins>+.standard-form #basic-details-section,
+.standard-form #blog-details-section,
+.standard-form #profile-details-section {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #profile-details-section {
</del><ins>+.standard-form #profile-details-section {
</ins><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-form.standard-form #blog-details-section {
</del><ins>+.standard-form #blog-details-section {
</ins><span class="cx"> clear: right;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>