Changeset 920

Timestamp:

01/26/2009 08:48:22 PM (16 years ago)

Author:

apeatling

Message:

Fixes #198

Location:

trunk

Files:

• bp-messages/bp-messages-templatetags.php (modified) (2 diffs)
• bp-messages/js/general.php (modified) (3 diffs)
• buddypress-theme/member-themes/buddypress-member/messages/index.php (modified) (1 diff)
• buddypress-theme/member-themes/buddypress-member/messages/sentbox.php (modified) (3 diffs)

trunk/bp-messages/bp-messages-templatetags.php

@@ -217 +217 @@
 
 function bp_messages_options() {
+    global $bp;
+    
+    if ( $bp['current_action'] != 'sentbox' ) {
 ?>
-    <?php _e( 'Select:', 'buddypress' ) ?> 
+        <?php _e( 'Select:', 'buddypress' ) ?> 
         <select name="message-type-select" id="message-type-select">
             <option value=""></option>
@@ -227 +230 @@
         <a href="#" id="mark_as_read"><?php _e('Mark as Read', 'buddypress') ?></a> &nbsp;
         <a href="#" id="mark_as_unread"><?php _e('Mark as Unread', 'buddypress') ?></a> &nbsp;
-        <a href="#" id="delete_messages"><?php _e('Delete', 'buddypress') ?></a> &nbsp;
+    <?php } ?>
+        <a href="#" id="delete_<?php echo $bp['current_action'] ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
 <?php   
 }

trunk/bp-messages/js/general.php

@@ -159 +159 @@
     );
     
-    jQuery("a#delete_messages").click(
+    jQuery("a#delete_inbox_messages").click(
         function() {
             checkboxes_tosend = '';
             checkboxes = jQuery("#message-threads tr td input[type='checkbox']");
+
             for(var i=0; i<checkboxes.length; i++) {
                 if(checkboxes[i].checked) {
@@ -186 +187 @@
             }
 
+            if ( !checkboxes_tosend ) return false;
+
             jQuery.post( ajaxurl, {
                 action: 'messages_delete',
@@ -206 +209 @@
         }
     );
+    
+    jQuery("a#delete_sentbox_messages").click(
+        function() {
+            checkboxes_tosend = '';
+            checkboxes = jQuery("#message-threads tr td input[type='checkbox']");
+            
+            if ( !checkboxes.length ) return false;
+            
+            for(var i=0; i<checkboxes.length; i++) {
+                if(checkboxes[i].checked) {
+                    checkboxes_tosend += checkboxes[i].value;
+
+                    if ( i != checkboxes.length - 1 ) {
+                        checkboxes_tosend += ','
+                    }
+                    alert('tr#m-' + checkboxes[i].value);
+                    jQuery('tr#m-' + checkboxes[i].value).remove();                 
+                }
+            }
+
+            if ( !checkboxes_tosend ) return false;
+
+            jQuery.post( ajaxurl, {
+                action: 'messages_delete',
+                'thread_ids': checkboxes_tosend
+            },
+            function(response) {
+                response = response.substr(0, response.length-1);
+                var err_num = response.split('[[split]]');
+                
+                jQuery('#message').remove();
+                
+                if ( err_num[0] == "-1" ) {
+                    // error
+                    jQuery('table#message-threads').before('<div id="message" class="error fade"><p>' + err_num[1] + '</p></div>')
+                } else {
+                    jQuery('table#message-threads').before('<div id="message" class="updated"><p>' + response + '</p></div>')
+                }
+            });
+            return false;           
+        }
+    );
+    
     
     jQuery("a#close-notice").click(

trunk/buddypress-theme/member-themes/buddypress-member/messages/index.php

@@ -10 +10 @@
 
 <div id="content">
-    <h2><?php _e("Inbox", "buddypress"); ?></h2>
+    <h2><?php _e( "Inbox", "buddypress" ); ?></h2>
     <?php do_action( 'template_notices' ) // (error/success feedback) ?>
     

trunk/buddypress-theme/member-themes/buddypress-member/messages/sentbox.php

@@ -2 +2 @@
 
 <div class="content-header">
-
+    <div class="messages-options">  
+        <?php bp_messages_options() ?>
+    </div>
 </div>
 
@@ -16 +18 @@
         <table id="message-threads">
         <?php while ( bp_message_threads() ) : bp_message_thread(); ?>
-            <tr>
+            <tr id="m-<?php bp_message_thread_id() ?>">
                 <td width="1%">
                 </td>
@@ -30 +32 @@
                 <td width="4%">
                         <a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>"><?php _e("Delete", "buddypress"); ?></a> 
-                        <input type="checkbox" name="" value="" />
+                        <input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />
                 </td>
             </tr>