[Rt-commit] rt branch, 4.6/admin-limit-simple-form-width, created. rt-4.4.4-772-g3e082e4b7

? sunnavy sunnavy at bestpractical.com
Thu Feb 13 16:36:47 EST 2020


The branch, 4.6/admin-limit-simple-form-width has been created
        at  3e082e4b77b574df5945b27f3722dbb31b903a3b (commit)

- Log -----------------------------------------------------------------
commit 58ebbf00b854bde8e12a690aaca591712148809f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Feb 12 06:13:48 2020 +0800

    Add titlebox to queue/template/class/cf/cr create/modify pages
    
    This is for consistency

diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index 5e4916625..fbb17dcc1 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -57,6 +57,8 @@
 <input type="hidden" name="id" value="<%$ClassObj->Id%>" />
 % }
 
+<&| /Widgets/TitleBox, class => 'article-class-info-basics' &>
+
   <div class="form-row">
     <div class="col-md-3 label">
       <&|/l&>Class Name</&>:
@@ -164,6 +166,7 @@
 % }
 
 %$m->callback( CallbackName => 'BeforeSubmit', CustomFields => $cfs, ClassObj => $ClassObj );
+</&>
 
   <div class="form-row">
     <div class="col-md-12">
diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index ec9352a76..2c12d4e6a 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -55,6 +55,8 @@
 <form method="post" action="Modify.html" name="ModifyCustomField" id="ModifyCustomField">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
+<&| /Widgets/TitleBox, class => 'custom-field-info-basics' &>
+
 <div class="form-row">
   <div class="label col-md-3">
     <&|/l&>Name</&>
