Ticket #6569: 6569.02.patch

src/bp-activity/bp-activity-template.php

@@ -993 +993 @@
                 return apply_filters( 'bp_get_activity_per_page', (int) $activities_template->pag_num );
         }
 
+
+function bp_activity_whats_new_placeholder() {
+        echo bp_get_activity_whats_new_placeholder();
+}
+
+        function bp_get_activity_whats_new_placeholder() {
+                $placeholder = sprintf( __( "What's new, %s?", 'buddypress' ), bp_get_user_firstname( bp_get_loggedin_user_fullname() ) );
+
+                if ( bp_is_group() ) {
+                        $placeholder = sprintf( __( "What's new in %s, %s?", 'buddypress' ), bp_get_group_name(), bp_get_user_firstname( bp_get_loggedin_user_fullname() ) );
+                }
+
+                return apply_filters( 'bp_get_activity_whats_new_placeholder', $placeholder );
+        }
+
 /**
  * Output the activities title.
  *

src/bp-templates/bp-legacy/buddypress/activity/post-form.php

@@ -26 +26 @@
                 </a>
         </div>
 
-        <p class="activity-greeting"><?php if ( bp_is_group() )
-                printf( __( "What's new in %s, %s?", 'buddypress' ), bp_get_group_name(), bp_get_user_firstname( bp_get_loggedin_user_fullname() ) );
-        else
-                printf( __( "What's new, %s?", 'buddypress' ), bp_get_user_firstname( bp_get_loggedin_user_fullname() ) );
-        ?></p>
-
         <div id="whats-new-content">
+
                 <div id="whats-new-textarea">
-                        <textarea class="bp-suggestions" name="whats-new" id="whats-new" cols="50" rows="10"
+                        <textarea class="bp-suggestions" name="whats-new" id="whats-new" cols="50" rows="1"
                                 <?php if ( bp_is_group() ) : ?>data-suggestions-group-id="<?php echo esc_attr( (int) bp_get_current_group_id() ); ?>" <?php endif; ?>
-                        ><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_textarea( $_GET['r'] ); ?> <?php endif; ?></textarea>
+                        placeholder="<?php echo esc_attr( bp_get_activity_whats_new_placeholder() ) ;?>"><?php if ( isset( $_GET['r'] ) ) : ?>@<?php echo esc_textarea( $_GET['r'] ); ?> <?php endif; ?></textarea>
                 </div>
 
-                <div id="whats-new-options">
-                        <div id="whats-new-submit">
-                                <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php esc_attr_e( 'Post Update', 'buddypress' ); ?>" />
-                        </div>
+                <div id="whats-new-actions">
+                        <?php
+                        /**
+                         * Fires before the activity post form options.
+                         *
+                         * @since BuddyPress (2.4.0)
+                         */
+                        do_action( 'bp_activity_post_form_before_options' ); ?>
 
-                        <?php if ( bp_is_active( 'groups' ) && !bp_is_my_profile() && !bp_is_group() ) : ?>
+                        <div id="whats-new-options">
 
-                                <div id="whats-new-post-in-box">
+                                <?php if ( bp_is_active( 'groups' ) && !bp_is_my_profile() && !bp_is_group() ) : ?>
 
-                                        <?php _e( 'Post in', 'buddypress' ); ?>:
+                                        <div id="whats-new-post-in-box">
 
-                                        <select id="whats-new-post-in" name="whats-new-post-in">
-                                                <option selected="selected" value="0"><?php _e( 'My Profile', 'buddypress' ); ?></option>
+                                                <?php _e( 'Post in', 'buddypress' ); ?>:
 
-                                                <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100&populate_extras=0&update_meta_cache=0' ) ) :
-                                                        while ( bp_groups() ) : bp_the_group(); ?>
+                                                <select id="whats-new-post-in" name="whats-new-post-in">
+                                                        <option selected="selected" value="0"><?php _e( 'My Profile', 'buddypress' ); ?></option>
 
-                                                                <option value="<?php bp_group_id(); ?>"><?php bp_group_name(); ?></option>
+                                                        <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100&populate_extras=0&update_meta_cache=0' ) ) :
+                                                                while ( bp_groups() ) : bp_the_group(); ?>
 
-                                                        <?php endwhile;
-                                                endif; ?>
+                                                                        <option value="<?php bp_group_id(); ?>"><?php bp_group_name(); ?></option>
 
-                                        </select>
-                                </div>
-                                <input type="hidden" id="whats-new-post-object" name="whats-new-post-object" value="groups" />
+                                                                <?php endwhile;
+                                                        endif; ?>
 
