[Rt-commit] rt branch, 4.4/improve-jump-to-unread-ui, repushed

[Maureen Mirville]

The branch 4.4/improve-jump-to-unread-ui was deleted and repushed:
       was c1f12f696edd8ea308f82ea2c34e69e342053d4a
       now 791813aa359ae8741e8e99fac86f1a99814b789a

1: c1f12f696e ! 1: 791813aa35 Improve UI of unread messages notification
    @@ -6,54 +6,11 @@
         a panel at the top of the ticket display page gives the user the
         option to mark messages as read and also jump to the first unread
         message. The previous UI used links within the text making it
    -    difficult to see. UI updated with buttons instead. Previous
    -    variable, "UpdateStatus" was changed to "UnreadMessages" to make
    -    it clear that it refers to tickets with unread messages.
    -    Corresponding tests also updated accordingly.
    +    difficult to see. UI updated with buttons instead. Corresponding
    +    tests also updated accordingly.
         
         Fixes: I#30082
         Fixes: I#32584
    -
    -diff --git a/share/html/Asset/Search/Bulk.html b/share/html/Asset/Search/Bulk.html
    ---- a/share/html/Asset/Search/Bulk.html
    -+++ b/share/html/Asset/Search/Bulk.html
    -@@
    -     <td><input name="UpdateDescription" value="<% $ARGS{'Description'}||'' %>" size="40"></td>
    -   </tr>
    -   <tr class="asset-status">
    --    <td class="label"><label for="UpdateStatus"><&|/l&>Status</&></label></td>
    --    <td><& /Asset/Elements/SelectStatus, Name => 'UpdateStatus', DefaultValue => 1, CatalogObj => $catalog_obj &></td>
    -+    <td class="label"><label for="UnreadMessages"><&|/l&>Status</&></label></td>
    -+    <td><& /Asset/Elements/SelectStatus, Name => 'UnreadMessages', DefaultValue => 1, CatalogObj => $catalog_obj &></td>
    -   </tr>
    - </table>
    - %   my $cfs = $catalog_obj->AssetCustomFields;
    -
    -diff --git a/share/html/Elements/RT__Ticket/ColumnMap b/share/html/Elements/RT__Ticket/ColumnMap
    ---- a/share/html/Elements/RT__Ticket/ColumnMap
    -+++ b/share/html/Elements/RT__Ticket/ColumnMap
    -@@
    -         title     => 'SLA', # loc
    -         value     => sub { return $_[0]->SLA }
    -     },
    --    UpdateStatus => {
    -+    UnreadMessages => {
    -         title => 'New messages', # loc
    -         value => sub {
    -             my $txn = $_[0]->SeenUpTo or return $_[0]->loc('No');
    -
    -diff --git a/share/html/Search/Elements/BuildFormatString b/share/html/Search/Elements/BuildFormatString
    ---- a/share/html/Search/Elements/BuildFormatString
    -+++ b/share/html/Search/Elements/BuildFormatString
    -@@
    - # All the things we can display in the format string by default
    - my @fields = qw(
    -     id QueueName Subject
    --    Status ExtendedStatus UpdateStatus
    -+    Status ExtendedStatus UnreadMessages
    -     Type
    - 
    -     OwnerName Requestors Cc AdminCc CreatedBy LastUpdatedBy
     
     diff --git a/share/html/Ticket/Elements/ShowUpdateStatus b/share/html/Ticket/Elements/ShowUpdateStatus
     --- a/share/html/Ticket/Elements/ShowUpdateStatus
    @@ -85,37 +42,6 @@
      </&>
      </div>
      <%ARGS>
    -
    -diff --git a/share/html/Tools/MyDay.html b/share/html/Tools/MyDay.html
    ---- a/share/html/Tools/MyDay.html
    -+++ b/share/html/Tools/MyDay.html
    -@@
    - <td rowspan="2"><span class="label"><&|/l&>Comments</&>:<br /></span><textarea name="UpdateContent-<%$Ticket->Id%>" rows="5"
    - cols="60"></textarea></td></tr>
    - <tr <%$class|n%>>
    --<td><span class="label"><&|/l&>Status</&>:</span> <& /Ticket/Elements/SelectStatus, Name=> 'UpdateStatus-'.$Ticket->Id, TicketObj => $Ticket &></td>
    -+<td><span class="label"><&|/l&>Status</&>:</span> <& /Ticket/Elements/SelectStatus, Name=> 'UnreadMessages-'.$Ticket->Id, TicketObj => $Ticket &></td>
    -                   </tr>
    - 
    - % }
    -@@
    - my $i = 0;
    - my @results;
    - foreach my $arg ( keys %ARGS ) {
    --    next unless ( $arg =~ /^UpdateStatus-(\d*)$/ );
    -+    next unless ( $arg =~ /^UnreadMessages-(\d*)$/ );
    -     my $id     = $1;
    -     my $ticket = LoadTicket($id);
    -     next unless ( $ticket->id );
    -@@
    -             push @results, loc( "Ticket [_1]: [_2]", $id, $msg );
    -     }
    - 
    --    if ( my $status = $ARGS{ 'UpdateStatus-' . $id } ) {
    -+    if ( my $status = $ARGS{ 'UnreadMessages-' . $id } ) {
    -         if ( $status ne $ticket->Status ) {
    -             my ( $val, $msg ) = $ticket->SetStatus($status);
    -             push @results, loc( "Ticket [_1]: [_2]", $id, $msg );
     
     diff --git a/share/static/css/base/ticket.css b/share/static/css/base/ticket.css
     --- a/share/static/css/base/ticket.css