Changeset 2191

Timestamp:

12/16/2009 01:14:41 PM (17 years ago)

Author:

apeatling

Message:

Messaging interface updates, autocomplete fixes, removed left menu and placed items in header.

Location:

trunk

Files:

• bp-messages/bp-messages-templatetags.php (modified) (1 diff)
• bp-messages/css/autocomplete/jquery.autocompletefb.css (modified) (4 diffs)
• bp-messages/js/autocomplete/jquery.autocomplete.js (modified) (36 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (8 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (2 diffs)
• bp-themes/bp-default/groups/single/group-header.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/home.php (modified) (2 diffs)
• bp-themes/bp-default/members/single/home.php (modified) (2 diffs)
• bp-themes/bp-default/members/single/member-header.php (modified) (2 diffs)
• bp-themes/bp-default/members/single/messages/compose.php (modified) (1 diff)
• bp-themes/bp-default/members/single/messages/messages-loop.php (modified) (4 diffs)
• bp-themes/bp-default/members/single/messages/single.php (modified) (1 diff)

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

@@ -330 +330 @@
                 <a href="#" id="mark_as_unread"><?php _e('Mark as Unread', 'buddypress') ?></a> &nbsp;
         <?php } ?>
-                <a href="#" id="delete_<?php echo $bp->current_action ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
+        <a href="#" id="delete_<?php echo $bp->current_action ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
 <?php
 }

trunk/bp-messages/css/autocomplete/jquery.autocompletefb.css

@@ -21 +21 @@
                 margin: 0;
         }
-        
+
         .ac_results li {
                 margin: 0px;
@@ -32 +32 @@
         }
                 .ac_results li img {
-                        padding-right: 5px;
+                        margin-right: 5px;
                 }
-        
+
 .ac_loading {
         background : url('../../images/ajax-loader.gif') right center no-repeat;
@@ -48 +48 @@
 }
 