-                        <?php elseif ( bp_is_group_home() ) : ?>
+                                                </select>
+                                        </div>
+                                        <input type="hidden" id="whats-new-post-object" name="whats-new-post-object" value="groups" />
 
-                                <input type="hidden" id="whats-new-post-object" name="whats-new-post-object" value="groups" />
-                                <input type="hidden" id="whats-new-post-in" name="whats-new-post-in" value="<?php bp_group_id(); ?>" />
+                                <?php elseif ( bp_is_group_home() ) : ?>
 
-                        <?php endif; ?>
+                                        <input type="hidden" id="whats-new-post-object" name="whats-new-post-object" value="groups" />
+                                        <input type="hidden" id="whats-new-post-in" name="whats-new-post-in" value="<?php bp_group_id(); ?>" />
 
-                        <?php
+                                <?php endif; ?>
 
+                                <?php
+
+                                /**
+                                 * Fires at the end of the activity post form options.
+                                 *
+                                 * @since BuddyPress (1.2.0)
+                                 */
+                                do_action( 'bp_activity_post_form_options' ); ?>
+
+                        </div><!-- #whats-new-options -->
+
+                        <?php
                         /**
-                         * Fires at the end of the activity post form markup.
+                         * Fires before the activity post form submit.
                          *
-                         * @since BuddyPress (1.2.0)
+                         * @since BuddyPress (2.4.0)
                          */
-                        do_action( 'bp_activity_post_form_options' ); ?>
+                        do_action( 'bp_activity_post_form_before_submit' ); ?>
+
+                        <div id="whats-new-submit">
+
+                                <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php esc_attr_e( 'Post Update', 'buddypress' ); ?>" />
 
-                </div><!-- #whats-new-options -->
+                                 <?php
+                                /**
+                                 * Fires at the end of the activity post form submit.
+                                 *
+                                 * @since BuddyPress (2.4.0)
+                                 */
+                                do_action( 'bp_activity_post_form_submit' ); ?>
+                        </div><!-- #whats-new-submit -->
+                </div><!-- #whats-new-actions -->
         </div><!-- #whats-new-content -->
 
         <?php wp_nonce_field( 'post_update', '_wpnonce_post_update' ); ?>

src/bp-templates/bp-legacy/css/buddypress.css

@@ -127 +127 @@
         color: #555;
         font-family: inherit;
         font-size: medium;
-        height: 20px;
         padding: 6px;
-        width: 98%;
+        width: 97.5%;
+        resize: none;
+        overflow: hidden;
 }
 body.no-js #buddypress form#whats-new-form textarea {
         height: 50px;
+        resize: vertical;
+        overflow: auto;
 }
 #buddypress form#whats-new-form #whats-new-options select {
         max-width: 200px;
@@ -142 +145 @@
         float: right;
         margin-top: 12px;
 }
+
 #buddypress #whats-new-options {
         overflow: auto;
-        height: 0;
+        height: auto;
+        float:left;
+}
+
+#buddypress #whats-new-content #whats-new-actions {
+        height:0;
+}
+
+#buddypress #whats-new-content.active #whats-new-actions {
+        width:auto;
 }
+
 body.no-js #buddypress #whats-new-options {
         height: auto;
 }
@@ -154 +168 @@
         outline-color: rgba(31, 179, 221, 0.9);
 }
 
+#buddypress #whats-new-content, #buddypress #whats-new-actions {
+        overflow: hidden;
+}
+
 /*--------------------------------------------------------------
 3.1.1 - Activity Listing
 --------------------------------------------------------------*/

src/bp-templates/bp-legacy/js/buddypress.js

