Changeset 4580

Timestamp:

07/02/2011 11:25:03 AM (15 years ago)

Author:

djpaul

Message:

Correct i18n and RTL for comment styles. Finally fixes #3242

Location:

trunk/bp-themes/bp-default

Files:

• _inc/css/default-rtl.css (modified) (5 diffs)
• _inc/css/default.css (modified) (1 diff)
• functions.php (modified) (1 diff)

trunk/bp-themes/bp-default/_inc/css/default-rtl.css

@@ -197 +197 @@
         font-family: sans-serif;
 }
-#respond .comment-avatar-box {
-        float: right;
-        margin: 0 0 0 15px;
-}
-div.post-content,
-div.comment-content {
+div.post-content {
         margin-right: 105px;
         margin-left: 0;
@@ -313 +308 @@
         float: left;
 }
+ol.commentlist li {
+        clear: right;
+}
 .commentlist ul.children {
         margin: 15px 70px 15px 0;
@@ -319 +317 @@
         margin: 0 25px 0 0 0;
 }
+.commentlist ul.children div.comment-options a.comment-reply-link {
+        margin-left: 0;
+        margin-right: auto;
+}
 ol.commentlist #respond {
         clear: right;
@@ -324 +326 @@
         margin-right: 70px;
 }
+.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;
+}
 div.comment-meta {
         float: right;
@@ -335 +349 @@
 div.comment-meta .comment-options {
         float: left;
+}
+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;
 }
 

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -711 +711 @@
 .commentlist ul.children div.comment-avatar-box {
         float: left;
-        margin: 0px 10px 0 0;
+        margin: 0 10px 0 0;
 }
 div.comment-avatar-box img {

trunk/bp-themes/bp-default/functions.php

@@ -439 +439 @@
                         <div class="comment-meta">
                                 <p>
-                                        <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>
-
-                                        <?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; ?>
-
-                                        <?php edit_comment_link( __( 'Edit', 'buddypress' ) ); ?>
+                                        <?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' ) ) );
+
+                                                $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' );
+
+                                                /* 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 );
+                                        ?>
                                 </p>