[Rt-commit] rt branch, 4.6-theme-trunk, updated. rt-4.4.4-188-gb39118c00

? sunnavy sunnavy at bestpractical.com
Tue Apr 23 11:56:49 EDT 2019


The branch, 4.6-theme-trunk has been updated
       via  b39118c000ff29d1b64f001b279339d7a3db2ae5 (commit)
       via  71c8971a248b0fcb186e9e95b006b5b1588e5c80 (commit)
       via  ef2c1e2f413f777ef06b252da7fb18bb4b71c9f5 (commit)
       via  d38e146cd8bc0fb4eacff97881d2067ba9b71246 (commit)
       via  5cca4857d17e52dca02221a0171387f6e80f6489 (commit)
      from  52f571e24ba918a9e5089ad4fd064eef6aa40948 (commit)

Summary of changes:
 share/html/Admin/Elements/SelectScripAction     |  2 +-
 share/html/Admin/Elements/SelectScripCondition  |  2 +-
 share/html/Admin/Elements/SelectStage           |  2 +-
 share/html/Admin/Elements/SelectStageForAdded   |  2 +
 share/html/Admin/Scrips/Create.html             | 45 +++++++++++++++--------
 share/html/Admin/Scrips/Elements/EditBasics     | 49 ++++++++++++++++---------
 share/html/Admin/Scrips/Elements/EditCustomCode | 21 +++++++----
 share/html/Admin/Scrips/Elements/SelectTemplate |  2 +-
 share/html/Admin/Scrips/Modify.html             | 41 +++++++++++++++------
 share/html/Admin/Scrips/Objects.html            | 34 ++++++++++++-----
 share/html/Admin/Scrips/index.html              | 19 ++++++++--
 11 files changed, 150 insertions(+), 69 deletions(-)

- Log -----------------------------------------------------------------
commit 5cca4857d17e52dca02221a0171387f6e80f6489
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Apr 22 12:19:56 2019 -0500

    Migrate Admin/Scrips/index to elevator themes

diff --git a/share/html/Admin/Scrips/index.html b/share/html/Admin/Scrips/index.html
index 39cfb097a..3bd5515db 100644
--- a/share/html/Admin/Scrips/index.html
+++ b/share/html/Admin/Scrips/index.html
@@ -51,9 +51,22 @@
 <h1><%$caption%></h1>
 
 <form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Scrips/index.html">
-<input type="checkbox" class="checkbox" id="FindDisabledScrips" name="FindDisabledScrips" value="1" <% $FindDisabledScrips ? 'checked="checked"': '' |n%> />
-<label for="FindDisabledScrips"><&|/l&>Include disabled scrips in listing.</&></label>
-<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" id="FindDisabledScrips" name="FindDisabledScrips" value="1" <% $FindDisabledScrips ? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="FindDisabledScrips"><&|/l&>Include disabled scrips in listing.</&></label>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-row">
+    <div class="col-md-12">
+      <div align="right">
+        <input type="submit" class="form-control btn btn-primary" value="<&|/l&>Go!</&>" />
+      </div>
+    </div>
+  </div>
 </form>
 
 <& /Elements/CollectionList,

commit d38e146cd8bc0fb4eacff97881d2067ba9b71246
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Apr 22 13:07:39 2019 -0500

    Migrate Admin/Scrips/Create to elevator themes

diff --git a/share/html/Admin/Elements/SelectScripAction b/share/html/Admin/Elements/SelectScripAction
index 92902f279..c7c3b12b2 100644
--- a/share/html/Admin/Elements/SelectScripAction
+++ b/share/html/Admin/Elements/SelectScripAction
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<select name="<%$Name%>">
+<select name="<%$Name%>" class="form-control selectpicker">
 <option value="" 
 <% ! defined $Default && qq[ selected="selected"] |n %>
 >-</option>
diff --git a/share/html/Admin/Elements/SelectScripCondition b/share/html/Admin/Elements/SelectScripCondition
index 7e59ffb88..6a8f2e413 100644
--- a/share/html/Admin/Elements/SelectScripCondition
+++ b/share/html/Admin/Elements/SelectScripCondition
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<select name="<%$Name%>">
+<select name="<%$Name%>" class="form-control selectpicker">
 <option value="" 
 <% ! defined $Default && qq[ selected="selected"] %>
 >-</option>
