Skip to:
Content

BuddyPress.org

Changeset 4611


Ignore:
Timestamp:
07/04/2011 08:54:42 PM (10 years ago)
Author:
djpaul
Message:

Change styling for activity items and comments.
Fix several pre-existing RTL issues.
Fix gravatar size inconsistencies.

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/bp-activity-filters.php

    r4367 r4611  
    8888    $activity_allowedtags['div']['id']     = array();
    8989    $activity_allowedtags['a']['class']    = array();
     90    $activity_allowedtags['a']['id']       = array();
    9091    $activity_allowedtags['a']['rel']      = array();
    9192    $activity_allowedtags['img']           = array();
  • trunk/bp-activity/bp-activity-functions.php

    r4596 r4611  
    677677    // Record this on the user's profile
    678678    $from_user_link   = bp_core_get_userlink( $user_id );
    679     $activity_action  = sprintf( __( '%s posted an update:', 'buddypress' ), $from_user_link );
     679    $activity_action  = sprintf( __( '%s posted an update', 'buddypress' ), $from_user_link );
    680680    $activity_content = $content;
    681681    $primary_link     = bp_core_get_userlink( $user_id, false, true );
     
    729729    $comment_id = bp_activity_add( array(
    730730        'id' => $id,
    731         'action' => apply_filters( 'bp_activity_comment_action', sprintf( __( '%s posted a new activity comment:', 'buddypress' ), bp_core_get_userlink( $user_id ) ) ),
     731        'action' => apply_filters( 'bp_activity_comment_action', sprintf( __( '%s posted a new activity comment', 'buddypress' ), bp_core_get_userlink( $user_id ) ) ),
    732732        'content' => apply_filters( 'bp_activity_comment_content', $content ),
    733733        'component' => $bp->activity->id,
  • trunk/bp-activity/bp-activity-template.php

    r4589 r4611  
    700700        global $activities_template, $bp;
    701701
    702         // Strip any legacy time since placeholders -- TODO: Remove this in 1.3
     702        // Strip any legacy time since placeholders from BP 1.0-1.1
    703703        $content = str_replace( '<span class="time-since">%s</span>', '', $content );
    704704
    705705        // Insert the time since.
    706         $content .= ' ' . apply_filters_ref_array( 'bp_activity_time_since', array( '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity ) );
    707 
     706        $time_since = apply_filters_ref_array( 'bp_activity_time_since', array( '<span class="time-since">' . sprintf( __( ' %s ago ', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity ) );
     707   
    708708        // Insert the permalink
    709709        if ( !bp_is_single_activity() )
    710             $content .= apply_filters_ref_array( 'bp_activity_permalink', array( ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity ) );
    711 
    712         // Add the delete link if the user has permission on this item
    713         if ( bp_activity_user_can_delete() )
    714              $content .= apply_filters_ref_array( 'bp_activity_delete_link', array( ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity ) );
     710            $content .= apply_filters_ref_array( 'bp_activity_permalink', array( sprintf( ' about <a href="%1$s" class="view" title="%2$s">%3$s</a>', bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ), esc_attr__( 'View Discussion', 'buddypress' ), $time_since ), &$activities_template->activity ) );
     711        else
     712            $content .= $time_since;
     713
     714        if ( is_user_logged_in() && bp_activity_can_comment() )
     715            $content .= sprintf( '<a href="%1$s" class="acomment-reply bp-primary-action" id="acomment-comment-%2$d">%3$s</a>', bp_get_activity_comment_link(), bp_get_activity_id(), sprintf( __( 'Reply (<span>%s</span>)', 'buddypress' ), bp_activity_get_comment_count() ) );
    715716
    716717        return apply_filters( 'bp_insert_activity_meta', $content );
     
    12171218        }
    12181219
    1219         $link = '<a href="' . wp_nonce_url( $url, 'bp_activity_delete_link' ) . '" class="item-button ' . $class . ' confirm" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>';
     1220        $link = '<a href="' . wp_nonce_url( $url, 'bp_activity_delete_link' ) . '" class="item-button bp-secondary-action ' . $class . ' confirm" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>';
    12201221        return apply_filters( 'bp_get_activity_delete_link', $link );
    12211222    }
  • trunk/bp-groups/bp-groups-forums.php

    r4561 r4611  
    5252        $topic = bp_forums_get_topic_details( $topic_id );
    5353
    54         $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     54        $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
    5555        $activity_content = bp_create_excerpt( $post_text );
    5656        $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
     
    9191        $topic = bp_forums_get_topic_details( $topic_id );
    9292
    93         $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     93        $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
    9494        $activity_content = bp_create_excerpt( $topic_text );
    9595
     
    123123            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
    124124
    125         $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     125        $activity_action = sprintf( __( '%1$s started the forum topic %2$s in the group %3$s', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'/">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
    126126        $activity_content = bp_create_excerpt( $topic_text );
    127127
     
    156156        $topic = bp_forums_get_topic_details( $topic_id );
    157157
    158         $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     158        $activity_action = sprintf( __( '%1$s posted on the forum topic %2$s in the group %3$s', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug .'">' . esc_attr( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
    159159        $activity_content = bp_create_excerpt( $post_text );
    160160        $primary_link = bp_get_group_permalink( $bp->groups->current_group ) . 'forum/topic/' . $topic->topic_slug . '/';
  • trunk/bp-groups/bp-groups-functions.php

    r4605 r4611  
    494494
    495495    // Record this in activity streams
    496     $activity_action  = sprintf( __( '%1$s posted an update in the group %2$s:', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
     496    $activity_action  = sprintf( __( '%1$s posted an update in the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' );
    497497    $activity_content = $content;
    498498
  • trunk/bp-themes/bp-default/_inc/ajax.php

    r4558 r4611  
    215215
    216216                <div class="acomment-meta">
    217                     <?php echo bp_core_get_userlink( bp_get_activity_user_id() ) ?> &middot; <?php printf( __( '%s ago', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?>
    218                     <span class="acomment-replylink"> &middot; <a class="acomment-reply" href="#acomment-<?php bp_activity_id() ?>" id="acomment-reply-<?php echo esc_attr( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a></span>
    219                      &middot; <a href="<?php echo wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?>" class="delete acomment-delete confirm" rel="nofollow"><?php _e( 'Delete', 'buddypress' ) ?></a>
     217                    <?php
     218                    /* translators: 1: user profile link + username, 2: activity item permalink, 3: activity item timestamp */
     219                    printf( __( '%1$s replied <a href="%2$s">%3$s ago</a>', 'buddypress' ), bp_core_get_userlink( bp_get_activity_user_id() ), bp_get_activity_thread_permalink(), bp_core_time_since( bp_core_current_time() ) );
     220                    ?>
     221
     222                    <a class="acomment-reply bp-primary-action" href="#acomment-<?php bp_activity_id() ?>" id="acomment-reply-<?php echo esc_attr( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ); ?></a>
     223
     224                    <?php if ( bp_activity_user_can_delete() ) : ?>
     225                        <div class="acomment-options">
     226                            <a href="<?php echo wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/' . bp_get_activity_id() . '?cid=' . $comment_id, 'bp_activity_delete_link' ) ?>" class="delete acomment-delete confirm bp-secondary-action" rel="nofollow"><?php _e( 'Delete', 'buddypress' ); ?></a>
     227                        </div>
     228                    <?php endif; ?>
    220229                </div>
    221230
    222231                <div class="acomment-content">
    223                     <?php bp_activity_content_body() ?>
     232                    <?php bp_activity_content_body(); ?>
    224233                </div>
    225234            </li>
  • trunk/bp-themes/bp-default/_inc/css/default-rtl.css

    r4582 r4611  
    315315}
    316316.commentlist ul.children ul {
    317     margin: 0 25px 0 0 0;
    318 }
    319 .commentlist ul.children div.comment-options a.comment-reply-link {
    320     margin-left: 0;
    321     margin-right: auto;
     317    margin: 0 25px 0 0;
     318    padding-left: 0;
    322319}
    323320ol.commentlist #respond {
     
    338335    margin: 0 0 0 10px;
    339336}
     337.commentlist ul.children div.comment-options {
     338    margin-right: auto;
     339    margin-left: 0;
     340}
    340341#comments ol.commentlist ol {
    341342    margin: 0 2.5em 18px 0;
     
    352353div.comment-meta .comment-options {
    353354    float: left;
    354 }
    355 div.comment-meta span.comment-highlight a {
    356     border-left: 1px solid #a1dcfa;
    357     border-right: 0;
    358     margin-left: 3px;
    359355    margin-right: auto;
     356    margin-left: 10px;
    360357}
    361358.comment-entry {
     
    365362    float: left;
    366363}
    367 #reply-title small a,
    368 div.comment-options a.comment-reply-link {
    369     border-left: 1px solid #FFE8C4;
    370     border-right: 0;
     364#reply-title small a {
     365    margin-right: auto;
     366    margin-left: 0;
     367}
     368#respond .comment-avatar-box {
     369    float: right;
     370    margin: 0 0 0 15px;
     371}
     372.acomment-options {
     373    float: left;
    371374    margin-left: 10px;
    372375    margin-right: auto;
    373 }
    374 #reply-title small a {
    375     margin-right: auto;
    376     margin-left: 0;
    377 }
    378 #respond .comment-avatar-box {
    379     float: right;
    380     margin: 0 0 0 15px;
    381376}
    382377
     
    452447body.activity-permalink .activity-list li .activity-avatar img.avatar,
    453448body.activity-permalink .activity-list li .activity-avatar img.FB_profile_pic {
    454     margin-right: 175px;
    455 }
     449    margin-left: auto;
     450    margin-right: 0;
     451}
     452body.activity-permalink .activity-list li .activity-header > p {
     453    margin-left: auto;
     454    margin-right: -35px;
     455    padding: 5px 35px 0 0;
     456}
     457
    456458.activity-list li.mini .activity-content {
    457459    margin-right: 0;
     
    502504    margin-right: 0;
    503505}
    504 .activity-list .activity-content .activity-inner,
    505 .activity-list .activity-content blockquote {
    506     margin: 15px 5px 15px 0;
    507     overflow: hidden;
    508 }
    509506.activity-list .activity-content img.thumbnail {
    510507    float: right;
     
    521518--------------------------------------------------------------*/
    522519div.activity-meta {
    523     margin: 0 3px 20px 0;
    524     clear: right;
    525 }
    526 .activity-list div.activity-meta a {
    527     margin-left: 3px;
    528     margin-right: 0;
    529 }
    530 .activity-list div.activity-meta a.acomment-reply {
     520    margin: 0 0 20px 10px;
     521    clear: right;
    531522}
    532523div.activity-comments {
    533     margin: 0 75px 0 0;
     524    margin: 0 70px 0 0;
    534525}
    535526body.activity-permalink div.activity-comments {
     
    540531    clear: right;
    541532}
    542 div.activity-comments ul li {
    543     padding: 10px 0 10px 15px;
    544     margin-right: 15px;
    545     margin-left: 0;
    546 }
    547 body.activity-permalink div.activity-comments ul li {
    548     padding: 15px 0 15px 15px;
     533div.activity-comments > ul {
     534    padding: 0 10px 0 0;
    549535}
    550536div.activity-comments ul li > ul {
     537    margin-left: 0;
    551538    margin-right: 25px;
    552     margin-left: 0;
     539    padding-left: 0;
     540    padding-right: 10px;
    553541}
    554542div.activity-comments div.acomment-avatar img {
     
    584572    padding-right: 15px;
    585573    padding-left: 0;
     574}
     575body.activity-permalink .activity-list .activity-meta {
     576    left: 10px;
     577    right: auto;
     578}
     579body.activity-permalink div.activity-comments > ul {
     580    padding: 0 15px 0 10px;
    586581}
    587582
  • trunk/bp-themes/bp-default/_inc/css/default.css

    r4583 r4611  
    758758div.comment-meta .comment-options {
    759759    float: right;
     760    margin-right: 10px;
    760761}
    761762div.comment-meta em {
    762763    font-style: normal;
    763764}
    764 div.comment-meta span.comment-highlight a {
    765     background: #EBF7FF;
    766     border-right: 1px solid #a1dcfa;
    767     border-bottom: 1px solid #a1dcfa;
    768     -moz-border-radius: 4px;
    769     -webkit-border-radius: 4px;
    770     border-radius: 4px;
    771     color: #059AE7;
    772     margin-right: 3px;
    773     padding: 3px 8px;
    774     text-decoration: none;
    775 }
    776 div.comment-meta .comment-highlight a:hover,
    777 .commentlist .depth-1 > .comment-content .comment-meta > p a:first-child:hover {
     765a.bp-secondary-action:hover {
    778766    background: #059AE7;
    779767    border-color: #059AE7;
     
    788776    font-weight: normal;
    789777}
    790 #reply-title small a,
    791 div.comment-options a.comment-reply-link {
    792     background: #FFF9DB;
    793     border-bottom: 1px solid #FFE8C4;
    794     border-right: 1px solid #FFE8C4;
    795     -moz-border-radius: 4px;
    796     -webkit-border-radius: 4px;
    797     border-radius: 4px;
    798     color: #ffa200;
    799     margin-right: 10px;
    800     padding: 3px 8px;
    801     text-decoration: none;
    802 }
    803778#reply-title small a {
    804779    margin-right: 0;
    805 }
    806 #reply-title small a:hover,
    807 div.comment-options a.comment-reply-link:hover {
    808     background: #f7740a;
    809     border-color: #f7740a;
    810     color: #fff;
    811780}
    812781.commentlist ul.children {
     
    820789.commentlist ul.children ul {
    821790    margin: 0 0 0 25px;
     791    padding-right: 0;
    822792}
    823793.commentlist ul.children img.avatar {
     
    832802}
    833803.commentlist ul.children div.comment-options {
    834     margin-bottom: 5px;
    835     margin-top: 0;
     804    margin-right: 0;
    836805}
    837806.commentlist ul.children li {
     
    844813.commentlist ul.children ul li:first-child {
    845814    border-top: 2px solid #fffeff;
    846 }
    847 .commentlist ul.children div.comment-options a.comment-reply-link {
    848     background: transparent;
    849     border-style: none;
    850     color: #1fb3dd;
    851     margin-right: 0;
    852     padding: 3px 8px;
    853     text-decoration: underline;
    854 }
    855 .commentlist ul.children div.comment-options a.comment-reply-link:hover {
    856     background: transparent;
    857     border-style: none;
    858     color: #1fb3dd;
    859815}
    860816#respond {
     
    12021158}
    12031159body.activity-permalink .activity-list .activity-meta {
    1204     right: 15px;
     1160    right: 10px;
    12051161    top: 18px;
    12061162}
     
    12761232    margin-right: 130px;
    12771233}
     1234.activity-header a,
     1235.comment-meta a,
     1236.acomment-meta a {
     1237    text-decoration: none;
     1238}
    12781239.activity-list .activity-content .activity-header img.avatar {
    12791240    float: none !important;
    12801241    margin: 0 5px -8px 0 !important;
    12811242}
    1282 .activity-list .activity-header a:first-child,
    1283 .commentlist .depth-1 > .comment-content .comment-meta > p a:first-child,
     1243a.bp-secondary-action,
    12841244span.highlight {
    12851245    background: #ebf7ff;
     
    12901250    border-radius: 4px;
    12911251    color: #059ae7;
    1292     margin-right: 3px;
     1252    font-size: 11px;
    12931253    padding: 3px 8px;
    12941254    text-decoration: none;
    12951255}
    1296 .activity-list .activity-header a:first-child:hover {
    1297     background: #059ae7 !important;
    1298     color: #fff !important;
    1299 }
    1300 .activity-list .activity-content a:first-child:focus {
    1301     outline: none;
    1302 }
    1303 .activity-list .activity-content span.time-since,
    1304 .comment-content .comment-meta span.time-since {
    1305     color: #bbb;
    1306 }
    1307 .activity-list .activity-content span.activity-header-meta a {
    1308     background: none;
    1309     border: none;
    1310     color: #aaa;
    1311     font-size: 11px;
    1312     margin: 0;
    1313     padding: 0;
    1314     text-decoration: underline;
    1315 }
    1316 .activity-list .activity-content span.activity-header-meta a:hover {
    1317     color: inherit;
    1318     text-decoration: none;
    1319 }
    13201256.activity-list .activity-content .activity-inner,
    13211257.activity-list .activity-content blockquote {
    1322     margin: 15px 0 15px 5px;
     1258    margin: 15px 0;
    13231259    overflow: hidden;
    13241260}
     
    13641300div.activity-meta {
    13651301    clear: left;
    1366     margin: 0 0 20px 3px;
    1367 }
    1368 .activity-list div.activity-meta a {
    1369     background: #f4f4f4;
    1370     border-bottom: 1px solid #ddd;
    1371     border-right: 1px solid #ddd;
     1302    margin: 0 10px 20px 0;
     1303}
     1304a.bp-primary-action,
     1305.comment-reply-link,
     1306#reply-title small a {
     1307    background: #fff9db;
     1308    border-bottom: 1px solid #ffe8c4;
    13721309    -moz-border-radius: 4px;
    13731310    -webkit-border-radius: 4px;
    13741311    border-radius: 4px;
    1375     color: #999;
    1376     font-size: 11px;
    1377     margin-right: 3px;
    1378     padding: 4px 8px;
    1379     text-decoration: none;
    1380 }
    1381 .activity-list div.activity-meta a.acomment-reply {
    1382     background: #fff9db;
    1383     border-bottom: 1px solid #ffe8c4;
    13841312    border-right: 1px solid #ffe8c4;
    13851313    color: #ffa200;
    1386 }
    1387 div.activity-meta a:focus {
    1388     outline: none;
    1389 }
    1390 div.activity-meta a:hover {
    1391     background: #aaa;
    1392     border-color: #aaa;
    1393     color: #fff;
    1394 }
    1395 div.activity-meta a.acomment-reply:hover {
     1314    font-size: 11px;
     1315    padding: 3px 8px;
     1316    text-decoration: none;
     1317}
     1318a.bp-primary-action:hover,
     1319.comment-reply-link:hover,
     1320#reply-title small a:hover {
    13961321    background: #f7740a;
    13971322    border-color: #f7740a;
     
    13991324}
    14001325div.activity-comments {
    1401     margin: 0 0 0 75px;
     1326    margin: 0 0 0 70px;
    14021327    overflow: hidden; /* IE fix */
    14031328    position: relative;
     
    14051330}
    14061331body.activity-permalink div.activity-comments {
    1407  background: none;
     1332    background: none;
    14081333    margin-left: 135px;
    14091334    width: auto;
     
    14341359body.activity-permalink div.activity-comments ul li {
    14351360    border-width: 1px;
    1436     padding: 10px 10px 0;
    1437 }
    1438 .commentlist .comment-content a:first-child {
    1439     margin-bottom: 10px;
     1361    padding: 10px 0 0 0;
    14401362}
    14411363div.activity-comments > ul > li:first-child {
     
    14461368}
    14471369div.activity-comments ul li > ul {
     1370    margin-left: 25px;
    14481371    margin-top: 0;
    1449     margin-left: 20px;
     1372    padding-left: 10px;
    14501373}
    14511374body.activity-permalink div.activity-comments ul li > ul {
     
    14531376}
    14541377body.activity-permalink div.activity-comments > ul {
    1455     padding-left: 15px;
     1378    padding: 0 10px 0 15px;
    14561379}
    14571380div.activity-comments div.acomment-avatar img {
     
    15351458    margin-left: 50px;
    15361459    padding-left: 15px;
     1460}
     1461.acomment-options {
     1462    float: right;
     1463    margin-right: 10px;
    15371464}
    15381465
  • trunk/bp-themes/bp-default/activity/comment.php

    r4522 r4611  
    1515<?php do_action( 'bp_before_activity_comment' ); ?>
    1616
    17 <li id="acomment-<?php bp_activity_comment_id() ?>">
     17<li id="acomment-<?php bp_activity_comment_id(); ?>">
    1818    <div class="acomment-avatar">
    19         <a href="<?php bp_activity_comment_user_link() ?>">
    20             <?php bp_activity_avatar( 'type=full&width=30&height=30&user_id=' . bp_get_activity_comment_user_id() ); ?>
     19        <a href="<?php bp_activity_comment_user_link(); ?>">
     20            <?php bp_activity_avatar( 'type=full&width=25&height=25&user_id=' . bp_get_activity_comment_user_id() ); ?>
    2121        </a>
    2222    </div>
    2323
    2424    <div class="acomment-meta">
    25         <a href="<?php bp_activity_comment_user_link() ?>"><?php bp_activity_comment_name() ?></a> &middot; <?php bp_activity_comment_date_recorded() ?>
     25        <?php
     26        /* translators: 1: user profile link, 2: user name, 3: activity permalink, 3: activity timestamp */
     27        printf( __( '<a href="%1$s">%2$s</a> replied <a href="%3$s">%4$s</a>', 'buddypress' ), bp_get_activity_comment_user_link(), bp_get_activity_comment_name(), bp_get_activity_thread_permalink(), bp_get_activity_comment_date_recorded() );
     28        ?>
    2629
    2730        <?php if ( is_user_logged_in() && bp_activity_can_comment_reply( bp_activity_current_comment() ) ) : ?>
    28             <span class="acomment-replylink"> &middot; <a href="#acomment-<?php bp_activity_comment_id() ?>" class="acomment-reply" id="acomment-reply-<?php bp_activity_id() ?>-from-<?php bp_activity_comment_id() ?>"><?php _e( 'Reply', 'buddypress' ) ?></a></span>
    29         <?php endif ?>
    30    
     31            <a href="#acomment-<?php bp_activity_comment_id(); ?>" class="acomment-reply bp-primary-action" id="acomment-reply-<?php bp_activity_id() ?>-from-<?php bp_activity_comment_id() ?>"><?php _e( 'Reply', 'buddypress' ); ?></a>
     32        <?php endif; ?>
     33
    3134        <?php if ( bp_activity_user_can_delete() ) : ?>
    32             &middot; <a href="<?php bp_activity_comment_delete_link() ?>" class="delete acomment-delete confirm" rel="nofollow"><?php _e( 'Delete', 'buddypress' ) ?></a>
    33         <?php endif ?>
     35            <div class="acomment-options">
     36                <a href="<?php bp_activity_comment_delete_link(); ?>" class="delete acomment-delete confirm bp-secondary-action" rel="nofollow"><?php _e( 'Delete', 'buddypress' ); ?></a>
     37            </div>
     38        <?php endif; ?>
     39    </div>
    3440
     41    <div class="acomment-content">
     42        <?php bp_activity_comment_content(); ?>
    3543    </div>
    3644   
    37    
    38     <div class="acomment-content">
    39         <?php bp_activity_comment_content() ?>
    40     </div>
    41    
    42     <?php bp_activity_recurse_comments( bp_activity_current_comment() ) ?>
     45    <?php bp_activity_recurse_comments( bp_activity_current_comment() ); ?>
    4346</li>
    4447
  • trunk/bp-themes/bp-default/activity/entry.php

    r4493 r4611  
    4545
    4646        <div class="activity-meta">
     47            <?php
     48                // Add the delete link if the user has permission on this item
     49                if ( bp_activity_user_can_delete() )
     50                    bp_activity_delete_link();
     51            ?>
    4752
    48             <?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?>
    49 
    50                 <a href="<?php bp_activity_comment_link(); ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id(); ?>"><?php _e( 'Reply', 'buddypress' ); ?> (<span><?php bp_activity_comment_count(); ?></span>)</a>
    51 
     53            <?php if ( is_user_logged_in() && bp_activity_can_favorite() ) : ?>
     54                <?php if ( !bp_get_activity_is_favorite() ) : ?>
     55                    <a href="<?php bp_activity_favorite_link(); ?>" class="fav bp-secondary-action" title="<?php esc_attr_e( 'Mark as Favorite', 'buddypress' ); ?>"><?php _e( 'Favorite', 'buddypress' ) ?></a>
     56                <?php else : ?>
     57                    <a href="<?php bp_activity_unfavorite_link(); ?>" class="unfav bp-secondary-action" title="<?php esc_attr_e( 'Remove Favorite', 'buddypress' ); ?>"><?php _e( 'Remove Favorite', 'buddypress' ) ?></a>
     58                <?php endif; ?>
    5259            <?php endif; ?>
    53 
    54             <?php if ( is_user_logged_in() && bp_activity_can_favorite() ) :
    55                 if ( !bp_get_activity_is_favorite() ) : ?>
    56 
    57                     <a href="<?php bp_activity_favorite_link() ?>" class="fav" title="<?php _e( 'Mark as Favorite', 'buddypress' ) ?>"><?php _e( 'Favorite', 'buddypress' ) ?></a>
    58 
    59                 <?php else : ?>
    60 
    61                     <a href="<?php bp_activity_unfavorite_link() ?>" class="unfav" title="<?php _e( 'Remove Favorite', 'buddypress' ) ?>"><?php _e( 'Remove Favorite', 'buddypress' ) ?></a>
    62 
    63                 <?php endif;
    64             endif; ?>
    6560
    6661            <?php do_action( 'bp_activity_entry_meta' ); ?>
  • trunk/bp-themes/bp-default/functions.php

    r4597 r4611  
    420420        $avatar_size = 50;
    421421    else
    422         $avatar_size = 20;
     422        $avatar_size = 25;
    423423    ?>
    424424
     
    440440                <p>
    441441                    <?php
    442                         if ( 1 == $depth )
    443                             $links = sprintf( '<a href="#comment-%1$d">%2$s</a>', get_comment_ID(), __( 'View', 'buddypress' ) );
     442                        if ( current_user_can( 'edit_comment', get_comment_ID() ) )
     443                            $links = get_comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) );
    444444                        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 );
     445                            $links = '';
     446
     447                        /* translators: 1: comment author url, 2: comment author name, 3: comment permalink, 4: comment date/timestamp, 5: view/reply & edit comment links */
     448                        printf( __( '<a href="%1$s" rel="nofollow">%2$s</a> said on <a href="%3$s"><span class="time-since">%4$s</span></a> %5$s', 'buddypress' ), get_comment_author_url(), get_comment_author(), get_comment_link(), get_comment_date(), $links );
    452449                    ?>
    453450                </p>
    454451
    455                 <?php if ( 1 == $depth && -1 != $args['max_depth'] && comments_open() ) : ?>
    456                     <div class="comment-options"><?php comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?></div>
     452                <?php if ( comments_open() ) : ?>
     453                    <div class="comment-options"><?php printf( '<a class="comment-edit-link bp-secondary-action" href="%1$s" title="%2$s">%3$s</a> ', get_edit_comment_link( $comment->comment_ID ), esc_attr__( 'Edit comment', 'buddypress' ), __( 'Edit', 'buddypress' ) ) ?></div>
    457454                <?php endif; ?>
    458455            </div>
Note: See TracChangeset for help on using the changeset viewer.