-ul.acfb-holder { 
-        margin  : 0; 
-        height  : auto !important; 
-        height  : 1%; 
-        overflow: hidden; 
+ul.acfb-holder {
+        margin  : 0;
+        height  : auto !important;
+        height  : 1%;
+        overflow: hidden;
         padding: 0;
         list-style: none;
 }
-        ul.acfb-holder li { 
-                float   : left; 
-                margin  : 0 5px 4px 0; 
-                list-style-type: none; 
+        ul.acfb-holder li {
+                float   : left;
+                margin  : 0 5px 4px 0;
+                list-style-type: none;
         }
-        
-        ul.acfb-holder li.friend-tab { 
-                border-radius         : 3px; 
-                -moz-border-radius    : 3px; 
-                -webkit-border-radius : 3px; 
-                border     : 1px solid #ffe7c7; 
-                padding    : 2px 7px 2px; 
-                background : #FFF9DF; 
+
+        ul.acfb-holder li.friend-tab {
+                border-radius         : 3px;
+                -moz-border-radius    : 3px;
+                -webkit-border-radius : 3px;
+                border     : 1px solid #ffe7c7;
+                padding    : 2px 7px 2px;
+                background : #FFF9DF;
                 font-size: 1em;
         }
@@ -75 +75 @@
                         vertical-align: middle;
                 }
-                
+
                 li.friend-tab span.p {
                         padding-left: 5px;

trunk/bp-messages/js/autocomplete/jquery.autocomplete.js

@@ -13 +13 @@
 
 ;(function($) {
-        
+
 $.fn.extend({
         autocomplete: function(urlOrData, options) {
@@ -23 +23 @@
                         max: options && !options.scroll ? 10 : 150
                 }, options);
-                
+
                 // if highlight is set to false, replace it with a do-nothing function
                 options.highlight = options.highlight || function(value) { return value; };
-                
+
                 return this.each(function() {
                         new $.Autocompleter(this, options);
@@ -74 +74 @@
         };
         var select = $.Autocompleter.Select(options, input, selectCurrent, config);
-        
+
         $input.keydown(function(event) {
                 // track last key pressed
                 lastKeyPressCode = event.keyCode;
                 switch(event.keyCode) {
-                
+
                         case KEY.UP:
                                 event.preventDefault();
@@ -88 +88 @@
                                 }
                                 break;
-                                
+
                         case KEY.DOWN:
                                 event.preventDefault();
@@ -97 +97 @@
                                 }
                                 break;
-                                
+
                         case KEY.PAGEUP:
                                 event.preventDefault();
@@ -106 +106 @@
                                 }
                                 break;
-                                
+
                         case KEY.PAGEDOWN:
                                 event.preventDefault();
@@ -115 +115 @@
                                 }
                                 break;
-                        
+
                         // matches also semicolon
                         case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA:
@@ -128 +128 @@
                                 }
                                 break;
-                                
+
                         case KEY.ESC:
                                 select.hide();
                                 break;
-                                
+
                         default:
                                 clearTimeout(timeout);
@@ -184 +184 @@
                 $input.unbind();
         });
-        
-        
+
+
         function selectCurrent() {
                 var selected = select.selected();
                 if( !selected )
                         return false;
-                
+
                 var v = selected.result;
                 previousValue = v;
-                
+
                 if ( options.multiple ) {
                         var words = trimWords($input.val());
@@ -201 +201 @@
                         v += options.multipleSeparator;
                 }
-                
+
                 $input.val(v);
                 hideResultsNow();
@@ -207 +207 @@
                 return true;
         }
-        
+
         function onChange(crap, skipPrevCheck) {
                 if( lastKeyPressCode == KEY.DEL ) {
@@ -213 +213 @@
                         return;
                 }
-                
+
                 var currentValue = $input.val();
-                
+
                 if ( !skipPrevCheck && currentValue == previousValue )
                         return;
-                
+
                 previousValue = currentValue;
-                
+
                 currentValue = lastWord(currentValue);
                 if ( currentValue.length >= options.minChars) {
@@ -233 +233 @@
                 }
         };
-        
+
         function trimWords(value) {
                 if ( !value ) {
@@ -246 +246 @@
                 return result;
         }
-        
+
         function lastWord(value) {
                 if ( !options.multiple )
@@ -253 +253 @@
                 return words[words.length - 1];
         }
-        
+
         // fills in the input box w/the first match (assumed to be the best match)
         function autoFill(q, sValue){
@@ -290 +290 @@
                         stopLoading();
                         select.display(data, q);
-                        
+
                         var newData = data[0].value.split(';');
                         data.value = newData[0];
@@ -310 +310 @@
                 // if an AJAX url has been supplied, try loading the data now
                 } else if( (typeof options.url == "string") && (options.url.length > 0) ){
-                        
+
                         var extraParams = {};
                         $.each(options.extraParams, function(key, param) {
                                 extraParams[key] = typeof param == "function" ? param() : param;
                         });
-                        
+
                         $.ajax({
                                 // try to leverage ajaxQueue plugin to abort previous requests
@@ -339 +339 @@
                 }
         };
-        
+
         function parse(data) {
                 var parsed = [];
@@ -395 +395 @@
         var data = {};
         var length = 0;
-        
+
         function matchSubset(s, sub) {
-                if (!options.matchCase) 
+                if (!options.matchCase)
                         s = s.toLowerCase();
                 var i = s.indexOf(sub);
@@ -403 +403 @@
                 return i == 0 || options.matchContains;
         };
-        
+
         function add(q, value) {
                 if (length > options.cacheLength){
                         flush();
                 }
-                if (!data[q]){ 
+                if (!data[q]){
                         length++;
                 }
                 data[q] = value;
         }
-        
+
         function populate(){
                 if( !options.data ) return false;
@@ -422 +422 @@
                 // no url was specified, we need to adjust the cache length to make sure it fits the local data store
                 if( !options.url ) options.cacheLength = 1;
-                
+
                 // track all options for minChars = 0
                 stMatchSets[""] = [];
-                
+
                 // loop through the array and create a lookup structure
                 for ( var i = 0, ol = options.data.length; i < ol; i++ ) {
@@ -431 +431 @@
                         // if rawValue is a string, make an array otherwise just reference the array
                         rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue;
-                        
+
                         var value = options.formatItem(rawValue, i+1, options.data.length);
                         if ( value === false )
                                 continue;
-                                
+
                         var firstChar = value.charAt(0).toLowerCase();
                         // if no lookup array for this character exists, look it up now
-                        if( !stMatchSets[firstChar] ) 
+                        if( !stMatchSets[firstChar] )
                                 stMatchSets[firstChar] = [];
 
@@ -447 +447 @@
                                 result: options.formatResult && options.formatResult(rawValue) || value
                         };
-                        
+
                         // push the current match into the set list
                         stMatchSets[firstChar].push(row);
@@ -465 +465 @@
                 });
         }
-        
+
         // populate any existing data
         setTimeout(populate, 25);
-        
+
         function flush(){
                 data = {};
                 length = 0;
         }
-        
+
         return {
                 flush: flush,
@@ -481 +481 @@
                         if (!options.cacheLength || !length)
                                 return null;
-                        /* 
+                        /*
                          * if dealing w/local data and matchContains than we must make sure
                          * to loop through all the data collections looking for matches
@@ -501 +501 @@
                                                 });
                                         }
-                                }                               
+                                }
                                 return csub;
-                        } else 
+                        } else
                         // if the exact item exists, use it
                         if (data[q]){
@@ -531 +531 @@
                 ACTIVE: "ac_over"
         };
-        
+
         var listItems,
                 active = -1,
@@ -539 +539 @@
                 element,
                 list;
-        
+
         // Create results
         function init() {
@@ -549 +549 @@
                 .css("position", "absolute")
                 .appendTo(options.attachTo);
-        
+
                 list = $("<ul>").appendTo(element).mouseover( function(event) {
                         if(target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') {
                     active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event));
-                            $(target(event)).addClass(CLASSES.ACTIVE);            
+                            $(target(event)).addClass(CLASSES.ACTIVE);
                 }
                 }).click(function(event) {
@@ -565 +565 @@
                         config.mouseDownOnSelect = false;
                 });
-                
+
                 if( options.width > 0 )
                         element.css("width", options.width);
-                        
+
                 needsInit = false;
-        } 
-        
+        }
+
         function target(event) {
                 var element = event.target;
@@ -598 +598 @@
         }
         };
-        
+
         function movePosition(step) {
                 active += step;
@@ -607 +607 @@
                 }
         }
-        
+
         function limitNumberOfItems(available) {
                 return options.max && options.max < available
@@ -613 +613 @@
                         : available;
         }
-        
+
         function fillList() {
                 list.empty();
@@ -633 +633 @@
                 list.bgiframe();
         }
-        
+
         return {
                 display: function(d, q) {
@@ -684 +684 @@
                                         overflow: 'auto'
                                 });
-                                
+
                 if($.browser.msie && typeof document.body.style.maxHeight === "undefined") {
                                         var listHeight = 0;
@@ -697 +697 @@
                                         }
                 }
-                
+
             }
                 },

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

@@ -519 +519 @@
 add_action( 'wp_ajax_joinleave_group', 'bp_dtheme_ajax_joinleave_group' );
 
+function bp_dtheme_ajax_messages_send_reply() {
+        global $bp;
+
+        check_ajax_referer( 'messages_send_message' );
+
+        $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'subject' => $_REQUEST['subject'], 'content' => $_REQUEST['content'] ) );
+
+        if ( $result ) { ?>
+                <div class="message-box new-message">
+                        <div class="message-metadata">
+                                <?php do_action( 'bp_before_message_meta' ) ?>
+                                <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
+
+                                <h3><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( time() ) ) ?></span></h3>
+
+                                <?php do_action( 'bp_after_message_meta' ) ?>
+                        </div>
+
+                        <?php do_action( 'bp_before_message_content' ) ?>
+
+                        <div class="message-content">
+                                <?php echo stripslashes( apply_filters( 'bp_get_the_thread_message_content', $_REQUEST['content'] ) ) ?>
+                        </div>
+
+                        <?php do_action( 'bp_after_message_content' ) ?>
+
+                        <div class="clear"></div>
+                </div>
+        <?php
+        } else {
+                echo "-1<div id='message' class='error'><p>" . __( 'There was a problem sending that reply. Please try again.', 'buddypress' ) . '</p></div>';
+        }
+}
+add_action( 'wp_ajax_messages_send_reply', 'bp_dtheme_ajax_messages_send_reply' );
+
+function bp_dtheme_ajax_markunread() {
+        global $bp;
+
+        if ( !isset($_POST['thread_ids']) ) {
+                echo "-1<div id='message' class='error'><p>" . __('There was a problem marking messages as unread.', 'buddypress' ) . '</p></div>';
+        } else {
+                $thread_ids = explode( ',', $_POST['thread_ids'] );
+
+                for ( $i = 0; $i < count($thread_ids); $i++ ) {
+                        BP_Messages_Thread::mark_as_unread($thread_ids[$i]);
+                }
+        }
+}
+add_action( 'wp_ajax_messages_markunread', 'bp_dtheme_ajax_markunread' );
+
+function bp_dtheme_ajax_message_markread() {
+        global $bp;
+
+        if ( !isset($_POST['thread_ids']) ) {
+                echo "-1<div id='message' class='error'><p>" . __('There was a problem marking messages as read.', 'buddypress' ) . '</p></div>';
+        } else {
+                $thread_ids = explode( ',', $_POST['thread_ids'] );
+
+                for ( $i = 0; $i < count($thread_ids); $i++ ) {
+                        BP_Messages_Thread::mark_as_read($thread_ids[$i]);
+                }
+        }
+}
+add_action( 'wp_ajax_messages_markread', 'bp_dtheme_ajax_messages_markread' );
+
+function bp_dtheme_ajax_messages_delete() {
+        global $bp;
+
+        if ( !isset($_POST['thread_ids']) ) {
+                echo "-1[[split]]" . __( 'There was a problem deleting messages.', 'buddypress' );
+        } else {
+                $thread_ids = explode( ',', $_POST['thread_ids'] );
+
+                for ( $i = 0; $i < count($thread_ids); $i++ ) {
+                        BP_Messages_Thread::delete($thread_ids[$i]);
+                }
+
+                _e('Messages deleted.', 'buddypress');
+        }
+}
+add_action( 'wp_ajax_messages_delete', 'bp_dtheme_ajax_messages_delete' );
+
+function bp_dtheme_ajax_messages_autocomplete_results() {
+        global $bp;
+
+        $friends = false;
+
+        // Get the friend ids based on the search terms
+        if ( function_exists( 'friends_search_friends' ) )
+                $friends = friends_search_friends( $_GET['q'], $bp->loggedin_user->id, $_GET['limit'], 1 );
+
+        $friends = apply_filters( 'bp_friends_autocomplete_list', $friends, $_GET['q'], $_GET['limit'] );
+
+        if ( $friends['friends'] ) {
+                foreach ( $friends['friends'] as $user_id ) {
+                        $ud = get_userdata($user_id);
+                        $username = $ud->user_login;
+                        echo bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
+                        ';
+                }
+        }
+}
+add_action( 'wp_ajax_messages_autocomplete_results', 'bp_dtheme_ajax_messages_autocomplete_results' );
 
 ?>

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

@@ -222 +222 @@
                 }
 
-        div#sidebar h3.widgettitle, div#item-menu h3 {
+        div#sidebar h3.widgettitle {
                 margin: 25px -15px 10px -14px;
                 background: #eaeaea;
@@ -304 +304 @@
 
 div#item-header {
-        padding: 15px 0 10px 15px;
-        margin: -15px 0 0 170px;
-        border-left: 1px solid #eaeaea;
+        margin-bottom: 20px;
+        overflow: hidden;
 }
         div#item-header img.avatar {
@@ -333 +332 @@
 
         div#item-header div#item-meta {
-                clear: right;
                 font-size: 14px;
                 color: #aaa;
@@ -341 +339 @@
         }
 
+        div#item-header div#item-actions {
+                float: right;
+                width: 20%;
+                margin: 0 0 15px 15px;
+                text-align: right;
+        }
+                div#item-header div#item-actions h3 {
+                        font-size: 12px;
+                        margin: 0 0 5px 0;
+                }
+
+                div#item-header ul {
+                        overflow: hidden;
+                        margin-bottom: 15px;
+                }
+
+                div#item-header ul h5, div#item-header ul span, div#item-header ul hr {
+                        display: none;
+                }
+
+                div#item-header ul li {
+                        float: right;
+                }
+
+                div#item-header ul img.avatar, div#item-header ul.avatars img.avatar {
+                        width: 30px;
+                        height: 30px;
+                        margin: 2px;
+                }
+
         div#item-header div.generic-button {
                 float: left;
                 margin: 10px 10px 0 0;
-        }
-
-/* > Item Body (Profile/Group/.. content)
--------------------------------------------------------------- */
-
-div#item-body {
-        margin-left: 170px;
-        border-left: 1px solid #f0f0f0;
-        padding-left: 15px;
-}
-
-/* > Item Menu (Profile/Group/.. left menu)
--------------------------------------------------------------- */
-
-div#item-menu {
-        width: 155px;
-        padding-right: 15px;
-        position: absolute;
-        top: 20px;
-        border-right: 1px solid #f0f0f0;
-}
-        div#item-menu h3 {
-                margin-right: -14px;
-        }
-
-        div#item-menu img.avatar {
-                margin-bottom: 20px;
-        }
-
-        div#item-menu ul#group-admins, div#item-menu ul#group-mods,
-        div#item-menu ul.avatars {
-                overflow: hidden;
-        }
-
-        div#item-menu ul#group-admins h5, div#item-menu ul#group-mods h5,
-        div#item-menu ul#group-admins span, div#item-menu ul#group-mods span,
-        div#item-menu ul#group-admins hr, div#item-menu ul#group-mods hr {
-                display: none;
-        }
-
-        div#item-menu ul#group-admins li, div#item-menu ul#group-mods li {
-                float: left;
-        }
-
-        div#item-menu ul#group-admins img.avatar, div#item-menu ul#group-mods img.avatar,
-        div#item-menu ul.avatars img.avatar {
-                width: 30px;
-                height: 30px;
-                margin: 2px;
         }
 
