[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0alpha1-108-g5f71e4786b

Jim Brandt jbrandt at bestpractical.com
Thu Apr 16 09:48:52 EDT 2020 

The branch, 5.0-trunk has been updated
       via  5f71e4786ba0c08840f28b7aea87196081fd8a3c (commit)
       via  812738d7461d52d4b6a5d8165e5aa584f269847b (commit)
       via  8417d0e22a26b54e030cbf57116ce5eb74b1c11d (commit)
      from  79b5ca1796e935c917c715d8dd4072b222f8355f (commit)

Summary of changes:
 share/html/SelfService/Create.html | 32 +++++++++++++++++---------------
 share/html/SelfService/Update.html | 22 ++++++++++++++--------
 t/web/csrf.t                       |  1 -
 3 files changed, 31 insertions(+), 24 deletions(-)

- Log -----------------------------------------------------------------
commit 812738d7461d52d4b6a5d8165e5aa584f269847b
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Thu Apr 16 10:10:04 2020 +0100

    Improve layout and spacing on self-service create page
    
    Update queue formatting to align label and value and move
    hidden queue id to other hidden form fields.
    
    Switch form input styles to col-md-2/col-md-8 because self service
    uses the full page width compared to privileged create page. The
    fields didn't look centered with 3/9.

diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 54a458f288..9d1748f2c0 100644
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -51,43 +51,43 @@
 <form action="Create.html" method="post" enctype="multipart/form-data" name="TicketCreate">
 <input type="hidden" class="hidden" name="id" value="new" />
 <input type="hidden" class="hidden" name="Token" value="<% $ARGS{'Token'} %>" />
+<input type="hidden" class="hidden" name="Queue" value="<%$queue_obj->id || ''%>" />
 % for my $key (grep {defined $ARGS{$_}} map {+("new-$_", "$_-new")} keys %RT::Link::DIRMAP) {
 <input type="hidden" class="hidden" name="<% $key %>" value="<% $ARGS{$key} %>" />
 % }
 
 <&|/Widgets/TitleBox, title => $title, class => 'ticket-info-basics' &>
 <div>
-<div class="form-row">
-<div class="label col-md-3">
+<div class="queue form-row">
+<div class="label col-md-2">
 <&|/l&>Queue</&>:
 </div>
-<div class="value col-md-9">
-    <input type="hidden" class="hidden" name="Queue" value="<%$queue_obj->id || ''%>" />
-    <strong><%$queue_obj->Name || ''%></strong> <% $queue_obj->Description ? '('.$queue_obj->Description.')' : '' %>
+<div class="value col-md-8">
+    <span class="current-value form-control"><strong><%$queue_obj->Name || ''%></strong> <% $queue_obj->Description ? '('.$queue_obj->Description.')' : '' %></span>
 </div>
 </div>
 <% $m->callback( CallbackName => 'AfterQueue', %ARGS, QueueObj => $queue_obj ) %>
 <div class="form-row">
-<div class="label col-md-3">
+<div class="form-group 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>
diff --git a/share/html/SelfService/Update.html b/share/html/SelfService/Update.html
index 1efad2fe68..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,10 +72,10 @@
         </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>
 
@@ -87,7 +87,7 @@
 % # 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;

commit 5f71e4786ba0c08840f28b7aea87196081fd8a3c
Merge: 79b5ca1796 812738d746
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Apr 16 08:43:18 2020 -0400

    Merge branch '4.6/selfservice-checkout-attachmemt-layout-fix' into 5.0-trunk

diff --cc share/html/SelfService/Create.html
index 51b18f29d5,9d1748f2c0..bc54dfffea
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@@ -68,19 -68,19 +68,19 @@@
  </div>
  <% $m->callback( CallbackName => 'AfterQueue', %ARGS, QueueObj => $queue_obj ) %>
  <div class="form-row">
- <div class="label col-md-3">
+ <div class="form-group 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 &>
 +<& /Elements/EmailInput, Name => 'Requestors', Size => '20', Default => $ARGS{Requestors} || $session{CurrentUser}->EmailAddress, AutocompleteMultiple => RT->Config->Get('AllowUserAutocompleteForUnprivileged') ? 1 : 0 &>
  </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 &>
 +<& /Elements/EmailInput, Name => 'Cc', Size => '20', Default => $ARGS{Cc} || '', AutocompleteMultiple => RT->Config->Get('AllowUserAutocompleteForUnprivileged') ? 1 : 0 &>
  </div>
  </div>
  <div class="form-row">

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

More information about the rt-commit mailing list