Ticket #7794: 7794.messagesUI.feedback.patch

src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php

@@ -13 +13 @@
 <div class="bp-messages-feedback"></div>
 <div class="bp-messages-content"></div>
 
+<script type="text/html" id="tmpl-bp-messages-feedback">
+        <div class="bp-feedback {{data.type}}">
+                <span class="bp-icon" aria-hidden="true"></span>
+                <p>{{{data.message}}}</p>
+        </div>
+</script>
+
 <script type="text/html" id="tmpl-bp-messages-form">
         <?php bp_nouveau_messages_hook( 'before', 'compose_content' ); ?>
 

src/bp-templates/bp-nouveau/includes/messages/ajax.php

@@ -107 +107 @@
  */
 function bp_nouveau_ajax_messages_send_reply() {
         $response = array(
-                'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem sending your reply. Please try again.', 'buddypress' ) . '</p></div>',
+                'feedback' => __( 'There was a problem sending your reply. Please try again.', 'buddypress' ),
                 'type'     => 'error',
         );
 
@@ -186 +186 @@
 
         wp_send_json_success( array(
                 'messages' => array( $reply ),
-                'feedback' => '<div class="bp-feedback success"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Your reply was sent successfully', 'buddypress' ) . '</p></div>',
+                'feedback' => __( 'Your reply was sent successfully', 'buddypress' ),
                 'type'     => 'success',
         ) );
 }
@@ -199 +199 @@
 
         if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'bp_nouveau_messages' ) ) {
                 wp_send_json_error( array(
-                        'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Unauthorized request.', 'buddypress' ) . '</p></div>',
+                        'feedback' => __( 'Unauthorized request.', 'buddypress' ),
                         'type'     => 'error'
                 ) );
         }
@@ -214 +214 @@
         // Simulate the loop.
         if ( ! bp_has_message_threads( bp_ajax_querystring( 'messages' ) ) ) {
                 wp_send_json_error( array(
-                        'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Sorry, no messages were found.', 'buddypress' ) . '</p></div>',
+                        'feedback' => __( 'Sorry, no messages were found.', 'buddypress' ),
                         'type'     => 'info'
                 ) );
         }
@@ -341 +341 @@
 
         if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'bp_nouveau_messages' ) ) {
                 wp_send_json_error( array(
-                        'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Unauthorized request.', 'buddypress' ) . '</p></div>',
+                        'feedback' => __( 'Unauthorized request.', 'buddypress' ),
                         'type'     => 'error'
                 ) );
         }
 
         $response = array(
-                'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Sorry, no messages were found.', 'buddypress' ) . '</p></div>',
+                'feedback' => __( 'Sorry, no messages were found.', 'buddypress' ),
                 'type'     => 'info'
         );
 
@@ -434 +434 @@
  */
 function bp_nouveau_ajax_delete_thread_messages() {
         $response = array(
-                'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem deleting your message(s). Please try again.', 'buddypress' ) . '</p></div>',
+                'feedback' => __( 'There was a problem deleting your message(s). Please try again.', 'buddypress' ),
                 'type'     => 'error',
         );
 
@@ -457 +457 @@
         }
 
         wp_send_json_success( array(
-                'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Message(s) deleted', 'buddypress' ) . '</p></div>',
+                'feedback' => __( 'Message(s) deleted', 'buddypress' ),
                 'type'     => 'success',
         ) );
 }
@@ -479 +479 @@
         }
 
         $response = array(
-                'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . esc_html( $error_message ) . '</p></div>',
+                'feedback' => esc_html( $error_message ),
                 'type'     => 'error',
         );
 
@@ -555 +555 @@
         }
 
         wp_send_json_success( array(
-                'feedback' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . esc_html( $success_message ) . '</p></div>',
+                'feedback' => esc_html( $success_message ),
                 'type'     => 'success',
                 'messages' => $messages,
         ) );
@@ -578 +578 @@
 
         if ( 'unread' === $action ) {
                 $response = array(
-                        'feedback' => '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'There was a problem marking your message(s) as unread. Please try again.', 'buddypress' ) . '</p></div>',
+                        'feedback' => __( 'There was a problem marking your message(s) as unread. Please try again.', 'buddypress' ),
                         'type'     => 'error',
                 );
         }
@@ -596 +596 @@
         $response['messages'] = array();
 
         if ( 'unread' === $action ) {
-                $response['feedback'] = '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Message(s) marked as unread.', 'buddypress' ) . '</p></div>';
+                $response['feedback'] = __( 'Message(s) marked as unread.', 'buddypress' );
         } else {
-                $response['feedback'] = '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Message(s) marked as read.', 'buddypress' ) . '</p></div>';
+                $response['feedback'] = __( 'Message(s) marked as read.', 'buddypress' );
         }
 
         foreach ( $thread_ids as $thread_id ) {

src/bp-templates/bp-nouveau/includes/messages/functions.php

@@ -98 +98 @@
                 'nonces' => array(
                         'send' => wp_create_nonce( 'messages_send_message' ),
                 ),
-                'loading' => '<div class="bp-feedback info"><span class="bp-icon" aria-hidden="true"></span><p>' . __( 'Loading messages. Please wait.', 'buddypress' ) . '</p></div>',
+                'loading' => __( 'Loading messages. Please wait.', 'buddypress' ),
                 'bulk_actions' => bp_nouveau_messages_get_bulk_actions(),
         );
 

src/bp-templates/bp-nouveau/js/buddypress-messages.js

@@ -452 +452 @@
         bp.Views.Feedback = bp.Nouveau.Messages.View.extend( {
                 tagName: 'div',
                 className: 'bp-messages bp-user-messages-feedback',
+                template  : bp.template( 'bp-messages-feedback' ),
 
                 initialize: function() {
-                        this.value = this.options.value;
-
-                        if ( this.options.type ) {
-                                this.el.className += ' ' + this.options.type;
-                        }
-                },
-
-                render: function() {
-                        this.$el.html( this.value );
-                        return this;
+                        this.model = new Backbone.Model( {
+                                type: this.options.type || 'info',
+                                message: this.options.value,
+                        } );
                 }
         } );