[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-82-gdbef526

[Jesse Vincent]

The branch, 4.2-trunk has been updated
       via  dbef526331f1e3548773f658ea0d50389fb800fd (commit)
       via  2355f0f0109943f721b21d10f7839e21807e64cc (commit)
      from  2a49f6fc63ef912d46f3939541f059251e5caf42 (commit)

Summary of changes:
 share/html/Search/Bulk.html           | 5 +++--
 share/html/Ticket/ModifyAll.html      | 4 ++--
 share/html/Ticket/Update.html         | 7 -------
 share/static/js/event-registration.js | 8 ++++++++
 4 files changed, 13 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit dbef526331f1e3548773f658ea0d50389fb800fd
Merge: 2a49f6f 2355f0f
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Mar 3 22:58:08 2015 -0800

    Merge branch '4.2/updatetype-coloring' into 4.2-trunk
    
    * 4.2/updatetype-coloring:
      Apply red background to all UpdateType/MessageBox locations
    
    Conflicts:
    	share/html/Search/Bulk.html

diff --cc share/html/Search/Bulk.html
index 45a8199,ff69eaf..fc61905
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@@ -148,8 -142,8 +148,9 @@@
  
  <& /Ticket/Elements/AddAttachments, %ARGS &>
  
-  <tr><td class="labeltop"><&|/l&>Message</&>:</td><td>
+  <tr><td class="labeltop"><&|/l&>Message</&>:</td>
+  <td class="messagebox-container action-<% $ARGS{UpdateType} || 'private' %>">
 +% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
  %# Currently, bulk update always starts with Comment not Reply selected, so we check this unconditionally
  % my $IncludeSignature = RT->Config->Get('MessageBoxIncludeSignatureOnComment');
  <& /Elements/MessageBox, Name => "UpdateContent", 

-----------------------------------------------------------------------