diff --git a/share/html/Admin/Elements/SelectStage b/share/html/Admin/Elements/SelectStage
index dc5715740..10ffd97ab 100644
--- a/share/html/Admin/Elements/SelectStage
+++ b/share/html/Admin/Elements/SelectStage
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<select name="<%$Name%>">
+<select name="<%$Name%>" class="form-control selectpicker">
 % foreach my $value (@stages) {
 <option value="<%$value%>"
 <% ($value eq $Default) && qq[ selected="selected"] |n %>
diff --git a/share/html/Admin/Scrips/Create.html b/share/html/Admin/Scrips/Create.html
index 6aca459e1..bc83f3bd1 100644
--- a/share/html/Admin/Scrips/Create.html
+++ b/share/html/Admin/Scrips/Create.html
@@ -54,33 +54,46 @@
 <input type="hidden" class="hidden" name="Global" value="<% $Global || q{} %>" />
 
 <&| /Widgets/TitleBox, title => loc('Basics') &>
-<table>
 
 <& Elements/EditBasics, %ARGS, Scrip => $scrip, Queue => $queue_obj &>
 
-<tr><td class="label"><&|/l&>Stage</&>:</td><td class="value">\
-<& /Admin/Elements/SelectStage, Default => $ARGS{"Stage"} &></td></tr>
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <&|/l&>Stage</&>:
+    </div>
+    <div class="col-md-9 value">
+      <& /Admin/Elements/SelectStage, Default => $ARGS{"Stage"} &>
+    </div>
+  </div>
 
-<tr><td class="label"> </td><td>
 <input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" name="Enabled" value="1" <% $ARGS{'Enabled'}? 'checked="checked"': '' |n%> />
-<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this scrip)</&></label>
-</td></tr>
 
-</table>
+  <div class="form-row">
+    <div class="col-md-3 label">
+    </div>
+    <div class="col-md-9 value">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" name="Enabled" id="Enabled" value="1" <% $ARGS{'Enabled'}? 'checked="checked"': '' |n%> />
+        <label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this scrip)</&></label>
+      </div>
+    </div>
+  </div>
+
 </&>
 
-<& /Elements/Submit,
-    Label => loc('Create'),
-    Name => 'Create',
-&>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Create'), Name => 'Create' &>
+    </div>
+  </div>
 
 % if ($session{CurrentUser}->HasRight(Object => $RT::System, Right => 'ExecuteCode')) {
 <& Elements/EditCustomCode, %ARGS, Scrip => $scrip &>
-<& /Elements/Submit,
-    Label => loc('Create'),
-    Name => 'Create',
-&>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Create'), Name => 'Create' &>
+    </div>
+  </div>
 % }
 
 </form>
diff --git a/share/html/Admin/Scrips/Elements/EditBasics b/share/html/Admin/Scrips/Elements/EditBasics
index 09c4862be..b5a3f8e85 100644
--- a/share/html/Admin/Scrips/Elements/EditBasics
+++ b/share/html/Admin/Scrips/Elements/EditBasics
@@ -45,26 +45,41 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<tr><td class="label"><&|/l&>Description</&>:</td><td class="value">\
-<input type="text" name="Description" \
-    size="60" \
-    value="<% $ARGS{"Description"} || $Scrip->Description || '' %>" />
-</td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Description</&>:
+  </div>
+  <div class="col-md-9 value">
+    <input type="text" class="form-control" name="Description" size="60" value="<% $ARGS{"Description"} || $Scrip->Description || '' %>" />
+  </div>
+</div>
 
-<tr><td class="label"><&|/l&>Condition</&>:</td><td class="value">\
-<& /Admin/Elements/SelectScripCondition,
-    Default => $ARGS{"ScripCondition"} || $Scrip->ConditionObj->Id,
-&></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Condition</&>:
+  </div>
+  <div class="col-md-9 value">
+    <& /Admin/Elements/SelectScripCondition, Default => $ARGS{"ScripCondition"} || $Scrip->ConditionObj->Id, &>
+  </div>
+</div>
 
-<tr><td class="label"><&|/l&>Action</&>:</td><td class="value">\
-<& /Admin/Elements/SelectScripAction,
-    Default => $ARGS{"ScripAction"} || $Scrip->ActionObj->Id,
-&></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Action</&>:
+  </div>
+  <div class="col-md-9 value">
+    <& /Admin/Elements/SelectScripAction, Default => $ARGS{"ScripAction"} || $Scrip->ActionObj->Id, &>
+  </div>
+</div>
 
-<tr><td class="label"><&|/l&>Template</&>:</td><td class="value">\
-<& SelectTemplate,
-    Default => $ARGS{"Template"}, Scrip => $Scrip, Queue => $Queue,
-&></td></tr>
+<div class="form-row">
+  <div class="col-md-3 label">
+    <&|/l&>Template</&>:
+  </div>
+  <div class="col-md-9 value">
+    <& SelectTemplate, Default => $ARGS{"Template"}, Scrip => $Scrip, Queue => $Queue &>
+  </div>
+</div>
 
 <%ARGS>
 $Scrip
