<!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][4580] trunk/bp-themes/bp-default: Correct i18n and RTL for comment styles.</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>4580</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-07-02 11:25:03 +0000 (Sat, 02 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct i18n and RTL for comment styles. Finally fixes #3242</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultrtlcss">trunk/bp-themes/bp-default/_inc/css/default-rtl.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default-rtl.css (4579 => 4580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-01 22:10:30 UTC (rev 4579)
+++ trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-02 11:25:03 UTC (rev 4580)
</span><span class="lines">@@ -196,12 +196,7 @@
</span><span class="cx"> margin: 0 0 15px 15px;
</span><span class="cx"> font-family: sans-serif;
</span><span class="cx"> }
</span><del>-#respond .comment-avatar-box {
- float: right;
- margin: 0 0 0 15px;
-}
-div.post-content,
-div.comment-content {
</del><ins>+div.post-content {
</ins><span class="cx"> margin-right: 105px;
</span><span class="cx"> margin-left: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -312,17 +307,36 @@
</span><span class="cx"> .comments {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><ins>+ol.commentlist li {
+ clear: right;
+}
</ins><span class="cx"> .commentlist ul.children {
</span><span class="cx"> margin: 15px 70px 15px 0;
</span><span class="cx"> }
</span><span class="cx"> .commentlist ul.children ul {
</span><span class="cx"> margin: 0 25px 0 0 0;
</span><span class="cx"> }
</span><ins>+.commentlist ul.children div.comment-options a.comment-reply-link {
+ margin-left: 0;
+ margin-right: auto;
+}
</ins><span class="cx"> ol.commentlist #respond {
</span><span class="cx"> clear: right;
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: 70px;
</span><span class="cx"> }
</span><ins>+.commentlist ul.children #respond {
+ margin-left: 20px;
+ margin-right: 35px;
+}
+ol.commentlist div.comment-avatar-box {
+ float: right;
+ margin: 15px 0 0 15px;
+}
+.commentlist ul.children div.comment-avatar-box {
+ float: right;
+ margin: 0 0 0 10px;
+}
</ins><span class="cx"> div.comment-meta {
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="lines">@@ -335,6 +349,33 @@
</span><span class="cx"> div.comment-meta .comment-options {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><ins>+div.comment-meta span.comment-highlight a {
+ border-left: 1px solid #a1dcfa;
+ border-right: 0;
+ margin-left: 3px;
+ margin-right: auto;
+}
+.comment-entry {
+ float: right;
+}
+#reply-title small {
+ float: left;
+}
+#reply-title small a,
+div.comment-options a.comment-reply-link {
+ border-left: 1px solid #FFE8C4;
+ border-right: 0;
+ margin-left: 10px;
+ margin-right: auto;
+}
+#reply-title small a {
+ margin-right: auto;
+ margin-left: 0;
+}
+#respond .comment-avatar-box {
+ float: right;
+ margin: 0 0 0 15px;
+}
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*--------------------------------------------------------------
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4579 => 4580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-01 22:10:30 UTC (rev 4579)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-02 11:25:03 UTC (rev 4580)
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> }
</span><span class="cx"> .commentlist ul.children div.comment-avatar-box {
</span><span class="cx"> float: left;
</span><del>- margin: 0px 10px 0 0;
</del><ins>+ margin: 0 10px 0 0;
</ins><span class="cx"> }
</span><span class="cx"> div.comment-avatar-box img {
</span><span class="cx"> border: 2px solid #eee;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (4579 => 4580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2011-07-01 22:10:30 UTC (rev 4579)
+++ trunk/bp-themes/bp-default/functions.php 2011-07-02 11:25:03 UTC (rev 4580)
</span><span class="lines">@@ -438,16 +438,18 @@
</span><span class="cx"> <div class="comment-content">
</span><span class="cx"> <div class="comment-meta">
</span><span class="cx"> <p>
</span><del>- <a href="<?php echo get_comment_author_url() ?>" rel="nofollow"><?php echo get_comment_author() ?></a> <?php echo _n( 'said:', 'replied:', $depth, 'buddypress' ) ?>
- <span class="time-since">&nbsp; <?php comment_date() ?></span>
</del><ins>+ <?php
+ if ( 1 == $depth )
+ $links = sprintf( '<a href="#comment-%1$d">%2$s</a>', get_comment_ID(), __( 'View', 'buddypress' ) );
+ else
+ $links = get_comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) );
</ins><span class="cx">
</span><del>- <?php if ( 1 == $depth ) : ?>
- <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
- <?php elseif ( comments_open() ) : ?>
- <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
- <?php endif; ?>
</del><ins>+ $links .= sprintf( ' <a class="comment-edit-link" href="%1$s" title="%2$s">%3$s</a>', get_edit_comment_link( $comment->comment_ID ), esc_attr__( 'Edit comment', 'buddypress' ), __( 'Edit', 'buddypress' ) );
+ $noun = _n( 'said:', 'replied:', $depth, 'buddypress' );
</ins><span class="cx">
</span><del>- <?php edit_comment_link( __( 'Edit', 'buddypress' ) ); ?>
</del><ins>+ /* translators: 1: comment author url, 2: comment author name, 3: "said:" or "replied:", 4: comment date/timestamp, 5: view/reply & edit comment links */
+ printf( __( '<a href="%1$s" rel="nofollow">%2$s</a> %3$s <span class="time-since">&nbsp; %4$s</span> %5$s', 'buddypress' ), get_comment_author_url(), get_comment_author(), $noun, get_comment_date(), $links );
+ ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
</span></span></pre>
</div>
</div>
</body>
</html>