@@ -501 +480 @@
         div.item-list-tabs#group-subnav {
                 background: #fff;
-                margin: -10px -15px 20px -15px;
+                margin: 0 -15px 20px -15px;
                 border-bottom: 1px solid #eaeaea;
-                min-height: 32px;
-        }
-
-        ul#messages-options-nav {
-                margin: 30px 0 20px;
-                text-align: right;
+                min-height: 35px;
         }
 
@@ -770 +744 @@
         table#message-threads {
                 margin: 0 -15px;
+                width: auto;
         }
 
@@ -1280 +1255 @@
 -------------------------------------------------------------- */
 
+table#message-threads tr.unread td {
+        background: #FFF9DB;
+        border-top: 1px solid #FFE8C4;
+        border-bottom: 1px solid #FFE8C4;
+        font-weight: bold;
+}
+        table#message-threads tr.unread td span.activity {
+                background: #fff;
+        }
+
+        li span.unread-count, tr.unread span.unread-count {
+                background: #dd0000;
+                padding: 2px 8px;
+                color: #fff;
+                font-weight: bold;
+                -moz-border-radius: 3px;
+                -khtml-border-radius: 3px;
+                -webkit-border-radius: 3px;
+                border-radius: 3px;
+        }
+                div.item-list-tabs ul li a span.unread-count {
+                        padding: 1px 6px;
+                        color: #fff;
+                }
+
+        div.messages-options-nav {
+                font-size: 11px;
+                background: #eee;
+                text-align: right;
+                margin: 0 -15px;
+                padding: 5px 15px;
+        }
+
 div#message-thread div.message-box {
         margin: 0 -15px;
