[Rt-commit] rtir branch 5.0/consistent-form-row-space-for-rtir created. 5.0.3-14-g145b2329
BPS Git Server
git at git.bestpractical.com
Fri Apr 14 17:09:41 UTC 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rtir".
The branch, 5.0/consistent-form-row-space-for-rtir has been created
at 145b2329f58f00b8085c9621921b01b28b6285e8 (commit)
- Log -----------------------------------------------------------------
commit 145b2329f58f00b8085c9621921b01b28b6285e8
Author: Ronaldo Richieri <ronaldo at bestpractical.com>
Date: Fri Apr 14 11:20:27 2023 -0300
Use consistent space among input rows for ticket forms
Previously we used a few .form-group(margin-bottom: 1rem), which wasn't
consistent with other inputs that use .form-row(margin-top: 0.5rem).
.form-group worked better with previous role inputs as they had extra
bottom space too, but as role inputs' extra space has been removed in
010f50f730 of RT, .form-group is not needed any more in these forms.
Also added FullWidth argument to MessageBox and AddAttachments elements
call for respecting the new div classes used for keeping the space
between rows.
diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index 6fee221c..407a753d 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -306,10 +306,10 @@
% }
<div class="form-row">
- <div class="form-group label col-2">
+ <div class="label col-2">
<&|/l&>Subject</&>:
</div>
- <div class="form-group value col-9">
+ <div class="value col-9">
<input class="form-control" type="text" name="Subject" value="<% $Subject || '' %>" />
</div>
</div>
@@ -323,7 +323,6 @@
</div>
% }
- <div class="form-group">
<%perl>
my $include_signature = 1;
unless (exists $ARGS{Content}) {
@@ -358,13 +357,14 @@
% }
% $m->callback( %ARGS, CallbackPage => '/Ticket/Create.html', CallbackName => 'BeforeMessageBox' );
% if ( $ARGS{Content} ) {
-<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => $include_signature &>
+<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => $include_signature,
+ FullWidth => 1 &>
% } else {
-<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction &>
+<& /Elements/MessageBox, QuoteTransaction => $QuoteTransaction,
+ FullWidth => 1 &>
% }
- </div>
- <& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
+ <& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj, FullWidth => 1 &>
</&>
diff --git a/html/RTIR/Elements/UpdateData b/html/RTIR/Elements/UpdateData
index e6b2c904..7191b9b3 100644
--- a/html/RTIR/Elements/UpdateData
+++ b/html/RTIR/Elements/UpdateData
@@ -69,19 +69,20 @@
% }
<& /Articles/Elements/BeforeMessageBox, %ARGS &>
-<div class="form-group">
<div class="messagebox-container action-<% $type %>">
% $m->callback( %ARGS, CallbackPage => '/Ticket/Update.html', CallbackName => 'BeforeMessageBox' );
% if ( exists $ARGS{'UpdateContent'} ) {
% delete $ARGS{'QuoteTransaction'};
-<& /Elements/MessageBox, Name => "UpdateContent", Default => $ARGS{'UpdateContent'}, IncludeSignature => 0, %ARGS &>
+<& /Elements/MessageBox, Name => "UpdateContent", Default => $ARGS{'UpdateContent'}, IncludeSignature => 0,
+ FullWidth => 1, %ARGS &>
% } else {
-<& /Elements/MessageBox, Name => "UpdateContent", %ARGS &>
+<& /Elements/MessageBox, Name => "UpdateContent",
+ FullWidth => 1, %ARGS &>
% }
</div>
-</div>
-<& /Ticket/Elements/AddAttachments, %ARGS &>
+<& /Ticket/Elements/AddAttachments,
+ FullWidth => 1, %ARGS &>
<%INIT>
my $type = $ARGS{'UpdateType'} ? $ARGS{'UpdateType'} :
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index d302a965..9b4d58e3 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -212,10 +212,10 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
<&| /Widgets/TitleBox, title => $Title, class => 'ticket-info-message' &>
<div class="form-row">
- <div class="form-group label col-2">
+ <div class="label col-2">
<&|/l&>Subject</&>:
</div>
- <div class="form-group value col-9">
+ <div class="value col-9">
<input class="form-control" type="text" name="Subject" value="<% $ARGS{'Subject'} || '' %>" />
</div>
</div>
@@ -231,14 +231,13 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
</div>
% }
- <div class="form-group">
<& /Elements/MessageBox,
Default => $ARGS{'Content'},
IncludeSignature => 0,
+ FullWidth => 1,
&>
- </div>
-<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj &>
+<& /Ticket/Elements/AddAttachments, %ARGS, QueueObj => $QueueObj, FullWidth => 1 &>
</&>
diff --git a/html/RTIR/Investigation/Elements/Create b/html/RTIR/Investigation/Elements/Create
index 855c6305..6a13ffc9 100644
--- a/html/RTIR/Investigation/Elements/Create
+++ b/html/RTIR/Investigation/Elements/Create
@@ -230,10 +230,10 @@
% unless ( $SkipField{'Subject'} || $HideField{'Subject'} ) {
<div class="form-row">
- <div class="form-group label col-2">
+ <div class="label col-2">
<&|/l&>Subject</&>:
</div>
- <div class="form-group value col-9">
+ <div class="value col-9">
<input class="form-control" type="text" name="<% $NamePrefix %>Subject" value="<% $value_cb->('Subject') %>" />
</div>
</div>
@@ -266,7 +266,6 @@
% }
% unless ( $SkipField{'Content'} || $HideField{'Content'} ) {
-<div class="form-group">
% if ( RT->Config->Get('ArticleOnTicketCreate')) {
<& /Articles/Elements/BeforeMessageBox,
%ARGS,
@@ -282,8 +281,8 @@
Default => $content,
IncludeSignature => exists $ARGS{'IncludeSignature'} ? $ARGS{'IncludeSignature'} : !$content,
QuoteTransaction => $value_cb->('QuoteTransaction'),
+ FullWidth => 1,
&>
-</div>
% }
% unless ( $SkipField{'Attachments'} ) {
diff --git a/html/RTIR/Tools/ScriptedAction.html b/html/RTIR/Tools/ScriptedAction.html
index 787cbe84..5abeb9a2 100644
--- a/html/RTIR/Tools/ScriptedAction.html
+++ b/html/RTIR/Tools/ScriptedAction.html
@@ -154,7 +154,7 @@
</div>
% if (!$incidentid) {
-<div class="form-group">
+<div>
<& /RTIR/Incident/Elements/Create, Title => $Title, QueueObj => $incidentq, %ARGS &>
</div>
@@ -169,13 +169,11 @@
</div>
% }
- <div class="form-group">
% if (exists $ARGS{Content}) {
-<& /Elements/MessageBox, Name=>"Content", Default=>$ARGS{Content}, %ARGS&>
+<& /Elements/MessageBox, Name=>"Content", Default=>$ARGS{Content}, FullWidth => 1, %ARGS&>
% } else {
-<& /Elements/MessageBox, Name=>"Content", %ARGS &>
+<& /Elements/MessageBox, Name=>"Content", FullWidth => 1, %ARGS &>
% }
- </div>
</&>
-----------------------------------------------------------------------
hooks/post-receive
--
rtir
More information about the rt-commit
mailing list