diff --git a/share/html/Admin/Scrips/Elements/EditCustomCode b/share/html/Admin/Scrips/Elements/EditCustomCode
index 6c8b72017..2c63589f7 100644
--- a/share/html/Admin/Scrips/Elements/EditCustomCode
+++ b/share/html/Admin/Scrips/Elements/EditCustomCode
@@ -47,21 +47,26 @@
 %# END BPS TAGGED BLOCK }}}
 <&| /Widgets/TitleBox, title => loc('User Defined conditions and results') &>
 
-<table>
-<tr><td colspan="2" class="comment">
-<i><&|/l&>(Use these fields when you choose 'User Defined' for a condition or action)</&></i>
-</td></tr>
+<div class="form-row">
+  <div class="col-md-12 comment">
+    <i><&|/l&>(Use these fields when you choose 'User Defined' for a condition or action)</&></i>
+  </div>
+</div>
 
 % while ( my ($method, $desc) = splice @list, 0, 2 ) {
-<tr><td class="labeltop"><% $desc %>:</td><td class="value">
+<div class="form-row">
+  <div class="col-md-3 label labeltop">
+    <% $desc %>:
+  </div>
+  <div class="col-md-9 value">
 % my $code = $ARGS{ $method } || $Scrip->$method() || '';
 % my $lines = @{[ $code =~ /\n/gs ]} + 3;
 % $lines = $min_lines if $lines < $min_lines;
-<textarea cols="80" rows="<% $lines %>" name="<% $method %>"><% $code %></textarea>
-</td></tr>
+    <textarea cols="80" class="form-control" rows="<% $lines %>" name="<% $method %>"><% $code %></textarea>
+  </div>
+</div>
 % }
 
-</table>
 </&>
 <%ARGS>
 $Scrip
diff --git a/share/html/Admin/Scrips/Elements/SelectTemplate b/share/html/Admin/Scrips/Elements/SelectTemplate
index b8880b380..10d4562a0 100644
--- a/share/html/Admin/Scrips/Elements/SelectTemplate
+++ b/share/html/Admin/Scrips/Elements/SelectTemplate
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<select name="<% $Name %>">
+<select name="<% $Name %>" class="form-control selectpicker">
 <option value=""><% $current || '-' %></option>
 % foreach my $name ( @list ) {
 <option value="<% $name %>" \

commit ef2c1e2f413f777ef06b252da7fb18bb4b71c9f5
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Apr 22 13:11:20 2019 -0500

    Migrate Admin/Scrips/Modify to elevator themes

diff --git a/share/html/Admin/Scrips/Modify.html b/share/html/Admin/Scrips/Modify.html
index 6ff6d83b6..d498ff8fc 100644
--- a/share/html/Admin/Scrips/Modify.html
+++ b/share/html/Admin/Scrips/Modify.html
@@ -54,13 +54,16 @@
 <input type="hidden" class="hidden" name="From" value="<% $From || q{} %>" />
 
 <&| /Widgets/TitleBox, title => loc('Basics') &>
-<table>
 
 <& Elements/EditBasics, %ARGS, Scrip => $scrip &>
 
 % if ( not $disabled ) {
-<tr><td class="label"><a href="Objects.html?id=<% $id %>"><&|/l&>Applies to</&></a>:</td>
-<td class="value">\
+  <div class="form-row">
+    <div class="col-md-3 label">
+      <a href="Objects.html?id=<% $id %>"><&|/l&>Applies to</&></a>:
+    </div>
+    <div class="col-md-9 value">
+      <span class="current-value form-control">
 % if ( $scrip->IsGlobal ) {
 <a href="<% RT->Config->Get('WebPath') %>/Admin/Global/Scrips.html"><% loc('Global') %></a>
 % } else {
@@ -74,23 +77,39 @@
 % }
 % $m->out(', ...') if $found == 10;
 % }
-<td></tr>
+      </span>
+    </div>
+  </div>
 % }
 
-<tr><td class="label"> </td><td>
 <input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" name="Enabled" id="Enabled" value="1" <% $EnabledChecked |n%> />
-<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this scrip)</&></label>
-</td></tr>
 
-</table>
+  <div class="form-row">
+    <div class="col-md-3 label">
+    </div>
+    <div class="col-md-9 value">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="checkbox custom-control-input" name="Enabled" id="Enabled" value="1" <% $EnabledChecked |n%> />
+        <label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this scrip)</&></label>
+      </div>
+    </div>
+  </div>
+
 </&>
 
