[Rt-commit] rt branch, 4.6-theme/admin-global-pages, updated. rt-4.4.4-190-gfb2526ca6
Craig Kaiser
craig at bestpractical.com
Fri Apr 26 09:43:33 EDT 2019
The branch, 4.6-theme/admin-global-pages has been updated
via fb2526ca68007272c1164a21788f3f49a2dac085 (commit)
via 6d4bde98bc65205177afb4b3128cfc4de9901851 (commit)
from bc6d8179dd66da618011ebc8ff37da546ff1f74c (commit)
Summary of changes:
share/html/Admin/CustomFields/GroupRights.html | 10 +-
share/html/Admin/CustomFields/Modify.html | 258 +++++++++++++++--------
share/html/Admin/Elements/AddCustomFieldValue | 61 ++++--
share/html/Admin/Elements/EditCustomField | 56 +++--
share/html/Admin/Elements/EditCustomFieldValues | 55 +++--
share/html/Admin/Elements/EditRights | 14 +-
share/html/Admin/Elements/EditRightsCategoryTabs | 4 +-
share/html/Admin/Global/CustomFields/index.html | 4 +-
8 files changed, 298 insertions(+), 164 deletions(-)
- Log -----------------------------------------------------------------
commit 6d4bde98bc65205177afb4b3128cfc4de9901851
Author: Craig Kaiser <craig at bestpractical.com>
Date: Thu Apr 25 16:58:46 2019 -0400
Migrate global custom field pages to elevator pages
diff --git a/share/html/Admin/Global/CustomFields/index.html b/share/html/Admin/Global/CustomFields/index.html
index 3db2d8714..b63d9e6ca 100644
--- a/share/html/Admin/Global/CustomFields/index.html
+++ b/share/html/Admin/Global/CustomFields/index.html
@@ -49,9 +49,9 @@
<& /Admin/Elements/Header, Title => $title &>
<& /Elements/Tabs &>
-<ul>
+<ul class="list-group">
% foreach my $key (sort keys %$tabs) {
-<li><span><a href="<% $tabs->{$key}{path} %>"><% $tabs->{$key}{title} %></a></span><br />
+<li class="list-item"><span><a href="<% $tabs->{$key}{path} %>"><% $tabs->{$key}{title} %></a></span><br />
<% $tabs->{$key}{text} %>
</li>
% }
commit fb2526ca68007272c1164a21788f3f49a2dac085
Author: Craig Kaiser <craig at bestpractical.com>
Date: Fri Apr 26 09:41:55 2019 -0400
Migrate admin custom field pages for elevator theme
diff --git a/share/html/Admin/CustomFields/GroupRights.html b/share/html/Admin/CustomFields/GroupRights.html
index a5c93c373..5b6e7962c 100644
--- a/share/html/Admin/CustomFields/GroupRights.html
+++ b/share/html/Admin/CustomFields/GroupRights.html
@@ -52,8 +52,14 @@
<form method="post" action="GroupRights.html" id="ModifyGroupRights" name="ModifyGroupRights">
<input type="hidden" class="hidden" name="id" value="<% $CustomFieldObj->id %>" />
- <& /Admin/Elements/EditRights, Context => $CustomFieldObj, Principals => \@principals &>
- <& /Elements/Submit, Label => loc('Save Changes') &>
+ <div class="form-row">
+ <& /Admin/Elements/EditRights, Context => $CustomFieldObj, Principals => \@principals &>
+ </div>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save Changes') &>
+ </div>
+ </div>
</form>
<%INIT>
diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index 3f6e9111d..10ea397a4 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -55,50 +55,86 @@
<form method="post" action="Modify.html" name="ModifyCustomField" id="ModifyCustomField">
<input type="hidden" class="hidden" name="id" value="<% $id %>" />
-<table>
-
-<tr><td class="label"><&|/l&>Name</&></td>
-<td><input type="text" name="Name" value="<% $CustomFieldObj->Name || $Name || '' %>" size="20" /></td></tr>
-
-<tr><td class="label"><&|/l&>Description</&></td>
-<td><input type="text" name="Description" value="<% $CustomFieldObj->Description || $Description || '' %>" size="80" /></td></tr>
-
-<tr><td class="label"><&|/l&>Type</&></td>
-<td><& /Admin/Elements/SelectCustomFieldType,
+<div class="col-md-12">
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Name</&>
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="Name" value="<% $CustomFieldObj->Name || $Name || '' %>" size="20" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Description</&>
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="Description" value="<% $CustomFieldObj->Description || $Description || '' %>" size="80" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Type</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Admin/Elements/SelectCustomFieldType,
Name => "TypeComposite",
- Default => $CustomFieldObj->TypeComposite, &>
-</td></tr>
+ Default => $CustomFieldObj->TypeComposite,
+ &>
+ </div>
+ </div>
% if ( $CustomFieldObj->Id and $CustomFieldObj->HasRenderTypes ) {
-<tr>
- <td class="label"><&|/l&>Render Type</&></td>
- <td>
- <& /Admin/Elements/SelectCustomFieldRenderType,
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Render Type</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Admin/Elements/SelectCustomFieldRenderType,
Name => "RenderType",
TypeComposite => $CustomFieldObj->TypeComposite,
Default => $CustomFieldObj->RenderType,
- BasedOn => $CustomFieldObj->BasedOnObj->id, &>
- </td>
-</tr>
+ BasedOn => $CustomFieldObj->BasedOnObj->id,
+ &>
+ </div>
+ </div>
% }
% if ( $CustomFieldObj->Id and $CustomFieldObj->IsSelectionType and RT->Config->Get('CustomFieldValuesSources') and ( scalar(@{RT->Config->Get('CustomFieldValuesSources')}) > 0 ) ) {
-<tr><td class="label"><&|/l&>Field values source:</&></td><td>
-<& /Admin/Elements/EditCustomFieldValuesSource, CustomField => $CustomFieldObj &>
-</td></tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Field values source:</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Admin/Elements/EditCustomFieldValuesSource, CustomField => $CustomFieldObj &>
+ </div>
+ </div>
% }
% if ( $CustomFieldObj->Id and $CustomFieldObj->IsCanonicalizeType and RT->Config->Get('CustomFieldValuesCanonicalizers') and ( scalar(@{RT->Config->Get('CustomFieldValuesCanonicalizers')}) > 0 ) ) {
-<tr><td class="label"><&|/l&>Canonicalizer:</&></td><td>
-<& /Admin/Elements/EditCustomFieldValuesCanonicalizer, CustomField => $CustomFieldObj &>
-</td></tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Canonicalizer:</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Admin/Elements/EditCustomFieldValuesCanonicalizer, CustomField => $CustomFieldObj &>
+ </div>
+ </div>
% }
-<tr><td class="label"><&|/l&>Applies to</&></td>
-<td><& /Admin/Elements/SelectCustomFieldLookupType,
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Applies to</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Admin/Elements/SelectCustomFieldLookupType,
Name => "LookupType",
- Default => $CustomFieldObj->LookupType || $LookupType, &>
-</td></tr>
+ Default => $CustomFieldObj->LookupType || $LookupType,
+ &>
+ </div>
+ </div>
<script type="text/javascript">
jQuery( function() {
@@ -118,86 +154,134 @@ jQuery( function() {
});
</script>
-<tr><td class="label"><&|/l&>Entry Hint</&></td>
-<td><input type="text" name="EntryHint" value="<% $CustomFieldObj->EntryHint // $EntryHint // '' %>" size="80" /></td></tr>
-
-
-<tr class="edit_validation"><td class="label"><&|/l&>Validation</&></td>
-<td><& /Widgets/ComboBox,
- Name => 'Pattern',
- Default => $CustomFieldObj->Pattern || $Pattern,
- Size => 20,
- Values => \@CFvalidations,
-&></td></tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Entry Hint</&>
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="EntryHint" value="<% $CustomFieldObj->EntryHint // $EntryHint // '' %>" size="80" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Validation</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Widgets/ComboBox,
+ Name => 'Pattern',
+ Default => $CustomFieldObj->Pattern || $Pattern,
+ Size => 20,
+ Values => \@CFvalidations,
+ &>
+ </div>
+ </div>
% if ( $CustomFieldObj->SupportDefaultValues ) {
-<tr class="edit_default_values"><td class="label"><&|/l, $CustomFieldObj->MaxValues &>Default [numerate,_1,value,values]</&></td>
-<td>
-<& /Elements/EditCustomField, NamePrefix => 'Default-', CustomField => $CustomFieldObj, ShowEmptyOption => 1 &>
-</td>
-</tr>
+ <div class="form-row">
+ <div class="label col-md-3 edit_default_values">
+ <&|/l, $CustomFieldObj->MaxValues &>Default [numerate,_1,value,values]</&>
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/EditCustomField, NamePrefix => 'Default-', CustomField => $CustomFieldObj, ShowEmptyOption => 1 &>
+ </div>
+ </div>
% }
-<tr><td class="label"><&|/l&>Link values to</&></td><td>
-<input type="text" size="60" name="LinkValueTo" value="<% $CustomFieldObj->LinkValueTo || $LinkValueTo || '' %>" />
-<div class="hints">
-<&|/l&>RT can make this custom field's values into hyperlinks to another service.</&>
-<&|/l&>Fill in this field with a URL.</&>
-<&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
-</div></td></tr>
-
-<tr><td class="label"><&|/l&>Include page</&></td><td>
-<input type="text" size="60" name="IncludeContentForValue" value="<% $CustomFieldObj->IncludeContentForValue || $IncludeContentForValue || '' %>" />
-<div class="hints">
-<&|/l&>RT can include content from another web service when showing this custom field.</&>
-<&|/l&>Fill in this field with a URL.</&>
-<&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
-<i><&|/l&>Some browsers may only load content from the same domain as your RT server.</&></i>
-</div></td></tr>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Link values to</&>
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-row" type="text" size="60" name="LinkValueTo" value="<% $CustomFieldObj->LinkValueTo || $LinkValueTo || '' %>" />
+ </div>
+ </div>
+
+ <div class="hints">
+ <&|/l&>RT can make this custom field's values into hyperlinks to another service.</&>
+ <&|/l&>Fill in this field with a URL.</&>
+ <&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Include page</&>
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" size="60" name="IncludeContentForValue" value="<% $CustomFieldObj->IncludeContentForValue || $IncludeContentForValue || '' %>" />
+ </div>
+ </div>
+ <div class="hints form-row">
+ <&|/l&>RT can include content from another web service when showing this custom field.</&>
+ <&|/l&>Fill in this field with a URL.</&>
+ <&|/l_unsafe, '<tt>__id__</tt>', '<tt>__CustomField__</tt>' &>RT will replace [_1] and [_2] with the record's id and the custom field's value, respectively.</&>
+ <i><&|/l&>Some browsers may only load content from the same domain as your RT server.</&></i>
+ </div>
% if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType ) {
-<tr class="categoriesbasedon"><td class="label"><&|/l&>Categories are based on</&></td><td>
-<& /Admin/Elements/SelectCustomField,
- Name => "BasedOn",
- LookupType => $CustomFieldObj->LookupType,
- Default => $CustomFieldObj->BasedOnObj || $BasedOn,
- Not => $CustomFieldObj->id,
-&>
-</td></tr>
+ <div class="form-row categoriesbasedon">
+ <&|/l&>Categories are based on</&>
+ <div class="col-md-9 value">
+ <& /Admin/Elements/SelectCustomField,
+ Name => "BasedOn",
+ LookupType => $CustomFieldObj->LookupType,
+ Default => $CustomFieldObj->BasedOnObj || $BasedOn,
+ Not => $CustomFieldObj->id,
+ &>
+ </div>
+ </div>
% }
-<tr><td class="label"> </td><td>
-<input type="hidden" class="hidden" name="SetUniqueValues" value="1" />
-<input type="checkbox" class="checkbox" id="UniqueValues" name="UniqueValues" value="1" <% $UniqueValuesChecked |n %> />
-<label for="UniqueValues"><&|/l&>New values must be unique</&></label>
-</td></tr>
+ <div class="form-row">
+
+ <input type="hidden" class="hidden" name="SetUniqueValues" value="1" />
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input" id="UniqueValues" name="UniqueValues" value="1" <% $UniqueValuesChecked |n %> />
+ <label class="custom-control-label" for="UniqueValues">
+ <&|/l&>New values must be unique</&>
+ </label>
+ </div>
+ </div>
% $m->callback(CallbackName => 'BeforeEnabled', CustomField => $CustomFieldObj, CFvalidations => \@CFvalidations);
-<tr><td class="label"> </td><td>
-<input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <% $EnabledChecked |n %> />
-<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this custom field)</&></label>
-</td></tr>
+ <div class="form-row">
+
+ <input type="hidden" class="hidden" name="SetEnabled" value="1" />
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="custom-control-input" id="Enabled" name="Enabled" value="1" <% $EnabledChecked |n %> />
+ <label class="custom-control-label" for="Enabled">
+ <&|/l&>Enabled (Unchecking this box disables this custom field)</&>
+ </label>
+ </div>
+ </div>
% $m->callback(CallbackName => 'EndOfTable', CustomField => $CustomFieldObj, CFvalidations => \@CFvalidations);
-</table>
% if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType && !$CustomFieldObj->IsExternalValues ) {
-<h2><&|/l&>Values</&></h2>
-<div class="edit_custom_field_values">
-<& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &>
-</div>
+ <div class="form-row">
+ <h2><&|/l&>Values</&></h2>
+ </div>
+ <div class="form-row">
+ <div class="edit_custom_field_values col-md-9">
+ <& /Admin/Elements/EditCustomFieldValues, CustomField => $CustomFieldObj &>
+ </div>
+ </div>
% }
-<& /Elements/Submit, Name => 'Update', Label => $id eq 'new'? loc('Create'): loc('Save Changes') &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Name => 'Update', Label => $id eq 'new'? loc('Create'): loc('Save Changes') &>
+ </div>
+ </div>
+</div>
</form>
% if ( $CustomFieldObj->Id && $CustomFieldObj->IsSelectionType && !$CustomFieldObj->IsExternalValues ) {
-<div class="add_custom_field_value">
-<& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
+<div class="add_custom_field_value col-md-12">
+ <& /Admin/Elements/AddCustomFieldValue, CustomField => $CustomFieldObj &>
</div>
% }
% $m->callback(%ARGS, CallbackName => 'EndOfPage', CustomFieldObj => $CustomFieldObj);
diff --git a/share/html/Admin/Elements/AddCustomFieldValue b/share/html/Admin/Elements/AddCustomFieldValue
index 71691afe9..51dbc184f 100644
--- a/share/html/Admin/Elements/AddCustomFieldValue
+++ b/share/html/Admin/Elements/AddCustomFieldValue
@@ -45,40 +45,57 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<h3><&|/l&>Add Value</&></h3>
+<div class="col-md-12">
+ <div class="form-row">
+ <h3><&|/l&>Add Value</&></h3>
+ </div>
<form name="AddCustomFieldValue" action="Modify.html" method="post">
<input type="hidden" class="hidden" name="id" value="<% $CustomField->id %>" />
-<table border="0">
-<tr>
-<th><&|/l&>Sort</&></th>
-<th><&|/l&>Name</&></th>
-<th><&|/l&>Description</&></th>
+
+ <div class="form-row">
+ <div class="label col-md-3 text-left">
+ <&|/l&>Sort</&>
+ </div>
+ <div class="label col-md-3 text-left">
+ <&|/l&>Name</&>
+ </div>
+ <div class="label col-md-3 text-left">
+ <&|/l&>Description</&>
+ </div>
% if ( $CustomField->Type ne 'Combobox' && $Categories ) {
-<th class="categoryheader"><&|/l&>Category</&></th>
+ <div class="label categoryheader col-md-3 text-left">
+ <&|/l&>Category</&>
+ </div>
% }
-<th></th>
-</tr>
+ </div>
% my $paramtag = "CustomField-". $CustomField->Id ."-Value-new";
-<tr>
-<td><input type="text" size="3" name="<% $paramtag %>-SortOrder" /></td>
-<td><input type="text" size="25" name="<% $paramtag %>-Name" /></td>
-<td><input type="text" size="45" name="<% $paramtag %>-Description" /></td>
+ <div class="form-row">
+ <div class="col-md-3">
+ <input class="form-control" type="text" size="3" name="<% $paramtag %>-SortOrder" />
+ </div>
+ <div class="col-md-3">
+ <input class="form-control" type="text" size="25" name="<% $paramtag %>-Name" />
+ </div>
+ <div class="col-md-3">
+ <input class="form-control" type="text" size="45" name="<% $paramtag %>-Description" />
+ </div>
% if ( $CustomField->Type ne 'Combobox' && $Categories ) {
-<td>
-<select class="editcategory" name="<% $paramtag %>-Category" size="1">
-<option value=""><&|/l&>(no value)</&></option>
+ <div class="form-row">
+ <select class="form-control selectpicker editcategory " name="<% $paramtag %>-Category" size="1">
+ <option value=""><&|/l&>(no value)</&></option>
% while (my $Value = $Categories->Next) {
-<option value="<% $Value->Name %>"><% $Value->Name %></option>
+ <option value="<% $Value->Name %>"><% $Value->Name %></option>
% }
-</td>
+ </select>
% }
-<td><input type="submit" name="AddValue" value="<&|/l&>Add</&>" /></td>
+ <div class="col-md-3">
+ <input type="submit" name="AddValue" value="<&|/l&>Add</&>" />
+ </div>
% $m->callback(CallbackName => 'AfterCustomFieldValueInput', CustomFieldObj => $CustomField, ARGSRef => \%ARGS );
-</tr>
-
-</table>
+ </div>
+</div>
</form>
<script type="text/javascript">
diff --git a/share/html/Admin/Elements/EditCustomField b/share/html/Admin/Elements/EditCustomField
index 1f5110a36..97b399413 100644
--- a/share/html/Admin/Elements/EditCustomField
+++ b/share/html/Admin/Elements/EditCustomField
@@ -52,29 +52,39 @@
<input type="hidden" class="hidden" name="CustomField" value="<%$id %>" />
<input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" />
-<table width="100%" border="0">
-<tr><td align="right">
-<&|/l&>Name</&>:
-</td><td>
-<input type="text" name="Name" value="<%$CustomFieldObj->Name%>" size="20" />
-</td></tr>
-<tr><td align="right">
-<&|/l&>Description</&>:
-</td><td>
-<input type="text" name="Description" value="<%$CustomFieldObj->Description%>" size="80" />
-</td></tr>
-<tr><td align="right">
-<&|/l&>Type</&>:
-</td><td>
-<& /Admin/Elements/SelectCustomFieldType, Name => "Type", Default => $CustomFieldObj->Type &>
-</td></tr>
-<tr><td>
-</td><td>
-<input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked%> />
-<label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this custom field)</&></label>
-</td></tr>
-</table>
+<div class="col-md-12">
+ <div class="form-row">
+ <div class="col-md-3 label>
+ <&|/l&>Name</&>:
+ <div>
+ <div class="value col-md-9">
+ <input class="form-control" type="text" name="Name" value="<%$CustomFieldObj->Name%>" size="20" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label>
+ <&|/l&>Description</&>:
+ </div>
+ <div class="value col-md-9">
+ <input class="form-control" type="text" name="Description" value="<%$CustomFieldObj->Description%>" size="80" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label>
+ <&|/l&>Type</&>:
+ </div>
+ <div class="value col-md-9">
+ <& /Admin/Elements/SelectCustomFieldType, Name => "Type", Default => $CustomFieldObj->Type &>
+ </div>
+ </div>
+
+ <input type="hidden" class="hidden" name="SetEnabled" value="1" />
+ <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 custom field)</&></label>
+ </div>
<p>
% if ($CustomFieldObj->Id and $CustomFieldObj->Type =~ /Select/) {
diff --git a/share/html/Admin/Elements/EditCustomFieldValues b/share/html/Admin/Elements/EditCustomFieldValues
index 6f339305c..b0fc963c4 100644
--- a/share/html/Admin/Elements/EditCustomFieldValues
+++ b/share/html/Admin/Elements/EditCustomFieldValues
@@ -50,42 +50,59 @@
% return;
% }
-<table>
+<div class="col-md-12">
-<tr>
-<th><input type="checkbox" name="DeleteAll" value="1" onclick="setCheckbox(this, /^Delete-/)" /></th>
-<th><&|/l&>Sort</&></th>
-<th><&|/l&>Name</&></th>
-<th><&|/l&>Description</&></th>
+ <div class="form-row">
+ <div class="label col-md-3 text-left">
+ <div class="custom-control custom-checkbox">
+ <input class="custom-control-input" type="checkbox" id='DeleteAll' name="DeleteAll" value="1" onclick="setCheckbox(this, /^Delete-/)" />
+ <label class="custom-control-label" for="DeleteAll"><&|/l&>Sort</&></label>
+ </div>
+ </div>
+ <div class="label col-md-3 text-left">
+ <&|/l&>Name</&>
+ </div>
+ <div class="label col-md-3 text-left">
+ <&|/l&>Description</&>
+ </div>
% if ( $CustomField->Type ne 'Combobox' && $Categories ) {
-<th class="categoryheader"><&|/l&>Category</&></th>
+ <div class="label categoryheader col-md-3">
+ <&|/l&>Category</&>
+ </div>
% }
-<th></th>
-</tr>
+ </div>
% while ( my $value = $values->Next ) {
% my $paramtag = "CustomField-". $CustomField->Id ."-Value-". $value->Id;
-<tr>
-<td><input type="text" size="3" name="<% $paramtag %>-SortOrder" value="<% $value->SortOrder %>" /></td>
-<td><input type="text" size="25" name="<% $paramtag %>-Name" value="<% $value->Name %>" /></td>
-<td><input type="text" size="45" name="<% $paramtag %>-Description" value="<% $value->Description || '' %>" /></td>
+ <div class="form-row">
+ <div class="col-md-3">
+ <input class="form-control" type="text" size="3" name="<% $paramtag %>-SortOrder" value="<% $value->SortOrder %>" />
+ </div>
+ <div class="col-md-3">
+ <input class="form-control" type="text" size="25" name="<% $paramtag %>-Name" value="<% $value->Name %>" />
+ </div>
+ <div class="col-md-3">
+ <input class="form-control" type="text" size="45" name="<% $paramtag %>-Description" value="<% $value->Description || '' %>" />
+ </div>
% if ( $CustomField->Type ne 'Combobox' && $Categories ) {
-<td>
+ <div class="col-md-3">
% my $selected = $value->Category;
% $selected = '' unless defined $selected;
-<select class="editcategory" name="<% $paramtag %>-Category" size="1">
+<select class="editcategory form-control selectpicker" name="<% $paramtag %>-Category" size="1">
<option value=""<% $selected eq '' ? q[ selected="selected"] : "" |n%>><&|/l&>(no value)</&></option>
% while (my $Value = $Categories->Next) {
<option value="<% $Value->Name %>"<% $selected eq $Value->Name ? q[ selected="selected"] : "" |n%>><% $Value->Name %></option>
% }
-</td>
+ </div>
% }
-<td><input type="button" class="delete_custom_field_value" data-cfv-id="<% $value->id %>" value="<&|/l&>Delete</&>" onclick="delete_custom_field_value(<% $value->id %>)" /></td>
+ <div class="col-md-3">
+ <input type="button" class="delete_custom_field_value form-control btn btn-primary" data-cfv-id="<% $value->id %>" value="<&|/l&>Delete</&>" onclick="delete_custom_field_value(<% $value->id %>)" />
+ </div>
% $m->callback(CallbackName => 'AfterCustomFieldValueInput', CustomFieldObj => $CustomField, CustomFieldValueObj => $value, ARGSRef => \%ARGS );
-</tr>
+</div>
% }
-</table>
+</div>
<script type="text/javascript">
function delete_custom_field_value(value_id) {
diff --git a/share/html/Admin/Elements/EditRights b/share/html/Admin/Elements/EditRights
index 4ae76429f..5fbacd8f1 100644
--- a/share/html/Admin/Elements/EditRights
+++ b/share/html/Admin/Elements/EditRights
@@ -174,27 +174,27 @@ if ($anchor =~ /AddPrincipal/) {
<div class="rights-editor clearfix">
<input type="hidden" value="" name="Anchor" />
- <ul>
+ <ul class="list-group">
<%perl>
for my $category (@$Principals) {
my ($name, $collection, $col, $loc) = @$category;
</%perl>
-<li class="category"><% loc($name) %></li>
+<li class="category list-item"><% loc($name) %></li>
<%perl>
while ( my $obj = $collection->Next ) {
my $display = ref $col eq 'CODE' ? $col->($obj) : $obj->$col;
my $id = "acl-" . $obj->PrincipalId;
</%perl>
-<li><a href="#<% $id %>"><span class="rights-editor-label" id="<% "principal-tab-$id" %>"><% $loc ? loc($display) : $display %></span></a></li>
+<li class="list-item"><a href="#<% $id %>"><span class="rights-editor-label" id="<% "principal-tab-$id" %>"><% $loc ? loc($display) : $display %></span></a></li>
<%perl>
}
}
</%perl>
% if ( $AddPrincipal ) {
- <li class="category"><&|/l, loc($AddPrincipal) &>Add [_1]</&></li>
- <li class="addprincipal">
+ <li class="category list-item"><&|/l, loc($AddPrincipal) &>Add [_1]</&></li>
+ <li class="addprincipal list-item">
<a href="#acl-AddPrincipal">
- <input type="text" value="" class="form-control"
+ <input type="text" class="" value="" class="form-control"
data-autocomplete="<% lc $AddPrincipal eq 'user' ? 'Users' : 'Groups' %>"
% if ( lc $AddPrincipal eq 'user' ) {
data-autocomplete-return="Name"
@@ -230,7 +230,7 @@ for my $category (@$Principals) {
my $id = "acl-" . $obj->PrincipalId;
</%perl>
- <div id="<% $id %>">
+ <div id="<% $id %>" class="col-md-12">
<h3>
<% $loc ? loc($display) : $display %>
<%perl>
diff --git a/share/html/Admin/Elements/EditRightsCategoryTabs b/share/html/Admin/Elements/EditRightsCategoryTabs
index 06df2557d..26518c273 100644
--- a/share/html/Admin/Elements/EditRightsCategoryTabs
+++ b/share/html/Admin/Elements/EditRightsCategoryTabs
@@ -110,9 +110,9 @@ $available_rights{$_} = loc( $available_rights{$_} ) for keys %available_rights;
</ul>
% for my $category (sort { $catsort{$a} <=> $catsort{$b} } keys %categories) {
<div id="<% "$id-$category" %>" class="col-md-12">
- <ul class="rights-list">
+ <ul class="rights-list list-group">
% for my $right (sort { $available_rights{$a} cmp $available_rights{$b} } @{$categories{$category}}) {
- <li>
+ <li class="list-item">
<div class="custom-control custom-checkbox">
<input
type="checkbox"
-----------------------------------------------------------------------
More information about the rt-commit
mailing list