Changeset 4255

Timestamp:

04/23/2011 04:24:55 PM (14 years ago)

Author:

djpaul

Message:

When posting to activity stream, make the AJAX-returned markup identical to the rest of the activity stream items. See #2016

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -822 +822 @@
                         $comment_child->user_login ) . '">' .
                     bp_core_fetch_avatar( array(
+                        'alt'    => __( 'Profile picture of %s', 'buddypress' ),
                         'item_id' => $comment_child->user_id,
                         'width'   => 30,
@@ -845 +846 @@
                 if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id ) {
                     $delete_url = wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/?cid=' . $comment_child->id, 'bp_activity_delete_link' );
-                    $content .= apply_filters( 'bp_activity_comment_delete_link', ' &middot; <a href="' . $delete_url . '" class="delete acomment-delete" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>', $comment_child, $delete_url );
+                    $content .= apply_filters( 'bp_activity_comment_delete_link', ' &middot; <a href="' . $delete_url . '" class="delete acomment-delete confirm" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>', $comment_child, $delete_url );
                 }
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -214 +214 @@
             <li id="acomment-<?php bp_activity_id() ?>">
                 <div class="acomment-avatar">
-                    <?php bp_activity_avatar( array( 'height' => 30, 'width' => 30 ) ); ?>
+                    <a href="<?php echo bp_core_get_userlink( bp_get_activity_user_id(), false, true ); ?>"><?php bp_activity_avatar( array( 'height' => 30, 'width' => 30 ) ); ?></a>
                 </div>
 
                 <div class="acomment-meta">
-                    <?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() ) ) ?> &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>
+                    <?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() ) ) ?>
+                    <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>
                      &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>
                 </div>