-<& /Elements/Submit, Label => loc('Save Changes'), Name => 'Update', Reset => 1 &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save Changes'), Name => 'Update', Reset => 1 &>
+    </div>
+  </div>
 
 % if ($session{CurrentUser}->HasRight(Object => $RT::System, Right => 'ExecuteCode')) {
 <& Elements/EditCustomCode, %ARGS, Scrip => $scrip &>
-<& /Elements/Submit, Label => loc('Save Changes'), Name => 'Update', Reset => 1 &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Label => loc('Save Changes'), Name => 'Update', Reset => 1 &>
+    </div>
+  </div>
 % }
 
 </form>

commit 71c8971a248b0fcb186e9e95b006b5b1588e5c80
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Mon Apr 22 13:16:41 2019 -0500

    Migrate Admin/Scrips/Objects to elevator themes
    
    This commit is a partial migration to the new theme, minus the
    CollectionList element sections.

diff --git a/share/html/Admin/Elements/SelectStageForAdded b/share/html/Admin/Elements/SelectStageForAdded
index 752f97c65..f6d068818 100644
--- a/share/html/Admin/Elements/SelectStageForAdded
+++ b/share/html/Admin/Elements/SelectStageForAdded
@@ -47,8 +47,10 @@
 %# END BPS TAGGED BLOCK }}}
 <div style="text-align:right">
 <% $Label %>
+<div class="d-inline-block">
 <& SelectStage, %ARGS &>
 </div>
+</div>
 <%args>
 $Label => loc('Select scrip stage for newly added queues:')
 </%args>
diff --git a/share/html/Admin/Scrips/Objects.html b/share/html/Admin/Scrips/Objects.html
index 0acf21a31..0729615d3 100644
--- a/share/html/Admin/Scrips/Objects.html
+++ b/share/html/Admin/Scrips/Objects.html
@@ -55,10 +55,14 @@
 
 % if ( $global ) {
 <h2><&|/l&>Applies to all objects</&></h2>
-<label>
-<input type="checkbox" name="RemoveScrip-<% $id %>" value="0" />
-<&|/l&>check this box to remove this scrip from all objects and be able to choose specific objects.</&>
-</label>
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" name="RemoveScrip-<% $id %>" id="RemoveScrip-<% $id %>-0" value="0" />
+        <label class="custom-control-label" for="RemoveScrip-<% $id %>-0"><&|/l&>check this box to remove this scrip from all objects and be able to choose specific objects.</&></label>
+      </div>
+    </div>
+  </div>
 
 <& /Admin/Elements/SelectStageForAdded,
     Default => $Stage || $global->Stage,
@@ -67,10 +71,14 @@
 % } else {
 <h2><&|/l&>Apply globally</&></h2>
 
-<label>
-<input type="checkbox" name="AddScrip-<% $id %>" value="0" />
-<&|/l&>check this box to apply this scrip to all objects.</&>
-</label>
+  <div class="form-row">
+    <div class="col-md-12">
+      <div class="custom-control custom-checkbox">
+        <input type="checkbox" class="custom-control-input checkbox" name="AddScrip-<% $id %>" id="AddScrip-<% $id %>-0" value="0" />
+        <label class="custom-control-label" for="AddScrip-<% $id %>-0"><&|/l&>check this box to apply this scrip to all objects.</&></label>
+      </div>
+    </div>
+  </div>
 
 <h2><&|/l&>Selected objects</&></h2>
 <& /Elements/CollectionList,
@@ -108,12 +116,18 @@
 <& /Admin/Elements/SelectStageForAdded, Default => $Stage &>
 <div style="text-align:right">
 <% loc('You can change template if needed') %>:
-<& Elements/SelectTemplate, Scrip => $scrip, Default => $Template &>
+<div class="d-inline-block">
+  <& Elements/SelectTemplate, Scrip => $scrip, Default => $Template &>
+</div>
 </div>
 
 % }
 
-<& /Elements/Submit, Name => 'Update' &>
+  <div class="form-row">
+    <div class="col-md-12">
+      <& /Elements/Submit, Name => 'Update' &>
+    </div>
+  </div>
 </form>
 
 <%ARGS>

commit b39118c000ff29d1b64f001b279339d7a3db2ae5
Merge: 52f571e24 71c8971a2
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Apr 23 23:31:49 2019 +0800

    Merge branch '4.6-theme/admin-scrips-pages' into 4.6-theme-trunk


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


More information about the rt-commit mailing list