@@ -285,6 +287,7 @@ jQuery( function() {
 </div>
 % }
 
+</&>
 <div class="form-row">
   <div class="col-md-12">
     <& /Elements/Submit, Name => 'Update', Label => $id eq 'new'? loc('Create'): loc('Save Changes') &>
diff --git a/share/html/Admin/CustomRoles/Modify.html b/share/html/Admin/CustomRoles/Modify.html
index fb53cd2cb..e14e14b52 100644
--- a/share/html/Admin/CustomRoles/Modify.html
+++ b/share/html/Admin/CustomRoles/Modify.html
@@ -55,6 +55,7 @@
 <input type="hidden" class="hidden" name="id" value="<% $Create ? 'new': $RoleObj->Id %>" />
 % $m->callback( CallbackName => 'FormStart', Create => $Create, ARGSRef => \%ARGS );
 
+<&| /Widgets/TitleBox, class => 'custom-role-info-basics' &>
 <div class="form-row">
   <div class="label col-md-3">
     <&|/l&>Role Name</&>:
@@ -121,6 +122,7 @@ disabled="disabled"
   </div>
 </div>
 
+</&>
 % if ( $Create ) {
 <& /Elements/Submit, Label => loc('Create') &>
 % } else {
diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index 7aba871fb..cf89d6b6e 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -45,6 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+<&| /Widgets/TitleBox, class => 'template-info-basics' &>
 <div class="form-row">
   <div class="col-md-3 label">
     <&|/l&>Name</&>:
@@ -88,6 +89,7 @@
 <%$Content||''%></textarea>
   </div>
 </div>
+</&>
 
 <%INIT>
 
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 711891210..d2b725e82 100644
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -55,6 +55,7 @@
 <input type="hidden" class="hidden" name="id" value="<% $Create? 'new': $QueueObj->Id %>" />
 % $m->callback( CallbackName => 'FormStart', Create => $Create, ARGSRef => \%ARGS );
 
+<&| /Widgets/TitleBox, class => 'queue-info-basics' &>
   <div class="form-row">
     <div class="col-md-3 label">
       <&|/l&>Queue Name</&>:
@@ -237,6 +238,7 @@
   </div>
 % }
 
+</&>
   <div class="form-row">
     <div class="col-md-12">
 % if ( $Create ) {

commit 43dfd3e5e91c40af8daa1dd12bbf8c7ab159136f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Feb 12 07:04:54 2020 +0800

    Tweak article class create/modify pages to be a bit more coordinated

diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index fbb17dcc1..f3dc10aa1 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -90,7 +90,7 @@
 
   <div class="form-row">
     <div class="col-md-12">
-      <h3><&|/l&>When inserting articles in this class into emails:</&></h3>
+      <h5 class="mt-3"><&|/l&>When inserting articles in this class into emails:</&></h5>
     </div>
   </div>
 
@@ -128,10 +128,11 @@
   </div>
 
 % if ( $cfs ) {
+  <h5 class="mt-3"><&|/l&>Include custom field:</&></h5>
 % while (my $cf = $cfs->Next) {
   <div class="form-row">
-    <div class="col-md-3 label">
-      <&|/l, $cf->Name &>Include custom field '[_1]'</&>
+    <div class="col-md-3 label pt-0">
+      <% $cf->Name %>:
     </div>
     <div class="col-md-9 value">
       <div class="form-row">
@@ -153,7 +154,7 @@
 % } }
 
 % if ( @$subject_cfs ) {
-<h3><&|/l&>Change email subject:</&></h3>
+<h5 class="mt-3"><&|/l&>Change email subject:</&></h5>
 <p><&|/l&>If a Custom Field is selected, the Subject of your outgoing email will be overridden by this article.</&></p>
 
   <& /Widgets/Form/Select,

commit 8d5f483e6708d755f2d9cbeef53992ce31f365dd
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Feb 12 07:13:19 2020 +0800

    Add $content_class arg so we can customize css classes to div.titlebox-content

diff --git a/share/html/Widgets/TitleBoxStart b/share/html/Widgets/TitleBoxStart
index 2bf15d8eb..d041253d3 100644
--- a/share/html/Widgets/TitleBoxStart
+++ b/share/html/Widgets/TitleBoxStart
@@ -62,7 +62,7 @@
         <% $titleright  %><% $titleright_raw |n%><% $titleright_href ? "</a>" : '' |n%>\
     </span>
   </div>
-  <div class="titlebox-content collapse<% $bodyclass %><% $rolledup ? " hidden" : " show"%>" id="<% $tid %>">
+  <div class="titlebox-content collapse<% $bodyclass %><% $rolledup ? " hidden" : " show"%><% " $content_class" || '' %>" id="<% $tid %>">
     <div class="card-body">
 <%ARGS>
 $class => ''
@@ -78,6 +78,7 @@ $id => ''
 $hideable => 1
 $rolledup => 0
 $data => {}
+$content_class => ''
 </%ARGS>
 
 <%init>

commit 1f29e5fd07d7fcdfbaa1963dab664644255bf05d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Feb 13 06:19:24 2020 +0800

    Limit titlebox/input width for simple admin forms
    
    On large screens, it's way too wide and doesn't look good for simple
    admin forms on the following pages:
    
    * Article class create/modify pages
    * Asset catalog create/modify/defaltvalues pages
    * Custom field create/modify pages
    * Custom role create/modify pages
    * Group create/modify pages
    * Queue create/modify/defaltvalues pages
    * Scrip action create/modify pages
    * Scrip condition create/modify pages
    * Scrip template create/modify pages
    * Scrip create/modify pages
    
    The width rules are consistent with corresponding bootstrap versions

diff --git a/share/html/Admin/Actions/Create.html b/share/html/Admin/Actions/Create.html
index a13a91fcd..fbdb24adf 100644
--- a/share/html/Admin/Actions/Create.html
+++ b/share/html/Admin/Actions/Create.html
@@ -49,9 +49,9 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Create.html" id="CreateAction" name="CreateAction">
+<form method="post" action="Create.html" id="CreateAction" name="CreateAction" class="mx-auto max-width-lg">
 
-<&| /Widgets/TitleBox, title => loc('Basics') &>
+<&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
 <& Elements/EditBasics, %ARGS, Action => $action, &>
 </&>
 
diff --git a/share/html/Admin/Actions/Modify.html b/share/html/Admin/Actions/Modify.html
index 00c64f5d1..f40bf2deb 100644
--- a/share/html/Admin/Actions/Modify.html
+++ b/share/html/Admin/Actions/Modify.html
@@ -49,10 +49,10 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Modify.html" id="ModifyAction" name="ModifyAction">
+<form method="post" action="Modify.html" id="ModifyAction" name="ModifyAction" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
-<&| /Widgets/TitleBox, title => loc('Basics') &>
+<&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
 <& Elements/EditBasics, %ARGS, Action => $action, &>
 </&>
 
diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index f3dc10aa1..7de0e34e3 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -49,7 +49,7 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form name="ModifyClass" action="<% RT->Config->Get('WebPath') %>/Admin/Articles/Classes/Modify.html" method="post">
+<form name="ModifyClass" action="<% RT->Config->Get('WebPath') %>/Admin/Articles/Classes/Modify.html" method="post" class="mx-auto max-width-lg">
 <input type="hidden" name="Submitted" value="1" />
 %if ($Create ) {
 <input type="hidden" name="id" value="new" />
@@ -57,7 +57,7 @@
 <input type="hidden" name="id" value="<%$ClassObj->Id%>" />
 % }
 
-<&| /Widgets/TitleBox, class => 'article-class-info-basics' &>
+<&| /Widgets/TitleBox, class => 'article-class-info-basics', content_class => 'mx-auto width-sm' &>
 
   <div class="form-row">
     <div class="col-md-3 label">
diff --git a/share/html/Admin/Assets/Catalogs/Create.html b/share/html/Admin/Assets/Catalogs/Create.html
index 7b17ff8b3..d4655e683 100644
--- a/share/html/Admin/Assets/Catalogs/Create.html
+++ b/share/html/Admin/Assets/Catalogs/Create.html
@@ -49,10 +49,10 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" enctype="multipart/form-data" id="CreateCatalog" action="Create.html">
+<form method="post" enctype="multipart/form-data" id="CreateCatalog" action="Create.html" class="mx-auto max-width-lg">
   <input type="hidden" name="id" value="new">
 
-  <&| /Widgets/TitleBox, title => loc("Basics"), class => "catalog-basics" &>
+  <&| /Widgets/TitleBox, title => loc("Basics"), class => "catalog-basics", content_class => 'mx-auto width-sm' &>
     <& Elements/EditBasics, %ARGS, CatalogObj => $catalog &>
   </&>
 
diff --git a/share/html/Admin/Assets/Catalogs/DefaultValues.html b/share/html/Admin/Assets/Catalogs/DefaultValues.html
index 8854fb9b3..15acb38cc 100644
--- a/share/html/Admin/Assets/Catalogs/DefaultValues.html
+++ b/share/html/Admin/Assets/Catalogs/DefaultValues.html
@@ -49,14 +49,14 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="DefaultValues.html" name="ModifyDefaultValues" id="ModifyDefaultValues">
+<form method="post" action="DefaultValues.html" name="ModifyDefaultValues" id="ModifyDefaultValues" class="mx-auto max-width-lg">
 <input type="hidden" name="id" value="<% $catalog->id %>" />
 
 <& /Elements/EditCustomFieldCustomGroupings,
     CustomFieldGenerator => sub {
         $catalog->AssetCustomFields->LimitToDefaultValuesSupportedTypes
     },
-    TitleBoxARGS => { title_class => "inverse" },
+    TitleBoxARGS => { title_class => "inverse", content_class => 'mx-auto width-sm' },
     Object => RT::Asset->new($session{CurrentUser})
 &>
 
diff --git a/share/html/Admin/Assets/Catalogs/Modify.html b/share/html/Admin/Assets/Catalogs/Modify.html
index e27bc2fd3..38a7e8309 100644
--- a/share/html/Admin/Assets/Catalogs/Modify.html
+++ b/share/html/Admin/Assets/Catalogs/Modify.html
@@ -49,10 +49,10 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" enctype="multipart/form-data" id="ModifyCatalog" action="Modify.html">
+<form method="post" enctype="multipart/form-data" id="ModifyCatalog" action="Modify.html" class="mx-auto max-width-lg">
   <input type="hidden" name="id" value="<% $catalog->id %>">
 
-  <&| /Widgets/TitleBox, title => loc("Basics"), class => "catalog-basics" &>
+  <&| /Widgets/TitleBox, title => loc("Basics"), class => "catalog-basics", content_class => 'mx-auto width-sm' &>
     <& Elements/EditBasics, %ARGS, CatalogObj => $catalog &>
   </&>
 
diff --git a/share/html/Admin/Conditions/Create.html b/share/html/Admin/Conditions/Create.html
index 75a235432..e80136aab 100644
--- a/share/html/Admin/Conditions/Create.html
+++ b/share/html/Admin/Conditions/Create.html
@@ -49,9 +49,9 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Create.html" id="CreateCondition" name="CreateCondition">
+<form method="post" action="Create.html" id="CreateCondition" name="CreateCondition" class="mx-auto max-width-lg">
 
-<&| /Widgets/TitleBox, title => loc('Basics') &>
+<&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
 
 <& Elements/EditBasics, %ARGS, Condition => $condition, &>
 
diff --git a/share/html/Admin/Conditions/Modify.html b/share/html/Admin/Conditions/Modify.html
index 7dabee7b4..a4ead8df2 100644
--- a/share/html/Admin/Conditions/Modify.html
+++ b/share/html/Admin/Conditions/Modify.html
@@ -49,10 +49,10 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Modify.html" id="ModifyCondition" name="ModifyCondition">
+<form method="post" action="Modify.html" id="ModifyCondition" name="ModifyCondition" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
-<&| /Widgets/TitleBox, title => loc('Basics') &>
+<&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
 
 <& Elements/EditBasics, %ARGS, Condition => $condition, &>
 
diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index 2c12d4e6a..048bf210f 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -52,10 +52,10 @@
 <& /Elements/ListActions, actions => \@results &>
 
 
-<form method="post" action="Modify.html" name="ModifyCustomField" id="ModifyCustomField">
+<form method="post" action="Modify.html" name="ModifyCustomField" id="ModifyCustomField" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
-<&| /Widgets/TitleBox, class => 'custom-field-info-basics' &>
+<&| /Widgets/TitleBox, class => 'custom-field-info-basics', content_class => 'mx-auto width-sm' &>
 
 <div class="form-row">
   <div class="label col-md-3">
diff --git a/share/html/Admin/CustomRoles/Modify.html b/share/html/Admin/CustomRoles/Modify.html
index e14e14b52..077417867 100644
--- a/share/html/Admin/CustomRoles/Modify.html
+++ b/share/html/Admin/CustomRoles/Modify.html
@@ -51,11 +51,11 @@
 
 
 
-<form action="<%RT->Config->Get('WebPath')%>/Admin/CustomRoles/Modify.html" name="ModifyCustomRole" method="post" enctype="multipart/form-data">
+<form action="<%RT->Config->Get('WebPath')%>/Admin/CustomRoles/Modify.html" name="ModifyCustomRole" method="post" enctype="multipart/form-data" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $Create ? 'new': $RoleObj->Id %>" />
 % $m->callback( CallbackName => 'FormStart', Create => $Create, ARGSRef => \%ARGS );
 
-<&| /Widgets/TitleBox, class => 'custom-role-info-basics' &>
+<&| /Widgets/TitleBox, class => 'custom-role-info-basics', content_class => 'mx-auto width-sm' &>
 <div class="form-row">
   <div class="label col-md-3">
     <&|/l&>Role Name</&>:
diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index cf89d6b6e..62de6a939 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, class => 'template-info-basics' &>
+<&| /Widgets/TitleBox, class => 'template-info-basics', content_class => 'mx-auto' &>
 <div class="form-row">
   <div class="col-md-3 label">
     <&|/l&>Name</&>:
diff --git a/share/html/Admin/Global/Template.html b/share/html/Admin/Global/Template.html
index f6cb55a9d..a043206b4 100644
--- a/share/html/Admin/Global/Template.html
+++ b/share/html/Admin/Global/Template.html
@@ -49,7 +49,7 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" name="ModifyTemplate" id="ModifyTemplate" action="Template.html">
+<form method="post" name="ModifyTemplate" id="ModifyTemplate" action="Template.html" class="mx-auto max-width-lg">
 %if ($Create ) {
 <input type="hidden" class="hidden" name="Template" value="new" />
 % } else {
diff --git a/share/html/Admin/Groups/Modify.html b/share/html/Admin/Groups/Modify.html
index 0d746017b..4e03e9be1 100644
--- a/share/html/Admin/Groups/Modify.html
+++ b/share/html/Admin/Groups/Modify.html
@@ -52,7 +52,7 @@
 
 
 
-<form action="<%RT->Config->Get('WebPath')%>/Admin/Groups/Modify.html" name="ModifyGroup" method="post" enctype="multipart/form-data">
+<form action="<%RT->Config->Get('WebPath')%>/Admin/Groups/Modify.html" name="ModifyGroup" method="post" enctype="multipart/form-data" class="mx-auto max-width-lg">
 
 %unless ($Group->Id) {
   <input type="hidden" class="hidden" name="id" value="new" />
@@ -60,7 +60,7 @@
   <input type="hidden" class="hidden" name="id" value="<%$Group->Id%>" />
 % }
 
-  <&| /Widgets/TitleBox, title => loc('Basics'), class => 'group-info-basics' &>
+  <&| /Widgets/TitleBox, title => loc('Basics'), class => 'group-info-basics', content_class => 'mx-auto width-sm' &>
   <div class="form-row">
     <div class="col-md-3 label">
       <&|/l&>Name</&>:
diff --git a/share/html/Admin/Queues/DefaultValues.html b/share/html/Admin/Queues/DefaultValues.html
index ca8e2d3da..a060a1bb3 100644
--- a/share/html/Admin/Queues/DefaultValues.html
+++ b/share/html/Admin/Queues/DefaultValues.html
@@ -49,11 +49,11 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="DefaultValues.html" name="ModifyDefaultValues" id="ModifyDefaultValues">
+<form method="post" action="DefaultValues.html" name="ModifyDefaultValues" id="ModifyDefaultValues" class="mx-auto max-width-lg">
 <input type="hidden" name="id" value="<% $queue->id %>" />
 
 <div class="ticket-info-basics">
-  <&| /Widgets/TitleBox, title => loc('Basics') &>
+  <&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
   <div class="form-row">
     <div class="col-md-3 label">
       <&|/l&>Priority</&>:
@@ -92,7 +92,7 @@
 </div>
 
 <div class="ticket-info-dates">
-  <&|/Widgets/TitleBox, title => loc("Dates") &>
+  <&|/Widgets/TitleBox, title => loc("Dates"), content_class => 'mx-auto width-sm' &>
   <div class="form-row">
     <div class="col-md-3 label">
       <&|/l&>Starts</&>:
@@ -121,7 +121,7 @@
 
 % if ( RT->Config->ObjectHasCustomFieldGrouping(Object => RT::Ticket->new($session{CurrentUser}), Grouping => 'People') ) {
 <div class="ticket-info-people">
-  <&|/Widgets/TitleBox, title => loc("People") &>
+  <&|/Widgets/TitleBox, title => loc("People"), content_class => 'mx-auto width-sm' &>
   <& /Elements/EditCustomFields,
       Object => RT::Ticket->new($session{CurrentUser}),
       CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
@@ -133,7 +133,7 @@
 
 % if ( RT->Config->ObjectHasCustomFieldGrouping(Object => RT::Ticket->new($session{CurrentUser}), Grouping => 'Links') ) {
 <div class="ticket-info-links">
-  <&|/Widgets/TitleBox, title => loc("Links") &>
+  <&|/Widgets/TitleBox, title => loc("Links"), content_class => 'mx-auto width-sm' &>
   <& /Elements/EditCustomFields,
       Object => RT::Ticket->new($session{CurrentUser}),
       CustomFields => $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes,
@@ -146,7 +146,7 @@
 <& /Elements/EditCustomFieldCustomGroupings, CustomFieldGenerator => sub { $queue->TicketCustomFields->LimitToDefaultValuesSupportedTypes }, Object => RT::Ticket->new($session{CurrentUser}) &>
 
 <div class="ticket-info-cfs">
-  <&|/Widgets/TitleBox, title => loc("Transaction Custom Fields") &>
+  <&|/Widgets/TitleBox, title => loc("Transaction Custom Fields"), content_class => 'mx-auto width-sm' &>
   <& /Elements/EditCustomFields, CustomFields => $queue->TicketTransactionCustomFields->LimitToDefaultValuesSupportedTypes, Object => RT::Transaction->new($session{CurrentUser}), QueueObj => $queue, &>
   </&>
 </div>
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index d2b725e82..14c402372 100644
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -51,11 +51,11 @@
 
 
 
-<form action="<%RT->Config->Get('WebPath')%>/Admin/Queues/Modify.html" name="ModifyQueue" method="post" enctype="multipart/form-data">
+<form action="<%RT->Config->Get('WebPath')%>/Admin/Queues/Modify.html" name="ModifyQueue" method="post" enctype="multipart/form-data" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $Create? 'new': $QueueObj->Id %>" />
 % $m->callback( CallbackName => 'FormStart', Create => $Create, ARGSRef => \%ARGS );
 
-<&| /Widgets/TitleBox, class => 'queue-info-basics' &>
+<&| /Widgets/TitleBox, class => 'queue-info-basics', content_class => 'mx-auto width-sm' &>
   <div class="form-row">
     <div class="col-md-3 label">
       <&|/l&>Queue Name</&>:
diff --git a/share/html/Admin/Queues/Template.html b/share/html/Admin/Queues/Template.html
index e12ad84fb..e3faafde7 100644
--- a/share/html/Admin/Queues/Template.html
+++ b/share/html/Admin/Queues/Template.html
@@ -49,7 +49,7 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" name="ModifyTemplate" id="ModifyTemplate" action="Template.html">
+<form method="post" name="ModifyTemplate" id="ModifyTemplate" action="Template.html" class="mx-auto max-width-lg">
 %if ($Create ) {
 <input type="hidden" class="hidden" name="Template" value="new" />
 % } else {
diff --git a/share/html/Admin/Scrips/Create.html b/share/html/Admin/Scrips/Create.html
index bc83f3bd1..3454dd448 100644
--- a/share/html/Admin/Scrips/Create.html
+++ b/share/html/Admin/Scrips/Create.html
@@ -49,11 +49,11 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Create.html" id="CreateScrip" name="CreateScrip">
+<form method="post" action="Create.html" id="CreateScrip" name="CreateScrip" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="Queue" value="<% $Queue %>" />
 <input type="hidden" class="hidden" name="Global" value="<% $Global || q{} %>" />
 
-<&| /Widgets/TitleBox, title => loc('Basics') &>
+<&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
 
 <& Elements/EditBasics, %ARGS, Scrip => $scrip, Queue => $queue_obj &>
 
diff --git a/share/html/Admin/Scrips/Elements/EditCustomCode b/share/html/Admin/Scrips/Elements/EditCustomCode
index 2c63589f7..c2fe5492f 100644
--- a/share/html/Admin/Scrips/Elements/EditCustomCode
+++ b/share/html/Admin/Scrips/Elements/EditCustomCode
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title => loc('User Defined conditions and results') &>
+<&| /Widgets/TitleBox, title => loc('User Defined conditions and results'), content_class => 'mx-auto width-sm' &>
 
 <div class="form-row">
   <div class="col-md-12 comment">
diff --git a/share/html/Admin/Scrips/Modify.html b/share/html/Admin/Scrips/Modify.html
index d498ff8fc..efcb7e6dd 100644
--- a/share/html/Admin/Scrips/Modify.html
+++ b/share/html/Admin/Scrips/Modify.html
@@ -49,11 +49,11 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Modify.html" id="ModifyScrip" name="ModifyScrip">
+<form method="post" action="Modify.html" id="ModifyScrip" name="ModifyScrip" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 <input type="hidden" class="hidden" name="From" value="<% $From || q{} %>" />
 
-<&| /Widgets/TitleBox, title => loc('Basics') &>
+<&| /Widgets/TitleBox, title => loc('Basics'), content_class => 'mx-auto width-sm' &>
 
 <& Elements/EditBasics, %ARGS, Scrip => $scrip &>
 
diff --git a/share/static/css/elevator-light/boxes.css b/share/static/css/elevator-light/boxes.css
index ba017d195..73a9c9a5a 100644
--- a/share/static/css/elevator-light/boxes.css
+++ b/share/static/css/elevator-light/boxes.css
@@ -149,3 +149,35 @@ div.results .titlebox .titlebox-content {
     -ms-transform: rotate(45deg);
     transform: rotate(45deg);
 }
+
+.max-width-xl {
+  max-width: 1200px;
+}
+
+.max-width-lg {
+  max-width: 992px;
+}
+
+.max-width-md {
+  max-width: 992px;
+}
+
+.max-width-sm {
+  max-width: 576px;
+}
+
+.width-xl {
+  width: 1200px;
+}
+
+.width-lg {
+  width: 992px;
+}
+
+.width-md {
+  width: 992px;
+}
+
+.width-sm {
+  width: 576px;
+}

commit fd75915be787ffd26813c3a560568fbd52876d63
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Feb 14 05:04:26 2020 +0800

    Split inputs into several boxes and tweak width for cf create/modify forms
    
    Thus have a much cleaner and pretty UI. Note that for inner "width-md",
    we intentionally don't use up 12 cols to get better left/right spacing.
    
    "Values" and "Add Values" could be in one box, but as they belong to 2
    forms, we have to split them for now.

diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index 048bf210f..51f57b648 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -55,7 +55,7 @@
 <form method="post" action="Modify.html" name="ModifyCustomField" id="ModifyCustomField" class="mx-auto max-width-lg">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
-<&| /Widgets/TitleBox, class => 'custom-field-info-basics', content_class => 'mx-auto width-sm' &>
+<&| /Widgets/TitleBox, title => 'Basics', class => 'custom-field-info-basics', content_class => 'mx-auto width-sm' &>
 
 <div class="form-row">
   <div class="label col-md-3">
@@ -188,43 +188,6 @@ jQuery( function() {
 </div>
 % }
 
-<div class="form-row">
-  <div class="label col-md-3">
-    <&|/l&>Link values to</&>
-  </div>
-  <div class="col-md-9 value">
-    <input class="form-control" type="text" size="60" name="LinkValueTo"  value="<% $CustomFieldObj->LinkValueTo || $LinkValueTo || '' %>" />
-  </div>
-</div>
-
-<div class="form-row">
-  <div class="col-md-3"></div>
-  <div class="col-md-9">
-    <&|/l&>RT can make this custom field's values into hyperlinks to another service.</&>
-    <&|/l&>Fill in this field with a URL.</&>
-    <&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
-  </div>
-</div>
-
-<div class="form-row">
-  <div class="label col-md-3">
-    <&|/l&>Include page</&>
-  </div>
-  <div class="col-md-9 value">
-    <input class="form-control" type="text" size="60" name="IncludeContentForValue" value="<% $CustomFieldObj->IncludeContentForValue || $IncludeContentForValue || '' %>" />
-  </div>
-</div>
-
-<div class="form-row">
-  <div class="col-md-3"></div>
-  <div class="col-md-9">
-    <&|/l&>RT can include content from another web service when showing this custom field.</&>
-    <&|/l&>Fill in this field with a URL.</&>
-    <&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
-    <i><&|/l&>Some browsers may only load content from the same domain as your RT server.</&></i>
-  </div>
-</div>
-
 % if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType ) {
 <div class="form-row categoriesbasedon">
   <div class="col-md-3 label">
@@ -271,23 +234,60 @@ jQuery( function() {
 
 % $m->callback(CallbackName => 'EndOfTable', CustomField => $CustomFieldObj, CFvalidations => \@CFvalidations);
 
+</&>
+
+
+<&| /Widgets/TitleBox, title => 'Integration', class => 'custom-field-info-integration', content_class => 'mx-auto width-md' &>
 
-% if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType && !$CustomFieldObj->IsExternalValues ) {
 <div class="form-row">
-  <div class="col-md-3 label">
-    <h2><&|/l&>Values</&></h2>
+  <div class="label col-md-2">
+    <&|/l&>Link values to</&>
+  </div>
+  <div class="col-md-8">
+    <input class="form-control" type="text" size="60" name="LinkValueTo"  value="<% $CustomFieldObj->LinkValueTo || $LinkValueTo || '' %>" />
+  </div>
+</div>
+
+<div class="form-row">
+  <div class="col-md-2"></div>
+  <div class="col-md-8">
+    <&|/l&>RT can make this custom field's values into hyperlinks to another service.</&>
+    <&|/l&>Fill in this field with a URL.</&>
+    <&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
+  </div>
+</div>
+
+<div class="form-row">
+  <div class="label col-md-2">
+    <&|/l&>Include page</&>
+  </div>
+  <div class="col-md-8 value">
+    <input class="form-control" type="text" size="60" name="IncludeContentForValue" value="<% $CustomFieldObj->IncludeContentForValue || $IncludeContentForValue || '' %>" />
   </div>
 </div>
 
 <div class="form-row">
-  <div class="col-md-3"></div>
-  <div class="edit_custom_field_values col-md-9">
+  <div class="col-md-2"></div>
+  <div class="col-md-8">
+    <&|/l&>RT can include content from another web service when showing this custom field.</&>
+    <&|/l&>Fill in this field with a URL.</&>
+    <&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
+    <i><&|/l&>Some browsers may only load content from the same domain as your RT server.</&></i>
+  </div>
+</div>
+</&>
+
+% if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType && !$CustomFieldObj->IsExternalValues ) {
+<&| /Widgets/TitleBox, title => 'Values', class => 'custom-field-info-values', content_class => 'mx-auto width-md' &>
+<div class="form-row">
+  <div class="col-md-1"></div>
+  <div class="edit_custom_field_values col-md-11">
     <& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &>
   </div>
 </div>
+</&>
 % }
 
-</&>
 <div class="form-row">
   <div class="col-md-12">
     <& /Elements/Submit, Name => 'Update', Label => $id eq 'new'? loc('Create'): loc('Save Changes') &>
@@ -297,8 +297,12 @@ jQuery( function() {
 </form>
 
 % if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType && !$CustomFieldObj->IsExternalValues ) {
-<div class="add_custom_field_value">
-<& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
+<div class="mx-auto max-width-lg">
+  <&| /Widgets/TitleBox, title => 'Add Values', class => 'custom-field-info-add-values', content_class => 'mx-auto width-md' &>
+    <div class="add_custom_field_value">
+      <& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
+    </div>
+  </&>
 </div>
 % }
 % $m->callback(%ARGS, CallbackName => 'EndOfPage', CustomFieldObj => $CustomFieldObj);
diff --git a/share/html/Admin/Elements/AddCustomFieldValue b/share/html/Admin/Elements/AddCustomFieldValue
index 88685cfa7..4cdff62d7 100644
--- a/share/html/Admin/Elements/AddCustomFieldValue
+++ b/share/html/Admin/Elements/AddCustomFieldValue
@@ -45,25 +45,20 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-
-<div class="col-md-3 label">
-  <h3><&|/l&>Add Value</&></h3>
-</div>
-
 <div class="form-row">
-  <div class="col-md-3"></div>
-  <div class="col-md-9">
+  <div class="col-md-1"></div>
+  <div class="col-md-11">
 <form name="AddCustomFieldValue" action="Modify.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<% $CustomField->id %>" />
 
   <div class="form-row">
-    <div class="label col-md-2 text-left">
+    <div class="label col-md-1 text-left">
       <&|/l&>Sort</&>
     </div>
-    <div class="label col-md-2 text-left">
+    <div class="label col-md-3 text-left">
       <&|/l&>Name</&>
     </div>
-    <div class="label col-md-2 text-left">
+    <div class="label col-md-3 text-left">
       <&|/l&>Description</&>
     </div>
 % if ( $CustomField->Type ne 'Combobox' && $Categories ) {
@@ -75,13 +70,13 @@
 
 % my $paramtag = "CustomField-". $CustomField->Id ."-Value-new";
   <div class="form-row">
-    <div class="col-md-2 value">
+    <div class="col-md-1 value">
       <input class="form-control" type="text" size="3"  name="<% $paramtag %>-SortOrder" />
     </div>
-    <div class="col-md-2 value">
+    <div class="col-md-3 value">
       <input class="form-control" type="text" size="25" name="<% $paramtag %>-Name" />
     </div>
-    <div class="col-md-2 value">
+    <div class="col-md-3 value">
       <input class="form-control" type="text" size="45" name="<% $paramtag %>-Description" />
     </div>
 % if ( $CustomField->Type ne 'Combobox' && $Categories ) {
@@ -101,6 +96,7 @@
 % $m->callback(CallbackName => 'AfterCustomFieldValueInput', CustomFieldObj => $CustomField, ARGSRef => \%ARGS );
 </form>
 </div>
+</div>
 
 <script type="text/javascript">
 jQuery( function() {
diff --git a/share/html/Admin/Elements/EditCustomFieldValues b/share/html/Admin/Elements/EditCustomFieldValues
index 1bf65cb6a..e431e85ad 100644
--- a/share/html/Admin/Elements/EditCustomFieldValues
+++ b/share/html/Admin/Elements/EditCustomFieldValues
@@ -57,13 +57,13 @@
       <label class="custom-control-label" for="DeleteAll"></label>
     </div>
   </div>
-  <div class="label col-md-2 text-left">
+  <div class="label col-md-1 text-left">
     <&|/l&>Sort</&>
   </div>
-  <div class="label col-md-2 text-left">
+  <div class="label col-md-3 text-left">
     <&|/l&>Name</&>
   </div>
-  <div class="label col-md-2 text-left">
+  <div class="label col-md-3 text-left">
     <&|/l&>Description</&>
   </div>
 % if ( $CustomField->Type ne 'Combobox' && $Categories ) {
@@ -82,13 +82,13 @@
         <label class="custom-control-label" for="Delete-<% $paramtag %>"></label>
     </div>
   </div>
-  <div class="col-md-2 value">
+  <div class="col-md-1 value">
     <input class="form-control" type="text" size="3" name="<% $paramtag %>-SortOrder" value="<% $value->SortOrder %>" />
   </div>
-  <div class="col-md-2 value">
+  <div class="col-md-3 value">
     <input class="form-control" type="text" size="25" name="<% $paramtag %>-Name" value="<% $value->Name %>" />
   </div>
-  <div class="col-md-2 value">
+  <div class="col-md-3 value">
     <input class="form-control" type="text" size="45" name="<% $paramtag %>-Description" value="<% $value->Description || '' %>" />
   </div>
 % if ( $CustomField->Type ne 'Combobox' && $Categories ) {

commit 3e082e4b77b574df5945b27f3722dbb31b903a3b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Feb 14 05:24:37 2020 +0800

    Tweak admin template form so Content could be a bit wider
    
    Note that we intentionally don't use up 12 cols of "width-md" to get
    better left/right spacing.

diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index 62de6a939..ba1114571 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -45,30 +45,30 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, class => 'template-info-basics', content_class => 'mx-auto' &>
+<&| /Widgets/TitleBox, class => 'template-info-basics', content_class => 'mx-auto width-md' &>
 <div class="form-row">
-  <div class="col-md-3 label">
+  <div class="col-md-2 label">
     <&|/l&>Name</&>:
   </div>
-  <div class="col-md-9 value">
+  <div class="col-md-6 value">
     <input type="text" class="form-control" name="Name" value="<%$Name||''%>" size="80" />
   </div>
 </div>
 
 <div class="form-row">
-  <div class="col-md-3 label">
+  <div class="col-md-2 label">
     <&|/l&>Description</&>:
   </div>
-  <div class="col-md-9 value">
+  <div class="col-md-6 value">
     <input type="text" class="form-control" name="Description" value="<%$Description||''%>" size="80" />
   </div>
 </div>
 
 <div class="form-row">
-  <div class="col-md-3 label">
+  <div class="col-md-2 label">
     <&|/l&>Type</&>:
   </div>
-  <div class="col-md-9 value">
+  <div class="col-md-6 value">
     <div class="custom-control custom-radio">
       <input type="radio" name="Type" class="custom-control-input" id="Type-Perl" value="Perl" <% $Type eq "Perl" ? 'checked="checked"' : "" |n %>></input>
       <label class="custom-control-label" for="Type-Perl"><&|/l&>Perl</&></label><br />
@@ -81,10 +81,10 @@
 </div>
 
 <div class="form-row">
-  <div class="col-md-3 label">
+  <div class="col-md-2 label">
     <&|/l&>Content</&>:
   </div>
-  <div class="col-md-9 value">
+  <div class="col-md-8 value">
     <textarea name="Content" class="form-control" rows="25" cols="80" wrap="soft">
 <%$Content||''%></textarea>
   </div>

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


More information about the rt-commit mailing list