Changeset 4668 for trunk/bp-themes/bp-default/_inc/ajax.php

Timestamp:

07/17/2011 05:39:42 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Tweak the activity stream styling - remove faux-buttons and replace with links. Fix bp_dtheme_new_activity_comment() so that it uses the activity/comment.php template rather than being hardcoded into the function.

File:

• trunk/bp-themes/bp-default/_inc/ajax.php (modified) (3 diffs)

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

@@ -178 +178 @@
     global $bp;
 
-    /* Check the nonce */
+    // Check the nonce
     check_admin_referer( 'new_activity_comment', '_wpnonce_new_activity_comment' );
 
@@ -198 +198 @@
     $comment_id = bp_activity_new_comment( array(
         'activity_id' => $_POST['form_id'],
-        'content' => $_POST['content'],
-        'parent_id' => $_POST['comment_id']
-    ));
+        'content'     => $_POST['content'],
+        'parent_id'   => $_POST['comment_id']
+    ) );
 
     if ( !$comment_id ) {
@@ -207 +207 @@
     }
 
-    if ( bp_has_activities ( 'display_comments=stream&include=' . $comment_id ) ) : ?>
-        <?php while ( bp_activities() ) : bp_the_activity(); ?>
-            <li id="acomment-<?php bp_activity_id() ?>">
-                <div class="acomment-avatar">
-                    <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
-                    /* translators: 1: user profile link + username, 2: activity item permalink, 3: activity item timestamp */
-                    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() ) );
-                    ?>
-
-                    <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>
-
-                    <?php if ( bp_activity_user_can_delete() ) : ?>
-                        <div class="acomment-options">
-                            <a href="<?php echo wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_root_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>
-                        </div>
-                    <?php endif; ?>
-                </div>
-
-                <div class="acomment-content">
-                    <?php bp_activity_content_body(); ?>
-                </div>
-            </li>
-        <?php endwhile; ?>
-     <?php endif;
+    global $activities_template;
+
+    // Load the nem activity item into the $activities_template global
+    bp_has_activities( 'display_comments=stream&include=' . $comment_id );
+
+    // Swap the current comment with the activity item we just loaded
+    $activities_template->activity->id              = $activities_template->activities[0]->item_id;
+    $activities_template->activity->current_comment = $activities_template->activities[0];
+
+    $template = locate_template( 'activity/comment.php', false, false );
+
+    // Backward compatibility. In older versions of BP, the markup was
+    // generated in the PHP instead of a template. This ensures that
+    // older themes (which are not children of bp-default and won't
+    // have the new template) will still work.
+    if ( empty( $template ) )
+        $template = BP_PLUGIN_DIR . '/bp-themes/bp-default/activity/comment.php';
+
+    load_template( $template, false );
+
+    unset( $activities_template );
 }
 add_action( 'wp_ajax_new_activity_comment', 'bp_dtheme_new_activity_comment' );