[Rt-commit] rt branch, 4.6/selfservice-checkout-attachmemt-layout-fix, created. rt-4.4.4-543-g8939b9f323

[Aaron Trevena]

The branch, 4.6/selfservice-checkout-attachmemt-layout-fix has been created
        at  8939b9f3236e408286dfe4a1bb724eaa4f250335 (commit)

- Log -----------------------------------------------------------------
commit 8939b9f3236e408286dfe4a1bb724eaa4f250335
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Tue Dec 10 21:29:19 2019 +0000

    Render dropzone below message box in self-service
    
    Moves attachment ui to below message box, centers fields in self-service form
    Updated tests referring to removed text

diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 44eb920d51..9bb43ca890 100644
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -58,36 +58,36 @@
 <&|/Widgets/TitleBox, title => $title, class => 'ticket-info-basics' &>
 <div>
 <div class="form-row">
-<div class="label col-md-3">
+<div class="label col-md-2">
 <&|/l&>Queue</&>:
 </div>
-<div class="value col-md-9">
+<div class="value col-md-8">
     <input type="hidden" class="hidden" name="Queue" value="<%$queue_obj->id || ''%>" />
     <strong><%$queue_obj->Name || ''%></strong> <% $queue_obj->Description ? '('.$queue_obj->Description.')' : '' %>
 </div>
 </div>
 <% $m->callback( CallbackName => 'AfterQueue', %ARGS, QueueObj => $queue_obj ) %>
 <div class="form-row">
-<div class="label col-md-3">
+<div class="label col-md-2">
 <&|/l&>Requestors</&>:
 </div>
-<div class="value col-md-9">
+<div class="value col-md-8">
 <& /Elements/EmailInput, Name => 'Requestors', Size => '20', Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress, AutocompleteMultiple => 1 &>
 </div>
 </div>
 <div class="form-row">
-<div class="label col-md-3">
+<div class="form-group label col-md-2">
 <&|/l&>Cc</&>:
 </div>
-<div class="value col-md-9">
+<div class="value col-md-8">
 <& /Elements/EmailInput, Name => 'Cc', Size => '20', Default => $ARGS{Cc} || '', AutocompleteMultiple => 1 &>
 </div>
 </div>
 <div class="form-row">
-<div class="label col-md-3">
+<div class="form-group label col-md-2">
 <&|/l&>Subject</&>:
 </div>
-<div class="value col-md-9">
+<div class="form-group value col-md-8">
 <input class="form-control" type="text" name="Subject" size="60" maxsize="200" value="<%$ARGS{Subject} || ''%>" />
 </div>
 </div>
@@ -98,11 +98,13 @@
     InTable         => 1,
     ForCreation     => 1,
     &>
-<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $queue_obj &>
 </div>
-<&|/l&>Describe the issue below</&>:<br />
-<& /Elements/MessageBox, Default => $ARGS{Content} || ''  &>
-
+<div class="form-group">
+  <& /Elements/MessageBox, Default => $ARGS{Content} || ''  &>
+</div>
+<div class="form-group">
+  <& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $queue_obj &>
+</div>
 <div class="form-row">
   <div class="col-md-12">
     <& /Elements/Submit, Label => loc("Create ticket")&>
diff --git a/share/html/SelfService/Update.html b/share/html/SelfService/Update.html
index fe49a680f2..0af72a33a3 100644
--- a/share/html/SelfService/Update.html
+++ b/share/html/SelfService/Update.html
@@ -61,10 +61,10 @@
 
 <div>
     <div class="form-row">
-        <div class="label col-md-3">
+        <div class="label col-md-2">
             <&|/l&>Status</&>
         </div>
-        <div class="value col-md-9">
+        <div class="value col-md-8">
             <& /Ticket/Elements/SelectStatus,
                Name => "Status",
                TicketObj => $Ticket,
@@ -72,31 +72,37 @@
         </div>
     </div>
     <div class="form-row">
-        <div class="label col-md-3">
+        <div class="form-group label col-md-2">
             <&|/l&>Subject</&>
         </div>
-        <div class="value col-md-9">
+        <div class="form-group value col-md-8">
             <input class="form-control" type="text" name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $Ticket->Subject || '' %>" />
         </div>
 
     </div>
-    <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
     <& /Elements/EditCustomFields, Object => $Ticket &>
 </div>
+<div class="form-group">
 % if (exists $ARGS{UpdateContent}) {
 % # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
 % my $temp = $ARGS{'QuoteTransaction'};
 % delete $ARGS{'QuoteTransaction'};
-<& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0, %ARGS&>
+<& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0, %ARGS &>
 % $ARGS{'QuoteTransaction'} = $temp;
 % } else {
 % my $IncludeSignature = 1;
 <& /Elements/MessageBox, Name=>"UpdateContent", IncludeSignature => $IncludeSignature, %ARGS &>
 % }
-    <br />
-
+</div>
+<div class="form-group">
+  <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
+</div>
 
+<div class="form-row">
+  <div class="col-md-12">
 <& /Elements/Submit, Label => loc('Update Ticket'), Name => 'SubmitTicket', id => 'SubmitTicket' &>
+  </div>
+</div>
 
   </&>
   </form>
diff --git a/t/web/csrf.t b/t/web/csrf.t
index bdd895d92d..9071a32b36 100644
--- a/t/web/csrf.t
+++ b/t/web/csrf.t
@@ -223,6 +223,5 @@ $m->content_lacks("Possible cross-site request forgery");
 is($m->response->redirects, 0, "no redirection");
 like($m->response->request->uri, qr{^http://[^/]+\Q/SelfService/Create.html\E\?CSRF_Token=\w+$});
 $m->title_is('Create a ticket in #1');
-$m->content_contains('Describe the issue below:');
 
 done_testing;

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