[Rt-commit] rt branch, 4.6-theme-trunk, updated. rt-4.4.4-248-g3c4e75d97
? sunnavy
sunnavy at bestpractical.com
Thu May 23 15:06:08 EDT 2019
The branch, 4.6-theme-trunk has been updated
via 3c4e75d97cf4a0ab3b81b74a48e3f7a39c039e5a (commit)
via 1e7580438cc9f5445a45aeb299762c5d4b514d8f (commit)
via 9067f8fbf873bc09d5ff303578184c8486af07e2 (commit)
via ffa5da05fd75214c770fca4b00c74aa9016d0839 (commit)
via c97747714ff1e8f647d2a3237e1738b4dd1de8dd (commit)
via a45fb96a25b9b9e124c5984e60511dc8f630d0ef (commit)
from 6f694b3bdb364e0b063bd5af908dc9c0a9004cb8 (commit)
Summary of changes:
share/html/Admin/Articles/Classes/GroupRights.html | 6 +-
share/html/Admin/Articles/Classes/Modify.html | 180 ++++++++++++++-------
share/html/Admin/Articles/Classes/Objects.html | 26 ++-
share/html/Admin/Articles/Classes/UserRights.html | 6 +-
share/html/Admin/Articles/Classes/index.html | 16 +-
5 files changed, 163 insertions(+), 71 deletions(-)
- Log -----------------------------------------------------------------
commit c97747714ff1e8f647d2a3237e1738b4dd1de8dd
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue May 21 17:23:58 2019 -0500
Migrate Admin/Articles/Classes/Modify to elevator themes
diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index 26d900bc9..201af3c42 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -57,82 +57,140 @@
<input type="hidden" name="id" value="<%$ClassObj->Id%>" />
% }
-<table>
-<tr>
-<td align="right"><&|/l&>Class Name</&>: </td>
-<td><input type="text" name="Name" value="<% $ClassObj->Name || $Name || ''%>" /></td>
-</tr>
-<tr>
-<td align="right"><&|/l&>Description</&>:</td>
-<td><input type="text" name="Description" value="<% $ClassObj->Description || $Description || '' %>" size=60 /></td>
-</tr>
-<tr>
-<td> </td>
-<td>
- <input type="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%>>
- <label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this class)</&></label>
-</td>
-</tr>
-<tr>
-<td> </td>
-<td>
- <input type="checkbox" id="HotList" name="HotList" value="1" <%$HotListChecked%>>
- <label for="HotList"><&|/l&>All Articles in this class should be listed in a dropdown of the ticket reply page</&></label>
-</td>
-</tr>
-</table>
-
-<h3><&|/l&>When inserting articles in this class into emails:</&></h3>
-<ul>
-<li>
- <input type="checkbox" id="Include-Name" name="Include-Name" value="1" <% $include{Name} %>>
- <label for="Include-Name"><&|/l&>Include article name</&></label>
-</li>
-<li>
- <input type="checkbox" id="Include-Summary" name="Include-Summary" value="1" <% $include{Summary} %>>
- <label for="Include-Summary"><&|/l&>Include article summary</&></label>
-</li>
-<li>
- <input type="checkbox" id="Include-EscapeHTML" name="Include-EscapeHTML" value="1" <% $include{EscapeHTML} %>>
- <label for="Include-EscapeHTML"><&|/l&>Escape HTML (Unchecking this box is potentially unsafe)</&></label>
-</li>
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Class Name</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input type="text" class="form-control" name="Name" value="<% $ClassObj->Name || $Name || ''%>" />
+ </div>
+ </div>
+
+ <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" value="<% $ClassObj->Description || $Description || '' %>" size=60 />
+ </div>
+ </div>
+
+ <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" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%>>
+ <label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this class)</&></label>
+ </div>
+ </div>
+ </div>
+
+ <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" id="HotList" name="HotList" value="1" <%$HotListChecked%>>
+ <label class="custom-control-label" for="HotList"><&|/l&>All Articles in this class should be listed in a dropdown of the ticket reply page</&></label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <h3><&|/l&>When inserting articles in this class into emails:</&></h3>
+ </div>
+ </div>
+
+ <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" id="Include-Name" name="Include-Name" value="1" <% $include{Name} %>>
+ <label class="custom-control-label" for="Include-Name"><&|/l&>Include article name</&></label>
+ </div>
+ </div>
+ </div>
+
+ <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" id="Include-Summary" name="Include-Summary" value="1" <% $include{Summary} %>>
+ <label class="custom-control-label" for="Include-Summary"><&|/l&>Include article summary</&></label>
+ </div>
+ </div>
+ </div>
+
+ <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" id="Include-EscapeHTML" name="Include-EscapeHTML" value="1" <% $include{EscapeHTML} %>>
+ <label class="custom-control-label" for="Include-EscapeHTML"><&|/l&>Escape HTML (Unchecking this box is potentially unsafe)</&></label>
+ </div>
+ </div>
+ </div>
+
% if ( $cfs ) {
% while (my $cf = $cfs->Next) {
-<li><&|/l, $cf->Name &>Include custom field '[_1]'</&>
- <ul>
- <li>
- <input type="checkbox" id="Include-CF-Title-<% $cf->Id %>" name="Include-CF-Title-<% $cf->Id %>" <% $include{"CF-Title-".$cf->Id} %> />
- <label for="Include-CF-Title-<% $cf->Id %>"><&|/l&>Title</&></label>
- </li>
- <li>
- <input type="checkbox" id="Include-CF-Value-<% $cf->Id %>" name="Include-CF-Value-<% $cf->Id %>" <% $include{"CF-Value-".$cf->Id} %> />
- <label for="Include-CF-Value-<% $cf->Id %>"><&|/l&>Value</&></label>
- </li>
- </ul>
-</li>
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l, $cf->Name &>Include custom field '[_1]'</&>
+ </div>
+ <div class="col-md-9 value">
+ <div class="form-row">
+ <div class="col-md-auto">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input checkbox" id="Include-CF-Title-<% $cf->Id %>" name="Include-CF-Title-<% $cf->Id %>" <% $include{"CF-Title-".$cf->Id} %> />
+ <label class="custom-control-label" for="Include-CF-Title-<% $cf->Id %>"><&|/l&>Title</&></label>
+ </div>
+ </div>
+ <div class="col-md-auto">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input checkbox" id="Include-CF-Value-<% $cf->Id %>" name="Include-CF-Value-<% $cf->Id %>" <% $include{"CF-Value-".$cf->Id} %> />
+ <label class="custom-control-label" for="Include-CF-Value-<% $cf->Id %>"><&|/l&>Value</&></label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
% } }
-</ul>
% if ( @$subject_cfs ) {
<h3><&|/l&>Change email subject:</&></h3>
<p><&|/l&>If a Custom Field is selected, the Subject of your outgoing email will be overridden by this article.</&></p>
-<& /Widgets/Form/Select,
- Name => 'SubjectOverride',
- DefaultLabel => loc('No Subject Override'),
- Values => $subject_cfs,
- ValuesLabel => $subject_cf_labels,
- CurrentValue => $ClassObj->SubjectOverride,
-&>
+ <div class="form-row">
+ <div class="col-md-3 label">
+ </div>
+ <div class="col-md-9 value">
+ <& /Widgets/Form/Select,
+ Name => 'SubjectOverride',
+ DefaultLabel => loc('No Subject Override'),
+ Values => $subject_cfs,
+ ValuesLabel => $subject_cf_labels,
+ CurrentValue => $ClassObj->SubjectOverride,
+ &>
+ </div>
+ </div>
% }
%$m->callback( CallbackName => 'BeforeSubmit', CustomFields => $cfs, ClassObj => $ClassObj );
+ <div class="form-row">
+ <div class="col-md-12">
% if ( $Create ) {
-<& /Elements/Submit, Label => loc('Create') &>
+ <& /Elements/Submit, Label => loc('Create') &>
% } else {
-<& /Elements/Submit, Label => loc('Save Changes') &>
+ <& /Elements/Submit, Label => loc('Save Changes') &>
% }
+ </div>
+ </div>
</form>
<%INIT>
commit ffa5da05fd75214c770fca4b00c74aa9016d0839
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue May 21 17:30:11 2019 -0500
Migrate Admin/Articles/Classes/GroupRights to elevator themes
diff --git a/share/html/Admin/Articles/Classes/GroupRights.html b/share/html/Admin/Articles/Classes/GroupRights.html
index 641e5dbe0..70b663b6d 100644
--- a/share/html/Admin/Articles/Classes/GroupRights.html
+++ b/share/html/Admin/Articles/Classes/GroupRights.html
@@ -54,7 +54,11 @@
<& /Admin/Elements/EditRights, Context => $ClassObj, Principals => \@principals &>
- <& /Elements/Submit, Label => loc('Save Changes') &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save Changes') &>
+ </div>
+ </div>
</form>
<%INIT>
commit 9067f8fbf873bc09d5ff303578184c8486af07e2
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue May 21 17:45:51 2019 -0500
Migrate Admin/Articles/Classes/Objects to elevator themes
diff --git a/share/html/Admin/Articles/Classes/Objects.html b/share/html/Admin/Articles/Classes/Objects.html
index efd3fedc9..2d7c4debb 100644
--- a/share/html/Admin/Articles/Classes/Objects.html
+++ b/share/html/Admin/Articles/Classes/Objects.html
@@ -54,13 +54,25 @@
% if ( $is_global ) {
<h2><&|/l&>Applies to all objects</&></h2>
-<input type="checkbox" id="RemoveClass-<% $Class->id %>" name="RemoveClass-<% $Class->id %>" value="0" />
-<label for="RemoveClass-<% $Class->id %>"><&|/l&>check this box to remove this Class globally and be able to choose specific Queues.</&></label>
+ <div class="form-row">
+ <div class="col-md-12">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input checkbox" id="RemoveClass-<% $Class->id %>" name="RemoveClass-<% $Class->id %>" value="0" />
+ <label class="custom-control-label" for="RemoveClass-<% $Class->id %>"><&|/l&>check this box to remove this Class globally and be able to choose specific Queues.</&></label>
+ </div>
+ </div>
+ </div>
% } else {
<h2><&|/l&>Apply globally</&></h2>
-<input type="checkbox" id="AddClass-<% $Class->id %>" name="AddClass-<% $Class->id %>" value="0" />
-<label for="AddClass-<% $Class->id %>"><&|/l&>check this box to apply this Class globally to all Queues.</&></label>
+ <div class="form-row">
+ <div class="col-md-12">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input checkbox" id="AddClass-<% $Class->id %>" name="AddClass-<% $Class->id %>" value="0" />
+ <label class="custom-control-label" for="AddClass-<% $Class->id %>"><&|/l&>check this box to apply this Class globally to all Queues.</&></label>
+ </div>
+ </div>
+ </div>
<h2><&|/l&>Selected Queues</&></h2>
<& /Elements/CollectionList,
@@ -97,7 +109,11 @@
% }
-<& /Elements/Submit, Name => 'UpdateObjs' &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Name => 'UpdateObjs' &>
+ </div>
+ </div>
</form>
<%INIT>
commit 1e7580438cc9f5445a45aeb299762c5d4b514d8f
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue May 21 17:51:05 2019 -0500
Migrate Admin/Articles/Classes/UserRights to elevator themes
diff --git a/share/html/Admin/Articles/Classes/UserRights.html b/share/html/Admin/Articles/Classes/UserRights.html
index d97dedb8b..5df8d13aa 100644
--- a/share/html/Admin/Articles/Classes/UserRights.html
+++ b/share/html/Admin/Articles/Classes/UserRights.html
@@ -53,7 +53,11 @@
<input type="hidden" name="id" value="<% $ClassObj->id %>" />
<& /Admin/Elements/EditRights, Context => $ClassObj, Principals => \@principals &>
- <& /Elements/Submit, Label => loc('Save Changes') &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save Changes') &>
+ </div>
+ </div>
<%INIT>
my @results = ProcessACLs(\%ARGS);
commit 3c4e75d97cf4a0ab3b81b74a48e3f7a39c039e5a
Merge: 6f694b3bd 1e7580438
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri May 24 02:45:04 2019 +0800
Merge branch '4.6-theme/admin-articles-pages' into 4.6-theme-trunk
-----------------------------------------------------------------------
More information about the rt-commit
mailing list