@@ -1317 +1325 @@
                 margin-left: 45px;
         }
+
+        div#message-thread div.message-options {
+                text-align: right;
+        }
+                a#delete_inbox_messages, .sentbox div.messages-options-nav {
+                        display: none;
+                }
 
 /* > Group Forum Topics

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

@@ -755 +755 @@
         });
 
-        /* Auto expand textareas */
-        j("textarea").TextAreaExpander( 80, 1000 );
+        /** Private Messaging ******************************************/
+
+        j("input#send_reply_button").click(
+                function() {
+                        j('form#send-reply span.ajax-loader').toggle();
+
+                        j.post( ajaxurl, {
+                                action: 'messages_send_reply',
+                                'cookie': encodeURIComponent(document.cookie),
+                                '_wpnonce': j("input#send_message_nonce").val(),
+
+                                'content': j("#message_content").val(),
+                                'send_to': j("input#send_to").val(),
+                                'subject': j("input#subject").val(),
+                                'thread_id': j("input#thread_id").val()
+                        },
+                        function(response)
+                        {
+                                if ( response[0] + response[1] == "-1" ) {
+                                        j('form#send-reply').prepend( response.substr( 2, response.length ) );
+                                } else {
+                                        j('form#send-reply div#message').remove();
+                                        j("#message_content").val('');
+                                        j('form#send-reply').before( response );
+
+                                        j("div.new-message").hide().slideDown( 200, function() {
+                                                j('form#send-reply span.ajax-loader').toggle();
+                                                j('div.new-message').removeClass('new-message');
+                                        });
+
+                                        j('div.message-box').each( function(i) {
+                                                j(this).removeClass('alt');
+                                                if ( i % 2 != 1 )
+                                                        j(this).addClass('alt');
+                                        });
+                                }
+                        });
+
+                        return false;
+                }
+        );
+
+        j("a#mark_as_read, a#mark_as_unread").click(
+                function() {
+                        var checkboxes_tosend = '';
+                        var checkboxes = j("#message-threads tr td input[type='checkbox']");
+
+                        if ( 'mark_as_unread' == j(this).attr('id') ) {
+                                var currentClass = 'read'
+                                var newClass = 'unread'
+                                var unreadCount = 1;
+                                var inboxCount = 0;
+                                var unreadCountDisplay = 'inline';
+                                var action = 'messages_markunread';
+                        } else {
+                                var currentClass = 'unread'
+                                var newClass = 'read'
+                                var unreadCount = 0;
+                                var inboxCount = 1;
+                                var unreadCountDisplay = 'none';
+                                var action = 'messages_markread';
+                        }
+
+                        checkboxes.each( function(i) {
+                                if(checkboxes[i].checked) {
+                                        if ( j('tr#m-' + checkboxes[i].value).hasClass(currentClass) ) {
+                                                checkboxes_tosend += checkboxes[i].value;
+                                                j('tr#m-' + checkboxes[i].value).removeClass(currentClass);
+                                                j('tr#m-' + checkboxes[i].value).addClass(newClass);
+                                                j('tr#m-' + checkboxes[i].value + ' td span.unread-count').html(unreadCount);
+                                                j('tr#m-' + checkboxes[i].value + ' td span.unread-count').css('display', unreadCountDisplay);
+                                                var inboxcount = j('.inbox-count').html();
+
+                                                if ( parseInt(inboxcount) == inboxCount ) {
+                                                        j('.inbox-count').css('display', unreadCountDisplay);
+                                                        j('.inbox-count').html(unreadCount);
+                                                } else {
+                                                        if ( 'read' == currentClass )
+                                                                j('.inbox-count').html(parseInt(inboxcount) + 1);
+                                                        else
+                                                                j('.inbox-count').html(parseInt(inboxcount) - 1);
+                                                }
+
+                                                if ( i != checkboxes.length - 1 ) {
+                                                        checkboxes_tosend += ','
+                                                }
+                                        }
+                                }
+                        });
+                        j.post( ajaxurl, {
+                                action: action,
+                                'thread_ids': checkboxes_tosend
+                        });
+                        return false;
+                }
+        );
+
+        j("select#message-type-select").change(
+                function() {
+                        var selection = j("select#message-type-select").val();
+                        var checkboxes = j("td input[type='checkbox']");
+                        checkboxes.each( function(i) {
+                                checkboxes[i].checked = "";
+                        });
+
+                        switch(selection) {
+                                case 'unread':
+                                        var checkboxes = j("tr.unread td input[type='checkbox']");
+                                break;
+                                case 'read':
+                                        var checkboxes = j("tr.read td input[type='checkbox']");
+                                break;
+                        }
+                        if ( selection != '' ) {
+                                checkboxes.each( function(i) {
+                                        checkboxes[i].checked = "checked";
+                                });
+                        } else {
+                                checkboxes.each( function(i) {
+                                        checkboxes[i].checked = "";
+                                });
+                        }
+                }
+        );
+
 });
 