@@ -32 +32 @@
         if ( $whats_new.length && bp_get_querystring('r') ) {
                 var $member_nicename = $whats_new.val();
 
-                jq('#whats-new-options').animate({
-                        height:'50px'
-                });
-
-                $whats_new.animate({
-                        height:'50px'
+                jq('#whats-new-actions').animate({
+                        height:'100%'
                 });
 
                 jq.scrollTo( $whats_new, 500, {
@@ -52 +48 @@
 
         /* Textarea focus */
         $whats_new.focus( function(){
-                jq('#whats-new-options').animate({
-                        height:'50px'
-                });
-                jq('#whats-new-form textarea').animate({
-                        height:'50px'
+                jq('#whats-new-actions').animate({
+                        height:'100%'
                 });
+
                 jq('#aw-whats-new-submit').prop('disabled', false);
 
                 jq( '#whats-new-content' ).addClass( 'active' );
@@ -88 +82 @@
                 if ( document.activeElement !== this ) {
                         if (!this.value.match(/\S+/)) {
                                 this.value = '';
-                                jq('#whats-new-options').animate({
+                                jq('#whats-new-actions').animate({
                                         height:'0'
                                 });
-                                jq('form#whats-new-form textarea').animate({
-                                        height:'20px'
-                                });
+
+                                jq('#whats-new-form textarea').css( {
+                                        height:'auto'
+                                } );
+
                                 jq('#aw-whats-new-submit').prop('disabled', true);
                                 jq( '#whats-new-content' ).removeClass( 'active' );
                         }
                 }
         });
 
+        /* Texarea auto-resize */
+        $whats_new.on( 'keyup', function( event ) {
+                var self = jq( this );
+
+                if ( this.scrollHeight <= self.innerHeight() ) {
+                        return;
+                }
+
+                self.css( {
+                        height: this.scrollHeight + 'px'
+                } );
+        } );
+
         /* New posts */
         jq('#aw-whats-new-submit').on( 'click', function() {
                 var last_date_recorded = 0,
                         button = jq(this),
-                        form   = button.closest('form#whats-new-form');
+                        form   = button.closest('form#whats-new-form'),
+                        inputs = {}, post_data;
+
+                // Get all inputs and organize them into an object {name: value}
+                jq.each( form.serializeArray(), function( key, input ) {
+                        // Only include public extra data
+                        if ( '_' !== input.name.substr( 0, 1 ) && 'whats-new' !== input.name.substr( 0, 9 ) ) {
+                                if ( ! inputs[ input.name ] ) {
+                                        inputs[ input.name ] = input.value;
+                                } else {
+                                        // Checkboxes/dropdown list can have multiple selected value
+                                        if ( ! jq.isArray( inputs[ input.name ] ) ) {
+                                                inputs[ input.name ] = new Array( inputs[ input.name ], input.value );
+                                        } else {
+                                                inputs[ input.name ].push( input.value );
+                                        }
+                                }
+                        }
+                } );
 
-                form.children().each( function() {
-                        if ( jq.nodeName(this, 'textarea') || jq.nodeName(this, 'input') ) {
+                form.find( '*' ).each( function() {
+                        if ( jq.nodeName( this, 'textarea') || jq.nodeName( this, 'input' ) ) {
                                 jq(this).prop( 'disabled', true );
                         }
-                });
+                } );
 
                 /* Remove any errors */
                 jq('div.error').remove();
@@ -145 +172 @@
                         object = jq('#whats-new-post-object').val();
                 }
 
-                jq.post( ajaxurl, {
-                        action: 'post_update',
-                        'cookie': bp_get_cookies(),
-                        '_wpnonce_post_update': jq('#_wpnonce_post_update').val(),
-                        'content': content,
-                        'object': object,
-                        'item_id': item_id,
-                        'since': last_date_recorded,
-                        '_bp_as_nonce': jq('#_bp_as_nonce').val() || ''
-                },
-                function(response) {
+                // Include the public data to the post data
+                post_data = jq.extend( {
+                        action                 : 'post_update',
+                        'cookie'               : bp_get_cookies(),
+                        '_wpnonce_post_update' : jq('#_wpnonce_post_update').val(),
+                        'content'              : content,
+                        'object'               : object,
+                        'item_id'              : item_id,
+                        'since'                : last_date_recorded,
+                        '_bp_as_nonce'         : jq('#_bp_as_nonce').val() || '',
+                }, inputs );
 
-                        form.children().each( function() {
-                                if ( jq.nodeName(this, 'textarea') || jq.nodeName(this, 'input') ) {
-                                        jq(this).prop( 'disabled', false );
+                jq.post( ajaxurl, post_data, function( response ) {
+
+                        form.find( '*' ).each( function() {
+                                if ( jq.nodeName( this, 'textarea') || jq.nodeName( this, 'input' ) ) {
+                                        jq( this ).prop( 'disabled', false );
                                 }
-                        });
+                        } );
 
                         /* Check for errors and append if found. */
                         if ( response[0] + response[1] === '-1' ) {
@@ -204 +233 @@
 
                                 jq('li.new-update').hide().slideDown( 300 );
                                 jq('li.new-update').removeClass( 'new-update' );
-                                jq('#whats-new').val('');
+
+                                // Reset the form
+                                form.get(0).reset();
 
                                 // reset vars to get newest activities
                                 newest_activities = '';
                                 activity_last_recorded  = 0;
                         }
 
-                        jq('#whats-new-options').animate({
+                        jq('#whats-new-actions').animate({
                                 height:'0px'
                         });
-                        jq('#whats-new-form textarea').animate({
-                                height:'20px'
-                        });
+
                         jq('#aw-whats-new-submit').prop('disabled', true).removeClass('loading');
                         jq( '#whats-new-content' ).removeClass( 'active' );
-                });
+                } );
 
                 return false;
         });