[Rt-commit] rtir branch, master, updated. 4.0.1rc1-195-g02cc7b82

? sunnavy sunnavy at bestpractical.com
Tue Jun 9 13:33:00 EDT 2020


The branch, master has been updated
       via  02cc7b826585fa8cc6eb844df497d9cf1b6235d1 (commit)
       via  22569b13bd40398eab20fa0a0314155af61edc3f (commit)
      from  35b379813838da7b050370ff7e7302bfdfa573f1 (commit)

Summary of changes:
 html/RTIR/Tools/ScriptedAction.html | 168 ++++++++++++++++++++----------------
 1 file changed, 93 insertions(+), 75 deletions(-)

- Log -----------------------------------------------------------------
commit 22569b13bd40398eab20fa0a0314155af61edc3f
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Jun 8 19:21:22 2020 -0500

    Migrate Tools/ScriptedAction.html to elevator themes

diff --git a/html/RTIR/Tools/ScriptedAction.html b/html/RTIR/Tools/ScriptedAction.html
index 1eccc509..2bdaec09 100644
--- a/html/RTIR/Tools/ScriptedAction.html
+++ b/html/RTIR/Tools/ScriptedAction.html
@@ -49,7 +49,7 @@
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@finalresults &>
 
-<form method="get" action="ScriptedAction.html" name="ScriptedAction" enctype="multipart/form-data">
+<form method="get" action="ScriptedAction.html" name="ScriptedAction" enctype="multipart/form-data" class="mx-auto max-width-lg">
 <input type="hidden" name="incidentid" value="<%$incidentid%>" />
 <input type="hidden" name="loop" value="<%$ARGS{'loop'}%>" />
 <input type="hidden" name="UpdateType" value="response" />
@@ -58,114 +58,132 @@
 <input type="hidden" name="id" value="new" />
 <input type="hidden" class="hidden" name="Token" value="<% $ARGS{'Token'} %>" />
 <input type="hidden" name="Status" value="<% $ARGS{Status} || '' %>" />
-<a name="top"></a>
-        
+
 % if ( $ARGS{'TestAddresses'} && keys %$addrhash ) {
 <&| /Widgets/TitleBox, contentbg => "#cccccc", 
     title => 'Address test results' &>
-<ul>
+  <ul class="list-group list-group-borderless">
 %   foreach my $key (keys %$addrhash) {
-  <li><%$addrhash->{$key}->{'IP'}%>: <%$addrhash->{$key}->{'Address'}%>
+    <li class="list-group-item"><%$addrhash->{$key}->{'IP'}%>: <%$addrhash->{$key}->{'Address'}%></li>
 %   }
-</ul>
+  </ul>
 </&>
-<br />
 % }
 
 <&| /Widgets/TitleBox, contentbg => "#cccccc", title => loc("Identify Recipients") &>
 
-<table border="0" cellpadding="0" cellspacing="2">
-% my $height = RT->Config->Get('MessageBoxHeight', $session{'CurrentUser'} ) || 15;
-% my $wrap   = RT->Config->Get('MessageBoxWrap', $session{'CurrentUser'} ) || 'SOFT';
 % if ($loop eq 'IP') {
-  <tr>
-    <td class="label">WHOIS:</td>
-    <td class="value">
-        <& Elements/SelectWhoisServer, Name => 'server', Default => $server &>
-    </td>
-  </tr>
-  <tr>
-    <td class="label"><&|/l&>Contact Field</&>:</td>
-    <td class="value"><input type="text" name="field" value="<% $ARGS{'field'} || '' %>" /></td>
-  </tr>
-  <tr>
-    <td class="label">
-      <&|/l&>IP Addresses</&>:<br /><small>arg: <i>_IP_</i></small>
-    </td>
-    <td class="value">
-        <textarea autocomplete="off" cols="30" rows="<% $height %>" wrap="<% $wrap %>" name="IPs" id="IPs"><% $ARGS{IPs} || '' %></textarea>
-    </td>
-  </tr>
+  <div class="form-row">
+    <div class="label col-3">
+      <&|/l&>WHOIS</&>:
+    </div>
+    <div class="value col-9">
+      <& Elements/SelectWhoisServer, Name => 'server', Default => $server &>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="label col-3">
+      <&|/l&>Contact Field</&>:
+    </div>
+    <div class="value col-9">
+      <input class="form-control" type="text" name="field" value="<% $ARGS{'field'} || '' %>" />
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="label col-3">
+      <&|/l&>IP Addresses</&>:
+      <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% loc('arg: [_1]', '_IP_') %>"></span>
+    </div>
+    <div class="value col-9">
+      <textarea class="form-control" name="IPs" id="IPs"><% $ARGS{IPs} || '' %></textarea>
+    </div>
+  </div>
+
 % } else {
-  <tr>
-    <td class="label"><&|/l&>Addresses</&>:<br /><small>arg: <i>_ADDR_</i></small></td>
-    <td class="value">
-        <textarea autocomplete="off" cols="30" rows="<% $height %>" wrap="<% $wrap %>" name="Addresses" id="Addresses"><% $ARGS{Addresses} || '' %></textarea>
-    </td>
-  </tr>
+  <div class="form-row">
+    <div class="label col-3">
+      <&|/l&>Addresses</&>:
+      <span class="far fa-question-circle icon-helper" data-toggle="tooltip" data-placement="top" data-original-title="<% loc('arg: [_1]', '_ADDR_') %>"></span>
+    </div>
+    <div class="value col-9">
+      <textarea class="form-control" name="Addresses" id="Addresses"><% $ARGS{Addresses} || '' %></textarea>
+    </div>
+  </div>
+
 % }