@@ -795 +918 @@
 /* jQuery Cookie plugin */
 eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('o.5=B(9,b,2){6(h b!=\'E\'){2=2||{};6(b===n){b=\'\';2.3=-1}4 3=\'\';6(2.3&&(h 2.3==\'j\'||2.3.k)){4 7;6(h 2.3==\'j\'){7=w u();7.t(7.q()+(2.3*r*l*l*x))}m{7=2.3}3=\'; 3=\'+7.k()}4 8=2.8?\'; 8=\'+(2.8):\'\';4 a=2.a?\'; a=\'+(2.a):\'\';4 c=2.c?\'; c\':\'\';d.5=[9,\'=\',C(b),3,8,a,c].y(\'\')}m{4 e=n;6(d.5&&d.5!=\'\'){4 g=d.5.A(\';\');s(4 i=0;i<g.f;i++){4 5=o.z(g[i]);6(5.p(0,9.f+1)==(9+\'=\')){e=D(5.p(9.f+1));v}}}F e}};',42,42,'||options|expires|var|cookie|if|date|path|name|domain|value|secure|document|cookieValue|length|cookies|typeof||number|toUTCString|60|else|null|jQuery|substring|getTime|24|for|setTime|Date|break|new|1000|join|trim|split|function|encodeURIComponent|decodeURIComponent|undefined|return'.split('|'),0,{}))
