Changeset 2354

Timestamp:

01/19/2010 11:57:47 AM (17 years ago)

Author:

apeatling

Message:

Fixes #1556 - missing comment delete ajax loader.

Location:

trunk/bp-themes/bp-default/_inc

Files:

• ajax.php (modified) (1 diff)
• css/default.css (modified) (3 diffs)
• global.js (modified) (1 diff)

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

@@ -131 +131 @@
                         <?php echo bp_core_get_userlink( $bp->loggedin_user->id ) ?> &middot; <?php echo bp_core_time_since( time() ) ?> &middot;
                         <a class="acomment-reply" href="#acomment-<?php echo $comment_id ?>" id="acomment-reply-<?php echo attribute_escape( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a>
-                        <?php if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id ) : ?>
-                                 &middot; <a href="<?php echo wp_nonce_url( $bp->activity->id . '/delete/?cid=' . $comment_id, 'delete_activity_comment' ) ?>" class="delete acomment-delete"><?php _e( 'Delete', 'buddypress' ) ?></a>
-                        <?php endif; ?>
+                         &middot; <a href="<?php echo wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . $comment_id, 'bp_activity_delete_link' ) ?>" class="item-button delete-activity confirm"><?php _e( 'Delete', 'buddypress' ) ?></a>
                 </div>
 

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

@@ -51 +51 @@
         float: left;
         border: 2px solid #eee;
-}
-
-.ajax-loader {
-        background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
-        padding: 8px;
-        display: none;
 }
 
@@ -610 +604 @@
 }
 
+/* > AJAX Loaders
+-------------------------------------------------------------- */
+
+.ajax-loader {
+        background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
+        padding: 8px;
+        display: none;
+}
+
+a.loading {
+        background-image: url( ../images/ajax-loader.gif );
+        background-position: 95% 50%;
+        padding-right: 25px;
+        background-repeat: no-repeat;
+}
+
 /* > Buttons
 -------------------------------------------------------------- */
@@ -1172 +1182 @@
         margin-right: 3px;
 }
-        .activity-list div.activity-meta a.loading {
-                background-image: url( ../images/ajax-loader.gif );
-                background-position: 95% 50%;
-                padding-right: 25px;
-                background-repeat: no-repeat;
-        }
-
         .activity-list div.activity-meta a.acomment-reply {
                 background: #FFF9DB;

trunk/bp-themes/bp-default/_inc/global.js

@@ -389 +389 @@
                                 comment_id = comment_id[1].split('&');
                                 comment_id = comment_id[0];
+
+                        target.addClass('loading');
 
                         /* Remove any error messages */