-<tr>
-  <td class="label"><&|/l&>Template</&>:</td>
-  <td class="value">
-    <& /Admin/Scrips/Elements/SelectTemplate, Default => $ARGS{'Template'} || 0, Queue => $investigationq &>
-  </td>
-</tr>
-<tr>
-  <td class="label"><&|/l&>Argument</&>:</td>
-  <td class="value">
-    <input type="text" name="TemplateArg" size="60" value="<% $ARGS{'TemplateArg'} || '' %>" />
-  </td>
-</tr>
-</table>
+  <div class="form-row">
+    <div class="label col-3">
+      <&|/l&>Template</&>:
+    </div>
+    <div class="value col-9">
+      <& /Admin/Scrips/Elements/SelectTemplate, Default => $ARGS{'Template'} || 0, Queue => $investigationq &>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="label col-3">
+      <&|/l&>Argument</&>:
+    </div>
+    <div class="value col-9">
+      <input class="form-control" type="text" name="TemplateArg" size="60" value="<% $ARGS{'TemplateArg'} || '' %>" />
+    </div>
+  </div>
 
 % if ($loop eq "IP") {
-<& /Elements/Submit, Name => "TestAddresses", Caption => loc("Test email addresses"), Label => loc("Test")&>
+  <div class="form-row">
+    <div class="col-12">
+      <& /Elements/Submit, Name => "TestAddresses", Caption => loc("Test email addresses"), Label => loc("Test")&>
+    </div>
+  </div>
+
 % }
-</&>
 
-<br />
+</&>
 
 <&| /Widgets/TitleBox, contentbg => "#cccccc", title => loc("Message information") &>
 
-<table border="0" cellpadding="0" cellspacing="2">
-  <tr>
-    <td class="label">
+  <div class="form-row">
+    <div class="label col-3">
       <&|/l&>Owner</&>:
-    </td>
-    <td>
-      <%$session{'CurrentUser'}->Name%>
-    </td>
-  </tr>
+    </div>
+    <div class="value col-9">
+      <span class="current-value form-control"><% $session{'CurrentUser'}->Name %></span>
+    </div>
+  </div>
 
 % if (!$incidentid) {
+<div class="form-group">
 <& /RTIR/Incident/Elements/Create, Title => $Title, QueueObj => $incidentq, %ARGS &>
+</div>
+
 % } else {
-  <tr>
-    <td class="label">
+  <div class="form-row">
+    <div class="label col-3">
       <&|/l&>Subject</&>:
-    </td>
-    <td>
-      <input type="text" size="60" name="Subject" value="<%$ARGS{'Subject'} || $Incident->Subject%>" />
-    </td>
-  </tr>
-% }
+    </div>
+    <div class="value col-9">
+      <input class="form-control" type="text" size="60" name="Subject" value="<%$ARGS{'Subject'} || $Incident->Subject%>" />
+    </div>
+  </div>
 
-<tr>
-  <td class="labeltop">
-    <&|/l&>Message</&>:
-  </td>
-  <td colspan="5">
+% }
+  <div class="form-group">
 % if (exists $ARGS{Content}) {
 <& /Elements/MessageBox, Name=>"Content", Default=>$ARGS{Content}, %ARGS&>
 % } else {
 <& /Elements/MessageBox, Name=>"Content", %ARGS &>
 % }
-  </td>
-</tr>
-</table>
+  </div>
 
 </&>
-<& /Elements/Submit, Name => "SubmitAction", Caption => loc("Create the Incidents and Investigations"), Label => loc("Create")&>
+
+  <div class="form-row">
+    <div class="col-12">
+      <& /Elements/Submit, Name => "SubmitAction", Caption => loc("Create the Incidents and Investigations"), Label => loc("Create") &>
+    </div>
+  </div>
 </form>
 
 <%INIT>

commit 02cc7b826585fa8cc6eb844df497d9cf1b6235d1
Merge: 35b37981 22569b13
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jun 10 01:28:59 2020 +0800

    Merge branch '5.0/convert-scriptedaction-to-elevator-themes'


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


More information about the rt-commit mailing list