[Rt-commit] rt branch, 4.6/cc-helper-text-tooltip, updated. rt-4.4.4-533-g7adb724351

? sunnavy sunnavy at bestpractical.com
Fri Nov 15 10:24:59 EST 2019


The branch, 4.6/cc-helper-text-tooltip has been updated
       via  7adb72435176c4c5ba30aa40f01160744d515c66 (commit)
       via  d7b1b3c8fb713f46a1f275852aa92c3d4dcb57e9 (commit)
      from  bf15f470523c14c4140997ffe8c80f302aa8028e (commit)

Summary of changes:
 share/html/Admin/Queues/Modify.html                    |  4 +++-
 share/html/Articles/Article/Elements/EditCustomFields  |  4 +++-
 share/html/Elements/EditCustomFields                   |  2 ++
 share/html/Ticket/Create.html                          | 15 ++++-----------
 share/html/Ticket/Elements/EditTransactionCustomFields |  2 ++
 5 files changed, 14 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit d7b1b3c8fb713f46a1f275852aa92c3d4dcb57e9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Nov 15 23:11:33 2019 +0800

    No need to show hint icon if cf doesn't have hints

diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 27e68807be..7118912105 100644
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -151,7 +151,9 @@
   <div class="form-row">
     <div class="col-md-3 label">
       <% $CF->Name %>:
-      <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<%$CF->EntryHint %>"></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="col-md-9 value">
       <& /Elements/EditCustomField, CustomField => $CF,
diff --git a/share/html/Articles/Article/Elements/EditCustomFields b/share/html/Articles/Article/Elements/EditCustomFields
index d50242d47a..a0a89e7707 100644
--- a/share/html/Articles/Article/Elements/EditCustomFields
+++ b/share/html/Articles/Article/Elements/EditCustomFields
@@ -49,7 +49,9 @@
 <div class="form-row">
   <div class="cflabel label col-md-3">
     <span class="name"><%$CustomField->Name%>:</span>
-    <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<%$CustomField->EntryHint %>"></span>
+% 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="col-md-9 value entry">
     <& /Elements/EditCustomField, 
diff --git a/share/html/Elements/EditCustomFields b/share/html/Elements/EditCustomFields
index 2442ab8cc2..8e5df93250 100644
--- a/share/html/Elements/EditCustomFields
+++ b/share/html/Elements/EditCustomFields
@@ -57,7 +57,9 @@
   <div class="form-row edit-custom-field cftype-<% $Type %>">
     <div class="cflabel label col-md-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>
+% }
     </div>
     <div class="value col-md-9">
 % my $default = $m->notes('Field-' . $CustomField->Id);
diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index fa3a4a9dbb..14eace229d 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -55,7 +55,9 @@
 <div class="form-row">
 <div class="label cflabel col-md-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>
+% }
 </div>
 <div class="value col-md-9">
 <& /Elements/EditCustomField,

commit 7adb72435176c4c5ba30aa40f01160744d515c66
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Nov 15 23:12:24 2019 +0800

    Replace custom role hints with tooltips

diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index ec5e287b9a..2be9d97c78 100644
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -177,21 +177,14 @@
 % $m->callback( CallbackName => 'ModifyCustomRoles', ARGSRef => \%ARGS, CustomRoles => $roles );
 % while (my $role = $roles->Next) {
 <div class="form-row">
-<div class="form-group label col-md-2"><% $role->Name %>:</div>
-<div class="form-group value col-md-9"><& /Elements/EmailInput, Name => $role->GroupType, Size => undef, Default => $ARGS{$role->GroupType}, AutocompleteMultiple => 1 &></div>
-</div>
-
+  <div class="form-group label col-md-2"><% $role->Name %>:
 % if ($role->EntryHint) {
-<div class="form-row">
-  <div class="form-group label col-md-2 empty"> </div>
-  <div class="form-group value col-md-9 comment" colspan="5">
-    <i><font size="-2">
-      <% $role->EntryHint %>
-    </font></i>
+    <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% $role->EntryHint %>"></span>
+% }
   </div>
+  <div class="form-group value col-md-9"><& /Elements/EmailInput, Name => $role->GroupType, Size => undef, Default => $ARGS{$role->GroupType}, AutocompleteMultiple => 1 &></div>
 </div>
 % }
-% }
 
 <& /Elements/EditCustomFields,
     %ARGS,

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


More information about the rt-commit mailing list