[Rt-commit] rt branch, 5.0/fix-selfservice-custom-field-layout, created. rt-5.0.0beta1-43-g7b67916fb9

[Aaron Trevena]

The branch, 5.0/fix-selfservice-custom-field-layout has been created
        at  7b67916fb98b2e6e6c22bd8ab4126323b44adeb1 (commit)

- Log -----------------------------------------------------------------
commit 7b67916fb98b2e6e6c22bd8ab4126323b44adeb1
Author: Aaron Trevena <ast at bestpractical.com>
Date:   Wed Jul 1 12:37:45 2020 +0100

    Fix alignment of custom fields in selfservice
    
    Fix alignment of custom fields in self-service ticket creation

diff --git a/share/html/Elements/EditCustomFields b/share/html/Elements/EditCustomFields
index b232dfb3af..f47b348968 100644
--- a/share/html/Elements/EditCustomFields
+++ b/share/html/Elements/EditCustomFields
@@ -55,13 +55,13 @@
 % my $Type = $CustomField->Type || 'Unknown';
 
   <div class="form-row edit-custom-field cftype-<% $Type %>">
-    <div class="cflabel label col-3">
-      <span class="name"><% $CustomField->Name %>:</span>
+    <div class="cflabel label col-<% ($InSidebar) ? 3 : 2 %>">
+      <% $CustomField->Name %>:
 % if ( $CustomField->EntryHint ) {
       <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CustomField->EntryHint %>"></span>
 % }
     </div>
-    <div class="value col-9">
+    <div class="value col-<% ($InSidebar) ? 9 : 8 %>">
 % my $default = $m->notes('Field-' . $CustomField->Id);
 % $default ||= $ARGS{"CustomField-". $CustomField->Id };
       <& /Elements/EditCustomField,
@@ -113,6 +113,7 @@ $Object
 $CustomFields => undef
 $Grouping     => undef
 $InTable => 0
+$InSidebar => 1
 $ShowHints => 1
 $ForCreation => 0
 </%ARGS>
diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 86f5e90fdb..9e3f32f679 100644
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -91,14 +91,17 @@
 <input class="form-control" type="text" name="Subject" size="60" maxsize="200" value="<%$ARGS{Subject} || ''%>" />
 </div>
 </div>
+<div class="form-group">
 <& /Elements/EditCustomFields,
     %ARGS,
     Object          => RT::Ticket->new($session{CurrentUser}),
     CustomFields    => $queue_obj->TicketCustomFields,
     InTable         => 1,
     ForCreation     => 1,
+    InSidebar       => 0
     &>
 </div>
+</div>
 <div class="form-group">
   <& /Elements/MessageBox, Default => $ARGS{Content} || ''  &>
 </div>
diff --git a/share/static/css/elevator-light/ticket-form.css b/share/static/css/elevator-light/ticket-form.css
index bf1342567b..26bb0ffb1e 100644
--- a/share/static/css/elevator-light/ticket-form.css
+++ b/share/static/css/elevator-light/ticket-form.css
@@ -1,5 +1,6 @@
 #ticket-create-metadata .cflabel .name,
-#ticket-update-metadata .cflabel .name {
+#ticket-update-metadata .cflabel .name,
+#ticket-info-basics .cflabel .name {
     font-weight: normal;
 }
 

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