[Rt-commit] rt branch, 4.6-theme-trunk, updated. rt-4.4.4-282-g1a137dcfa
? sunnavy
sunnavy at bestpractical.com
Fri Jun 7 12:18:29 EDT 2019
The branch, 4.6-theme-trunk has been updated
via 1a137dcfaf6cae835ba5a9a1625be17eb9e03f1b (commit)
via 43706267d34ff6b8c0b8338ed727a10387f002a3 (commit)
from 81bd6bae8087913b4b31ca45ac86a120c8120219 (commit)
Summary of changes:
share/html/Admin/Groups/Members.html | 66 ++++++++++----------
share/html/Admin/Groups/Modify.html | 66 ++++++++++----------
share/html/Admin/Groups/index.html | 113 ++++++++++++++++++++++++-----------
3 files changed, 146 insertions(+), 99 deletions(-)
- Log -----------------------------------------------------------------
commit 43706267d34ff6b8c0b8338ed727a10387f002a3
Author: michel <michel at bestpractical.com>
Date: Fri May 17 13:21:06 2019 +0200
Migrate /Admin/Groups to the elevator theme
diff --git a/share/html/Admin/Groups/Members.html b/share/html/Admin/Groups/Members.html
index e52c44a6b..82da3b980 100644
--- a/share/html/Admin/Groups/Members.html
+++ b/share/html/Admin/Groups/Members.html
@@ -54,23 +54,14 @@
<&| /Widgets/TitleBox, title => loc('Editing membership for group [_1]', $Group->Label) &>
-<table width="100%">
-<tr>
-<td>
-<h3><&|/l&>Current members</&></h3>
-</td>
-<td>
-<h3><&|/l&>Add members</&></h3>
-</td>
-</tr>
-
-<tr>
-<td valign="top">
+<div class="form-row">
+ <div class="col-md-6">
+ <h3><&|/l&>Current members</&></h3>
% if ($Group->MembersObj->Count == 0 ) {
-<em><&|/l&>(No members)</&></em>
+ <em><&|/l&>(No members)</&></em>
% } else {
-<&|/l&>Users</&>
+ <h4><&|/l&>Users</&></h4>
% my $Users = $Group->UserMembersObj( Recursively => 0 );
<%perl>
my @users = map {$_->[1]}
@@ -78,33 +69,46 @@ my @users = map {$_->[1]}
map { [$_->Format, $_] }
@{ $Users->ItemsArrayRef };
</%perl>
-<ul>
+ <ul class="list-group list-group-compact">
% for my $user (@users) {
% $UsersSeen{ $user->id } = 1 if $SkipSeenUsers;
-<li><input type="checkbox" class="checkbox" name="DeleteMember-<% $user->PrincipalObj->Id %>" value="1" />
-<& /Elements/ShowUser, User => $user &></li>
+% my $id= 'DeleteMember-' . $user->PrincipalObj->Id;
+ <li class="list-group-item">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="checkbox custom-control-input" id="<% $id %>" name="<% $id %>" value="1" />
+ <label class="custom-control-label" for="<% $id %>"><& /Elements/ShowUser, User => $user &></label>
+ </div>
+ </li>
% }
-</ul>
-<&|/l&>Groups</&>
-<ul>
+ </ul>
+ <h4><&|/l&>Groups</&></h4>
+ <ul class="list-group list-group-compact">
% my $GroupMembers = $Group->MembersObj;
% $GroupMembers->LimitToGroups();
% while ( my $member = $GroupMembers->Next ) {
% $GroupsSeen{ $member->MemberId } = 1 if $SkipSeenGroups;
-<li><input type="checkbox" class="checkbox" name="DeleteMember-<% $member->MemberId %>" value="1" />
-<a href="<% RT->Config->Get('WebPath') %>/Admin/Groups/Modify.html?id=<% $member->MemberObj->Object->id %>"><% $member->MemberObj->Object->Name %></a>
+% my $id= 'DeleteMember-' . $member->MemberId;
+ <li class="list-group-item">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="checkbox custom-control-input" id="<% $id%>" name="DeleteMember-<% $id%>" value="1" />
+ <label class="custom-control-label" for="<% $id %>">
+ <a href="<% RT->Config->Get('WebPath') %>/Admin/Groups/Modify.html?id=<% $member->MemberObj->Object->id %>"><% $member->MemberObj->Object->Name %></a>
+ </label>
+ </div>
+ </li>
% }
-</ul>
+ </ul>
+ <em><&|/l&>(Check box to delete)</&></em>
% }
-</td>
-<td valign="top">
-<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group,
- SkipUsers => \%UsersSeen, SkipGroups => \%GroupsSeen &>
-</td>
-</tr>
-</table>
+
+ </div>
+ <div class="col-md-6">
+ <h3><&|/l&>Add members</&></h3>
+ <& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group,
+ SkipUsers => \%UsersSeen, SkipGroups => \%GroupsSeen &>
+ </div>
+</div>
</&>
-<em><&|/l&>(Check box to delete)</&></em>
<& /Elements/Submit, Label => loc('Modify Members'), Reset => 1 &>
</form>
diff --git a/share/html/Admin/Groups/Modify.html b/share/html/Admin/Groups/Modify.html
index 7b5e32a9d..41cc012f9 100644
--- a/share/html/Admin/Groups/Modify.html
+++ b/share/html/Admin/Groups/Modify.html
@@ -55,43 +55,43 @@
<form action="<%RT->Config->Get('WebPath')%>/Admin/Groups/Modify.html" name="ModifyGroup" method="post" enctype="multipart/form-data">
%unless ($Group->Id) {
-<input type="hidden" class="hidden" name="id" value="new" />
+ <input type="hidden" class="hidden" name="id" value="new" />
% } else {
-<input type="hidden" class="hidden" name="id" value="<%$Group->Id%>" />
+ <input type="hidden" class="hidden" name="id" value="<%$Group->Id%>" />
% }
-<table>
- <tr>
- <td valign="top" class="boxcontainer">
- <&| /Widgets/TitleBox, title => loc('Basics'), class => 'group-info-basics' &>
- <table>
- <tr>
- <td align="right"><&|/l&>Name</&>:</td>
- <td><input type="text" name="Name" value="<%$Group->Name||$Name||''%>" /></td>
- </tr>
- <tr>
- <td align="right"><&|/l&>Description</&>:</td>
- <td colspan="3"><input type="text" name="Description" value="<%$Group->Description||$Description||''%>" size="60" /></td>
- </tr>
- <& /Elements/EditCustomFields, Object => $Group, Grouping => 'Basics', InTable => 1 &>
- <tr>
- <td colspan="2">
- <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 group)</&></label><br />
- </td>
- </tr>
- </table>
- </&>
- </td>
- </tr>
- <tr>
- <td>
- <& /Elements/EditCustomFieldCustomGroupings , Object => $Group, &>
- </td>
- </tr>
+ <&| /Widgets/TitleBox, title => loc('Basics'), class => 'group-info-basics' &>
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Name</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input type="text" name="Name" class="form-control" value="<%$Group->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" name="Description" class="form-control" value="<%$Group->Description||$Description||''%>" size="60" />
+ </div>
+ </div>
+ <& /Elements/EditCustomFields, Object => $Group, Grouping => 'Basics', InTable => 1 &>
+ <div class="form-row">
+ <div class="value col-md-9 offset-md-3">
+ <div class="custom-control custom-checkbox">
+ <input type="hidden" class="hidden" name="SetEnabled" value="1" />
+ <input type="checkbox" id="Enabled" name="Enabled" class="custom-control-input" value="1" <%$EnabledChecked%> />
+ <label class="custom-control-label" for="Enabled"><&|/l&>Enabled (Unchecking this box disables this group)</&></label><br />
+ </div>
+ </div>
+ </div>
+ </&>
+ <div class="form-row">
+ <& /Elements/EditCustomFieldCustomGroupings , Object => $Group, &>
+ </div>
% $m->callback( %ARGS, GroupObj => $Group, results => \@results );
-</table>
% if ( $Create ) {
<& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
diff --git a/share/html/Admin/Groups/index.html b/share/html/Admin/Groups/index.html
index cef2ac9b9..8b6aedf50 100644
--- a/share/html/Admin/Groups/index.html
+++ b/share/html/Admin/Groups/index.html
@@ -50,45 +50,88 @@
<h1><% $caption %></h1>
<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html">
-<input type="hidden" name="GroupField" value="Name" />
-<input type="hidden" name="GroupOp" value="LIKE" />
-<&|/l&>Go to group</&>
-<input type="text" name="GroupString" value="" data-autocomplete="Groups" id="autocomplete-GroupString" />
-<script type="text/javascript">
-jQuery(function(){
- // Jump directly to the page if a group is chosen
- jQuery("#autocomplete-GroupString").on("autocompleteselect", function( event, ui ) {
- document.location = RT.Config.WebPath + "/Admin/Groups/Modify.html?id=" + ui.item.id;
+ <input type="hidden" name="GroupField" value="Name" />
+ <input type="hidden" name="GroupOp" value="LIKE" />
+ <div class="row">
+ <div class="col-xl-6">
+
+ <div class="form-row">
+ <div class="col-md-3 label text-left">
+ <&|/l&>Go to group</&>
+ </div>
+ <div class="col-md-3 value">
+ <input type="text" class="form-control" name="GroupString" value="" data-autocomplete="Groups" id="autocomplete-GroupString" />
+ <script type="text/javascript">
+ jQuery(function(){
+ // Jump directly to the page if a group is chosen
+ jQuery("#autocomplete-GroupString").on("autocompleteselect", function( event, ui ) {
+ document.location = RT.Config.WebPath + "/Admin/Groups/Modify.html?id=" + ui.item.id;
+ });
});
-});
-</script>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
</form>
<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html" name="GroupsAdmin">
-<&|/l&>Find groups whose</&> <& /Elements/SelectGroups,
- GroupField => $GroupField,
- GroupOp => $GroupOp,
- GroupString => $GroupString,
-&><br />
-<&|/l&>And groups whose</&> <& /Elements/SelectGroups,
- SelectFieldName => 'GroupField2',
- SelectOpName => 'GroupOp2',
- InputStringName => 'GroupString2',
- GroupField => $GroupField2,
- GroupOp => $GroupOp2,
- GroupString => $GroupString2,
-&><br />
-<&|/l&>And groups whose</&> <& /Elements/SelectGroups,
- SelectFieldName => 'GroupField3',
- SelectOpName => 'GroupOp3',
- InputStringName => 'GroupString3',
- GroupField => $GroupField3,
- GroupOp => $GroupOp3,
- GroupString => $GroupString3,
-&><br />
-<input type="checkbox" class="checkbox" id="FindDisabledGroups" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> />
-<label for="FindDisabledGroups"><&|/l&>Include disabled groups in listing.</&></label><br />
-<div align="right"><input type="submit" class="button" name="Go" value="<&|/l&>Go!</&>" /></div>
+
+ <div class="row">
+ <div class="col-xl-6">
+
+ <div class="form-row">
+ <div class="col-md-3 label text-left">
+ <&|/l&>Find groups whose</&>
+ </div>
+ <& /Elements/SelectGroups,
+ GroupField => $GroupField,
+ GroupOp => $GroupOp,
+ GroupString => $GroupString,
+ &>
+ </div>
+ <div class="form-row">
+ <div class="col-md-3 label text-left">
+ <&|/l&>And groups whose</&>
+ </div>
+ <& /Elements/SelectGroups,
+ SelectFieldName => 'GroupField2',
+ SelectOpName => 'GroupOp2',
+ InputStringName => 'GroupString2',
+ GroupField => $GroupField2,
+ GroupOp => $GroupOp2,
+ GroupString => $GroupString2,
+ &>
+ </div>
+ <div class="form-row">
+ <div class="col-md-3 label text-left">
+ <&|/l&>And groups whose</&>
+ </div>
+ <& /Elements/SelectGroups,
+ SelectFieldName => 'GroupField3',
+ SelectOpName => 'GroupOp3',
+ InputStringName => 'GroupString3',
+ GroupField => $GroupField3,
+ GroupOp => $GroupOp3,
+ GroupString => $GroupString3,
+ &>
+ </div>
+ <div class="form-row">
+ <div class="col-md-12">
+ <div class="custom-control custom-checkbox">
+ <input type="checkbox" class="checkbox custom-control-input" id="FindDisabledGroups" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> />
+ <label class="custom-control-label" for="FindDisabledGroups"><&|/l&>Include disabled groups in listing.</&></label><br />
+ </div>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12 text-right">
+ <input type="submit" class="form-control btn btn-primary button" name="Go" value="<&|/l&>Go!</&>" />
+ </div>
+ </div>
+ </div>
+ </div>
</form>
% unless ( $Groups->Count ) {
commit 1a137dcfaf6cae835ba5a9a1625be17eb9e03f1b
Merge: 81bd6bae8 43706267d
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Jun 7 23:56:15 2019 +0800
Merge branch '4.6-theme/admin-groups-pages' into 4.6-theme-trunk
-----------------------------------------------------------------------
More information about the rt-commit
mailing list