-
-/* Textarea autoexpand */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(5($){$.C.B=5(g,r){6 k=!($.u.A||$.u.L);5 7(e){e=e.E||e;6 4=e.z.y,9=e.D;8(4!=e.f||9!=e.b){8(k&&(4<e.f||9!=e.b))e.a.o="H";6 h=m.M(e.l,m.G(e.q,e.j));e.a.I=(e.q>h?"K":"F");e.a.o=h+"J";e.f=4;e.b=9}c x};3.Z(5(){8(3.V.X()!="N")c;6 p=3.U.T(/P(\\d+)\\-*(\\d+)*/i);3.l=g||(p?n(\'0\'+p[1],10):0);3.j=r||(p?n(\'0\'+p[2],10):S);7(3);8(!3.w){3.w=x;$(3).s("t-R",0).s("t-Q",0);$(3).v("O",7).v("W",7)}});c 3}})(Y);',62,63,'|||this|vlen|function|var|ResizeTextarea|if|ewidth|style|boxWidth|return|||valLength|minHeight|||expandMax|hCheck|expandMin|Math|parseInt|height||scrollHeight|maxHeight|css|padding|browser|bind|Initialized|true|length|value|msie|TextAreaExpander|fn|offsetWidth|target|hidden|min|0px|overflow|px|auto|opera|max|textarea|keyup|expand|bottom|top|99999|match|className|nodeName|focus|toLowerCase|jQuery|each|'.split('|'),0,{}))

trunk/bp-themes/bp-default/groups/single/group-header.php

@@ -1 @@
-<div id="item-header">
-        <h2><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h2>
+<div id="item-actions">
+        <?php if ( bp_group_is_visible() ) : ?>
 
-        <span class="highlight"><?php bp_group_type() ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span>
+                <h3><?php _e( 'Group Admins', 'buddypress' ) ?></h3>
+                <?php bp_group_list_admins() ?>
 
-        <div id="item-meta">
-                <?php bp_group_description() ?>
+                <?php do_action( 'bp_after_group_menu_admins' ) ?>
 
-                <?php bp_group_join_button() ?>
+                <?php if ( bp_group_has_moderators() ) : ?>
+                        <?php do_action( 'bp_before_group_menu_mods' ) ?>
 
-                <?php do_action( 'bp_group_header_content' ) ?>
-        </div>
+                        <h3><?php _e( 'Group Mods' , 'buddypress' ) ?></h3>
+                        <?php bp_group_list_mods() ?>
 
-        <div class="item-list-tabs no-ajax" id="user-nav">
-                <ul>
-                        <?php bp_get_options_nav() ?>
+                        <?php do_action( 'bp_after_group_menu_mods' ) ?>
+                <?php endif; ?>
 
-                        <?php do_action( 'bp_members_directory_member_types' ) ?>
-                </ul>
-        </div>
+        <?php endif; ?>
+</div>
 
+<?php bp_group_avatar() ?>
+
+<h2><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h2>
+
+<span class="highlight"><?php bp_group_type() ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span>
+
+<div id="item-meta">
+        <?php bp_group_description() ?>
+
+        <?php bp_group_join_button() ?>
+
+        <?php do_action( 'bp_group_header_content' ) ?>
 </div>

trunk/bp-themes/bp-default/groups/single/home.php

@@ -7 +7 @@
                         <?php if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group(); ?>
 
-                        <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
+                        <div id="item-header">
+                                <?php locate_template( array( 'groups/single/group-header.php' ), true ) ?>
+                        </div>
+
+                        <div id="item-nav">
+                                <div class="item-list-tabs no-ajax" id="user-nav">
+                                        <ul>
+                                                <?php bp_get_options_nav() ?>
+
+                                                <?php do_action( 'bp_members_directory_member_types' ) ?>
+                                        </ul>
+                                </div>
+                        </div>
 
                         <div id="item-body">
@@ -36 +48 @@
                         </div>
 
-                        <div id="item-menu">
-                                <?php bp_group_avatar() ?>
-
-                                <?php if ( bp_group_is_visible() ) : ?>
-
-                                        <?php if ( bp_group_has_news() ) : ?>
-                                                <?php do_action( 'bp_before_group_news' ) ?>
-
-                                                <h3><?php _e( 'Latest News', 'buddypress' ); ?></h3>
-                                                <p><?php bp_group_news() ?></p>
-
-                                                <?php do_action( 'bp_after_group_news' ) ?>
-                                        <?php endif; ?>
-
-                                        <h3><?php _e( 'Group Admins', 'buddypress' ) ?></h3>
-                                        <?php bp_group_list_admins() ?>
-
-                                        <?php do_action( 'bp_after_group_menu_admins' ) ?>
-
-                                        <?php if ( bp_group_has_moderators() ) : ?>
-                                                <?php do_action( 'bp_before_group_menu_mods' ) ?>
-
-                                                <h3><?php _e( 'Group Mods' , 'buddypress' ) ?></h3>
-                                                <?php bp_group_list_mods() ?>
-
-                                                <?php do_action( 'bp_after_group_menu_mods' ) ?>
-                                        <?php endif; ?>
-
-                                <?php endif; ?>
-                        </div>
-
                         <?php endwhile; endif; ?>
                 </div><!-- .padder -->

trunk/bp-themes/bp-default/members/single/home.php

@@ -10 +10 @@
                         </div>
 
+                        <div id="item-nav">
+                                <div class="item-list-tabs no-ajax" id="user-nav">
+                                        <ul>
+                                                <?php bp_get_user_nav() ?>
+
+                                                <?php do_action( 'bp_members_directory_member_types' ) ?>
+                                        </ul>
+                                </div>
+                        </div>
+
                         <div id="item-body">
+
                                 <?php if ( 'home' == bp_current_component() || 'activity' == bp_current_component() || !bp_current_component() ) : ?>
                                         <?php locate_template( array( 'members/single/activity.php' ), true ) ?>
@@ -38 +49 @@
                         </div><!-- #item-body -->
 
-                        <div id="item-menu">
-                                <?php bp_displayed_user_avatar( 'type=full' ) ?>
-
-                                <?php
-                                 /***
-                                  * If you'd like to show specific profile fields here use:
-                                  * bp_profile_field_data( 'field=About Me' ); -- Pass the name of the field
-                                  */
-                                ?>
-
-                                <?php do_action( 'bp_before_profile_random_friends_loop' ) ?>
-
-                                <?php if ( bp_has_members( 'user_id=' . bp_displayed_user_id() . '&type=random&max=20' ) ) : ?>
-
-                                        <h3><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>"><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?></a></h3>
-
-                                        <ul class="avatars">
-                                        <?php while ( bp_members() ) : bp_the_member(); ?>
-                                                <li>
-                                                        <a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name() ?>"><?php bp_member_avatar('width=30&height=30') ?></a>
-                                                </li>
-                                        <?php endwhile; ?>
-                                        </ul>
-
-                                <?php endif; ?>
-
-                                <?php do_action( 'bp_after_profile_random_friends_loop' ) ?>
-                                <?php do_action( 'bp_before_profile_random_groups_loop' ) ?>
-
-                                <?php if ( function_exists( 'bp_has_groups' ) ) : ?>
-
-                                        <?php if ( bp_has_groups( 'user_id=' . bp_displayed_user_id() . '&type=random&max=20' ) ) : ?>
-
-                                                <h3><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>"><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?></a></h3>
-
-                                                <ul class="avatars">
-                                                <?php while ( bp_groups() ) : bp_the_group(); ?>
-                                                        <li>
-                                                                <a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_avatar('width=30&height=30') ?></a>
-                                                        </li>
-                                                <?php endwhile; ?>
-                                                </ul>
-
-                                        <?php endif; ?>
-
-                                <?php endif; ?>
-
-                                <?php do_action( 'bp_after_profile_random_groups_loop' ) ?>
-                        </div>
-
                 </div><!-- .padder -->
         </div><!-- #content -->

trunk/bp-themes/bp-default/members/single/member-header.php

@@ +1 @@
+<?php bp_displayed_user_avatar( 'type=full' ) ?>
+
 <h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span></h2>
 
@@ -28 +30 @@
 
 <?php do_action( 'template_notices' ) ?>
-
-<div class="item-list-tabs no-ajax" id="user-nav">
-        <ul>
-                <?php bp_get_user_nav() ?>
-
-                <?php do_action( 'bp_members_directory_member_types' ) ?>
-        </ul>
-</div>

trunk/bp-themes/bp-default/members/single/messages/compose.php

@@ -27 +27 @@
         <div class="submit">
                 <input type="submit" value="<?php _e( "Send Message", 'buddypress' ) ?> &rarr;" name="send" id="send" />
+                <span class="ajax-loader"></span>
         </div>
 

trunk/bp-themes/bp-default/members/single/messages/messages-loop.php

@@ -15 +15 @@
         <?php do_action( 'bp_before_messages_inbox_list' ) ?>
 
+        <div class="messages-options-nav">
+                <?php bp_messages_options() ?>
+        </div>
+
         <table id="message-threads">
                 <?php while ( bp_message_threads() ) : bp_message_thread(); ?>
@@ -23 +27 @@
                                 </td>
                                 <td width="1%" class="thread-avatar"><?php bp_message_thread_avatar() ?></td>
-                                <td width="27%" class="thread-from">
+                                <td width="30%" class="thread-from">
                                         <?php _e("From:", "buddypress"); ?> <?php bp_message_thread_from() ?><br />
                                         <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
                                 </td>
-                                <td width="40%" class="thread-info">
+                                <td width="50%" class="thread-info">
                                         <p><a href="<?php bp_message_thread_view_link() ?>" title="<?php _e( "View Message", "buddypress" ); ?>"><?php bp_message_thread_subject() ?></a></p>
                                         <p class="thread-excerpt"><?php bp_message_thread_excerpt() ?></p>
@@ -34 +38 @@
                                 <?php do_action( 'bp_messages_inbox_list_item' ) ?>
 
-                                <td width="10%" class="thread-options">
-                                        <a href="<?php bp_message_thread_delete_link() ?>" title="<?php _e("Delete Message", "buddypress"); ?>" class="delete confirm"><?php _e("Delete", "buddypress"); ?></a> &nbsp;
+                                <td width="13%" class="thread-options">
                                         <input type="checkbox" name="message_ids[]" value="<?php bp_message_thread_id() ?>" />
+                                        <a class="button confirm" href="<?php bp_message_thread_delete_link() ?>" title="<?php _e( "Delete Message", "buddypress" ); ?>">x</a> &nbsp;
                                 </td>
                         </tr>
@@ -43 +47 @@
         </table>
 
-        <ul id="messages-options-nav">
-                <li>
-                        <?php bp_messages_options() ?>
-                </li>
-        </ul>
+        <div class="messages-options-nav">
+                <?php bp_messages_options() ?>
+        </div>
 
         <?php do_action( 'bp_after_messages_inbox_list' ) ?>

trunk/bp-themes/bp-default/members/single/messages/single.php

@@ -78 +78 @@
                                         <div class="submit">
                                                 <input type="submit" name="send" value="<?php _e( 'Send Reply', 'buddypress' ) ?> &rarr;" id="send_reply_button"/>
+                                                <span class="ajax-loader"></span>
                                         </div>