[Rt-commit] rtir branch, master, updated. 4.0.1rc1-119-g1ca5748a

[? sunnavy]

The branch, master has been updated
       via  1ca5748a421c1c3163bdf30e6844322adb4911b1 (commit)
       via  d005b460668c96af690d3c6d6ccbbd90efd35529 (commit)
       via  667bc232fe462c4b821a26b49ff97c050acf2110 (commit)
      from  133febb901da02f013c3c3729c13f3eb5b761437 (commit)

Summary of changes:
 html/RTIR/Create.html             | 15 ++-------------
 html/RTIR/Elements/SelectIncident |  9 ++-------
 2 files changed, 4 insertions(+), 20 deletions(-)

- Log -----------------------------------------------------------------
commit 667bc232fe462c4b821a26b49ff97c050acf2110
Author: michel <michel at bestpractical.com>
Date:   Tue Apr 14 18:58:26 2020 +0200

    On RTIR create page move Cc and AdminCc notes to tooltip like RT.

diff --git a/html/RTIR/Create.html b/html/RTIR/Create.html
index 78a7f648..9402083f 100644
--- a/html/RTIR/Create.html
+++ b/html/RTIR/Create.html
@@ -255,6 +255,7 @@
   <div class="form-row">
     <div class="label col-md-2">
       <&|/l&>Cc</&>:
+      <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people will receive future updates.</&>"></span>
     </div>
     <div class="value col-md-9">
       <& /Elements/EmailInput,
@@ -263,16 +264,10 @@
     </div>
   </div>
 
-  <div class="form-row">
-    <div class="label col-md-2"></div>
-    <div class="value col-md-9">
-      <i><&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)</&></i>
-    </div>
-  </div>
-
   <div class="form-row">
     <div class="label col-md-2">
       <&|/l&>Admin Cc</&>:
+      <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people will receive future updates.</&>"></span>
     </div>
     <div class="value col-md-9">
       <& /Elements/EmailInput,
@@ -280,12 +275,6 @@
       &>
     </div>
   </div>
-  <div class="form-row">
-    <div class="label col-md-2"></div>
-    <div class="value col-md-9">
-      <i><&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)</&></i>
-    </div>
-  </div>
 
 % my $roles = $QueueObj->CustomRoles;
 % $roles->LimitToMultipleValue;

commit d005b460668c96af690d3c6d6ccbbd90efd35529
Author: michel <michel at bestpractical.com>
Date:   Tue Apr 14 19:04:20 2020 +0200

    Move Incident select help text to tooltip.

diff --git a/html/RTIR/Elements/SelectIncident b/html/RTIR/Elements/SelectIncident
index 7dac40ec..9e1b6d51 100644
--- a/html/RTIR/Elements/SelectIncident
+++ b/html/RTIR/Elements/SelectIncident
@@ -48,6 +48,8 @@
   <div class="form-row">
     <div class="label col-md-3">
       <&|/l&>Incident</&>:
+      <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<&|/l&>Id of an Incident to link a new ticket to</&>.
+      <% $config->{'Required'} ? loc('Required') : loc('Optional') %>."></span>
     </div>
     <div class="value col-md-9">
       <div class="form-row">
@@ -85,13 +87,6 @@ jQuery(function(){ jQuery('input[type="radio"][name="<% $Name %>"]').uncheckable
     </div>
   </div>
 
-  <div class="form-row">
-    <div class="label col-md-3"></div>
-    <div class="value col-md-9">
-      (<&|/l&>Id of an Incident to link a new ticket to</&>.
-      <% $config->{'Required'}? '<strong>'.loc('Required').'</strong>': loc('Optional') |n %>.)
-    </div>
-  </div>
 <%ARGS>
 $Type
 $Name     => 'Incident'

commit 1ca5748a421c1c3163bdf30e6844322adb4911b1
Merge: 133febb9 d005b460
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 21 05:15:41 2020 +0800

    Merge branch '5.0/rtir-create-tooltips'


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