[Rt-commit] rt branch, 5.0/center-comment-reply-on-bulk-update-page, created. rt-5.0.0-6-g3082df4ab4
Blaine Motsinger
blaine at bestpractical.com
Wed Nov 4 10:50:44 EST 2020
The branch, 5.0/center-comment-reply-on-bulk-update-page has been created
at 3082df4ab4c6048d0f594af4d5dc4a18dabb87bc (commit)
- Log -----------------------------------------------------------------
commit cce358ac930720d56ce44586463071b17ab8e75d
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue Nov 3 16:55:47 2020 -0600
Center comment/reply messagebox on bulk update
This commit centers the messagebox on the bulk update page to match
the layout of the Ticket/Update page.
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index 491eb12e1d..335678a1eb 100644
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -290,7 +290,7 @@
</&>
<&| /Widgets/TitleBox, title => loc('Add comments or replies to selected tickets') &>
<div class="form-row">
- <div class="label col-3">
+ <div class="form-group label col-2">
<&|/l&>Update Type</&>:
</div>
<div class="value col-9">
@@ -302,7 +302,7 @@
</div>
<div class="form-row">
- <div class="label col-3">
+ <div class="form-group label col-2">
<&|/l&>Subject</&>:
</div>
<div class="value col-9">
@@ -314,7 +314,7 @@
% $m->callback( CallbackName => 'BeforeTransactionCustomFields', CustomFields => $TxnCFs );
% while (my $CF = $TxnCFs->Next()) {
<div class="form-row">
- <div class="label col-3">
+ <div class="label col-2">
<% $CF->Name %>:
</div>
<div class="value col-9">
@@ -326,11 +326,8 @@
</div>
% } # end if while
- <div class="form-row">
- <div class="label col-3">
- <&|/l&>Message</&>:
- </div>
- <div class="value col-9 messagebox-container action-<% $ARGS{UpdateType} || 'private' %>">
+ <div class="form-group">
+ <div class="messagebox-container action-<% $ARGS{UpdateType} || 'private' %>">
%# Currently, bulk update always starts with Comment not Reply selected, so we check this unconditionally
% my $IncludeSignature = RT->Config->Get('MessageBoxIncludeSignatureOnComment');
<& /Elements/MessageBox, Name => "UpdateContent",
@@ -341,13 +338,7 @@
</div>
% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
- <div class="form-row">
- <div class="label col-3"></div>
- <div class="col-9">
- <& /Ticket/Elements/AddAttachments, %ARGS &>
- </div>
- </div>
-
+ <& /Ticket/Elements/AddAttachments, %ARGS &>
</&>
<%perl>
commit 214b40d113dcf07c37b42c44be9c154e31af1577
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue Nov 3 17:20:17 2020 -0600
Replace cf hints with tooltips on bulk update
This commit replaces the custom field hints with tooltips on the
bulk update page.
diff --git a/share/html/Elements/BulkCustomFields b/share/html/Elements/BulkCustomFields
index 02beed3ff1..21ade01c55 100644
--- a/share/html/Elements/BulkCustomFields
+++ b/share/html/Elements/BulkCustomFields
@@ -62,12 +62,10 @@
% while (my $cf = $CustomFields->Next) {
<div class="form-row <% ++$i%2 ? 'oddline': 'evenline' %>">
<div class="label col-4 text-left">
- <div class="form-row">
- <% $cf->Name %>
- </div>
- <div class="form-row">
- <em>(<% $cf->EntryHint // '' %>)</em>
- </div>
+ <span class="name"><% $cf->Name %>:</span>
+% if ( $cf->EntryHint ) {
+ <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $cf->EntryHint %>"></span>
+% }
</div>
% my $rows = 5;
% my $cf_id = $cf->id;
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index 335678a1eb..5b37f57803 100644
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -315,13 +315,16 @@
% while (my $CF = $TxnCFs->Next()) {
<div class="form-row">
<div class="label col-2">
- <% $CF->Name %>:
+ <span class="name"><% $CF->Name %>:</span>
+% if ( $CF->EntryHint ) {
+ <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CF->EntryHint %>"></span>
+% }
</div>
<div class="value col-9">
<& /Elements/EditCustomField,
CustomField => $CF,
Object => RT::Transaction->new( $session{'CurrentUser'} ),
- &><em><% $CF->EntryHint // '' %></em>
+ &>
</div>
</div>
% } # end if while
commit 3e0c7bf9ca857fa7005b7b8372eba77055e4771e
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue Nov 3 17:25:14 2020 -0600
Fix BeforeMessageBox callback location
The BeforeMessageBox callback on the bulk update page was
incorrectly moved below the messagebox in commit 547407b.
This commit moves it back to it's correct location.
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index 5b37f57803..17251c6ad4 100644
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -331,6 +331,7 @@
<div class="form-group">
<div class="messagebox-container action-<% $ARGS{UpdateType} || 'private' %>">
+% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
%# Currently, bulk update always starts with Comment not Reply selected, so we check this unconditionally
% my $IncludeSignature = RT->Config->Get('MessageBoxIncludeSignatureOnComment');
<& /Elements/MessageBox, Name => "UpdateContent",
@@ -339,7 +340,6 @@
&>
</div>
</div>
-% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
<& /Ticket/Elements/AddAttachments, %ARGS &>
</&>
commit 3082df4ab4c6048d0f594af4d5dc4a18dabb87bc
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue Nov 3 18:21:09 2020 -0600
Fix padding for custom field inputs on bulk update
diff --git a/share/html/Elements/BulkCustomFields b/share/html/Elements/BulkCustomFields
index 21ade01c55..670a7c21c7 100644
--- a/share/html/Elements/BulkCustomFields
+++ b/share/html/Elements/BulkCustomFields
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<div class="bulk-edit-custom-fields">
- <div class="form-row">
+ <div class="form-row col-12">
<div class="label col-4 text-left">
<&|/l&>Name</&>
</div>
@@ -60,7 +60,7 @@
</div>
% my $i = 0;
% while (my $cf = $CustomFields->Next) {
- <div class="form-row <% ++$i%2 ? 'oddline': 'evenline' %>">
+ <div class="form-row col-12 pb-2 pt-2 <% ++$i%2 ? 'oddline': 'evenline' %>">
<div class="label col-4 text-left">
<span class="name"><% $cf->Name %>:</span>
% if ( $cf->EntryHint ) {
diff --git a/share/html/Search/Bulk.html b/share/html/Search/Bulk.html
index 17251c6ad4..aae57a0e51 100644
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@ -314,7 +314,7 @@
% $m->callback( CallbackName => 'BeforeTransactionCustomFields', CustomFields => $TxnCFs );
% while (my $CF = $TxnCFs->Next()) {
<div class="form-row">
- <div class="label col-2">
+ <div class="form-group label col-2">
<span class="name"><% $CF->Name %>:</span>
% if ( $CF->EntryHint ) {
<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CF->EntryHint %>"></span>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list