Skip to:
Content

BuddyPress.org

Changeset 4580


Ignore:
Timestamp:
07/02/2011 11:25:03 AM (14 years ago)
Author:
djpaul
Message:

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

Location:
trunk/bp-themes/bp-default
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-default/_inc/css/default-rtl.css

    r4579 r4580  
    197197    font-family: sans-serif;
    198198}
    199 #respond .comment-avatar-box {
    200     float: right;
    201     margin: 0 0 0 15px;
    202 }
    203 div.post-content,
    204 div.comment-content {
     199div.post-content {
    205200    margin-right: 105px;
    206201    margin-left: 0;
     
    313308    float: left;
    314309}
     310ol.commentlist li {
     311    clear: right;
     312}
    315313.commentlist ul.children {
    316314    margin: 15px 70px 15px 0;
     
    319317    margin: 0 25px 0 0 0;
    320318}
     319.commentlist ul.children div.comment-options a.comment-reply-link {
     320    margin-left: 0;
     321    margin-right: auto;
     322}
    321323ol.commentlist #respond {
    322324    clear: right;
     
    324326    margin-right: 70px;
    325327}
     328.commentlist ul.children #respond {
     329    margin-left: 20px;
     330    margin-right: 35px;
     331}
     332ol.commentlist div.comment-avatar-box {
     333    float: right;
     334    margin: 15px 0 0 15px;
     335}
     336.commentlist ul.children div.comment-avatar-box {
     337    float: right;
     338    margin: 0 0 0 10px;
     339}
    326340div.comment-meta {
    327341    float: right;
     
    335349div.comment-meta .comment-options {
    336350    float: left;
     351}
     352div.comment-meta span.comment-highlight a {
     353    border-left: 1px solid #a1dcfa;
     354    border-right: 0;
     355    margin-left: 3px;
     356    margin-right: auto;
     357}
     358.comment-entry {
     359    float: right;
     360}
     361#reply-title small {
     362    float: left;
     363}
     364#reply-title small a,
     365div.comment-options a.comment-reply-link {
     366    border-left: 1px solid #FFE8C4;
     367    border-right: 0;
     368    margin-left: 10px;
     369    margin-right: auto;
     370}
     371#reply-title small a {
     372    margin-right: auto;
     373    margin-left: 0;
     374}
     375#respond .comment-avatar-box {
     376    float: right;
     377    margin: 0 0 0 15px;
    337378}
    338379
  • trunk/bp-themes/bp-default/_inc/css/default.css

    r4579 r4580  
    711711.commentlist ul.children div.comment-avatar-box {
    712712    float: left;
    713     margin: 0px 10px 0 0;
     713    margin: 0 10px 0 0;
    714714}
    715715div.comment-avatar-box img {
  • trunk/bp-themes/bp-default/functions.php

    r4579 r4580  
    439439            <div class="comment-meta">
    440440                <p>
    441                     <a href="<?php echo get_comment_author_url() ?>" rel="nofollow"><?php echo get_comment_author() ?></a> <?php echo _n( 'said:', 'replied:', $depth, 'buddypress' ) ?>
    442                     <span class="time-since">&nbsp; <?php comment_date() ?></span>
    443 
    444                     <?php if ( 1 == $depth ) : ?>
    445                         <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
    446                     <?php elseif ( comments_open() ) : ?>
    447                         <?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
    448                     <?php endif; ?>
    449 
    450                     <?php edit_comment_link( __( 'Edit', 'buddypress' ) ); ?>
     441                    <?php
     442                        if ( 1 == $depth )
     443                            $links = sprintf( '<a href="#comment-%1$d">%2$s</a>', get_comment_ID(), __( 'View', 'buddypress' ) );
     444                        else
     445                            $links = get_comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) );
     446
     447                        $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' ) );
     448                        $noun = _n( 'said:', 'replied:', $depth, 'buddypress' );
     449
     450                        /* translators: 1: comment author url, 2: comment author name, 3: "said:" or "replied:", 4: comment date/timestamp, 5: view/reply & edit comment links */
     451                        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 );
     452                    ?>
    451453                </p>
    452454
Note: See TracChangeset for help on using the changeset viewer.