[Rt-commit] rt branch, 5.0.0-releng, updated. rt-5.0.0beta2-20-g0c31651be3
? sunnavy
sunnavy at bestpractical.com
Mon Jul 6 15:51:53 EDT 2020
The branch, 5.0.0-releng has been updated
via 0c31651be36f68148c1235b7ba46551b6aaa0572 (commit)
via 014126831b1e4dff1558e03c25c079c63693f56f (commit)
via c99c2fb54bf915faa2c36a9891e38ddca4d3cdf3 (commit)
from 2a575ca73920c747a658c4a68cd529a9b7b936c1 (commit)
Summary of changes:
share/html/Articles/Article/Elements/EditCustomFields | 2 +-
share/html/Elements/EditCustomFields | 8 +++++---
share/html/SelfService/Create.html | 4 ++++
share/html/Ticket/Elements/EditTransactionCustomFields | 2 +-
share/static/css/elevator-light/misc.css | 5 -----
share/static/css/elevator-light/ticket-form.css | 5 -----
share/static/css/elevator-light/ticket-forms.css | 5 -----
share/static/css/mobile.css | 4 ++--
8 files changed, 13 insertions(+), 22 deletions(-)
- Log -----------------------------------------------------------------
commit c99c2fb54bf915faa2c36a9891e38ddca4d3cdf3
Author: Aaron Trevena <ast at bestpractical.com>
Date: Wed Jul 1 12:37:45 2020 +0100
Fix alignment of custom fields in selfservice
Custom fields on ticket create page in SelfService are listed right
under Subject row, of which the label/value cols are 2/8 instead of 3/9.
diff --git a/share/html/Elements/EditCustomFields b/share/html/Elements/EditCustomFields
index b232dfb3af..7a0ba1f27a 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-<% $LabelCols %>">
+ <% $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-<% $ValueCols %>">
% my $default = $m->notes('Field-' . $CustomField->Id);
% $default ||= $ARGS{"CustomField-". $CustomField->Id };
<& /Elements/EditCustomField,
@@ -113,6 +113,8 @@ $Object
$CustomFields => undef
$Grouping => undef
$InTable => 0
+$LabelCols => 3
+$ValueCols => 9
$ShowHints => 1
$ForCreation => 0
</%ARGS>
diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 86f5e90fdb..ac480ffae2 100644
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -91,14 +91,18 @@
<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,
+ LabelCols => 2,
+ ValueCols => 8,
&>
</div>
+</div>
<div class="form-group">
<& /Elements/MessageBox, Default => $ARGS{Content} || '' &>
</div>
commit 014126831b1e4dff1558e03c25c079c63693f56f
Author: Aaron Trevena <ast at bestpractical.com>
Date: Fri Jul 3 15:04:54 2020 +0100
Drop obsolete cflabel style from custom field forms
diff --git a/share/html/Articles/Article/Elements/EditCustomFields b/share/html/Articles/Article/Elements/EditCustomFields
index 10161c66b1..5582623a84 100644
--- a/share/html/Articles/Article/Elements/EditCustomFields
+++ b/share/html/Articles/Article/Elements/EditCustomFields
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
% while (my $CustomField = $CustomFields->Next()) {
<div class="form-row">
- <div class="cflabel label col-3">
+ <div class="label col-3">
<span class="name"><%$CustomField->Name%>:</span>
% if ( $CustomField->EntryHint ) {
<span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $CustomField->EntryHint %>"></span>
diff --git a/share/html/Elements/EditCustomFields b/share/html/Elements/EditCustomFields
index 7a0ba1f27a..97dd8aa4f5 100644
--- a/share/html/Elements/EditCustomFields
+++ b/share/html/Elements/EditCustomFields
@@ -55,7 +55,7 @@
% my $Type = $CustomField->Type || 'Unknown';
<div class="form-row edit-custom-field cftype-<% $Type %>">
- <div class="cflabel label col-<% $LabelCols %>">
+ <div class="label col-<% $LabelCols %>">
<% $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>
diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index fc87792f54..c5d6886259 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -53,7 +53,7 @@
% while (my $CF = $CustomFields->Next()) {
% next unless $CF->CurrentUserHasRight('ModifyCustomField');
<div class="form-row">
-<div class="label cflabel col-3">
+<div class="label col-3">
<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>
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index f37e36834f..0a8235f95a 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -28,11 +28,6 @@ hr.clear {
font-size: 1px;
}
-/* Custom fields */
-
-.cflabel .name { font-weight: bold; }
-.cflabel .type { font-style: italic; }
-
.query-stacktrace-toggle {
float: right;
}
diff --git a/share/static/css/elevator-light/ticket-form.css b/share/static/css/elevator-light/ticket-form.css
index bf1342567b..c2ceb12a2e 100644
--- a/share/static/css/elevator-light/ticket-form.css
+++ b/share/static/css/elevator-light/ticket-form.css
@@ -1,8 +1,3 @@
-#ticket-create-metadata .cflabel .name,
-#ticket-update-metadata .cflabel .name {
- font-weight: normal;
-}
-
.messagedetails input[type="text"],
.messagedetails input[type="email"] {
-webkit-box-sizing: border-box;
diff --git a/share/static/css/elevator-light/ticket-forms.css b/share/static/css/elevator-light/ticket-forms.css
index aa528e6edc..7fe08bd151 100644
--- a/share/static/css/elevator-light/ticket-forms.css
+++ b/share/static/css/elevator-light/ticket-forms.css
@@ -1,8 +1,3 @@
-#ticket-create-metadata .cflabel .name,
-#ticket-update-metadata .cflabel .name {
- font-weight: inherit
-}
-
/* right align with the button in the outer div: */
.sidebyside #ticket-create-message .button[name="AddMoreAttach"],
.sidebyside #ticket-update-message .button[name="AddMoreAttach"] {
diff --git a/share/static/css/mobile.css b/share/static/css/mobile.css
index 831e67186f..78f5d06c89 100644
--- a/share/static/css/mobile.css
+++ b/share/static/css/mobile.css
@@ -106,7 +106,7 @@ hr.clear {
}
-.label, .labeltop, .cflabel {
+.label, .labeltop {
font-weight: normal;
}
.value {
@@ -408,7 +408,7 @@ div.txn-content {
}
-.label, .cflabel {
+.label {
text-align: left;
width: 10em;
color: #666;
commit 0c31651be36f68148c1235b7ba46551b6aaa0572
Merge: 2a575ca739 014126831b
Author: sunnavy <sunnavy at bestpractical.com>
Date: Tue Jul 7 03:48:49 2020 +0800
Merge branch '5.0/fix-selfservice-custom-field-layout' into 5.0.0-releng
-----------------------------------------------------------------------
More information about the rt-commit
mailing list