[Rt-commit] rt branch, 4.6-theme/prefs-pages, created. rt-4.4.4-202-ga19146c2c
Craig Kaiser
craig at bestpractical.com
Tue Apr 30 10:19:43 EDT 2019
The branch, 4.6-theme/prefs-pages has been created
at a19146c2ce653e56a4a18e9ff7e2de330705bf1d (commit)
- Log -----------------------------------------------------------------
commit a19146c2ce653e56a4a18e9ff7e2de330705bf1d
Author: Craig Kaiser <craig at bestpractical.com>
Date: Tue Apr 30 09:46:34 2019 -0400
Migrate Prefs pages for elevator theme
diff --git a/share/html/Prefs/Elements/EditAboutMe b/share/html/Prefs/Elements/EditAboutMe
index 85e64a378..2a244664d 100644
--- a/share/html/Prefs/Elements/EditAboutMe
+++ b/share/html/Prefs/Elements/EditAboutMe
@@ -48,130 +48,238 @@
<form name="EditAboutMe" action="" method="post">
<input type="hidden" class="hidden" name="id" value="<%$UserObj->Id%>" />
-<table width="100%" border="0">
-<tr>
-<td valign="top" class="boxcontainer">
-<&| /Widgets/TitleBox, title => loc('Identity'), id => "user-prefs-identity" &>
-<input type="hidden" class="hidden" name="Name" value="<%$UserObj->Name%>" />
-<table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Email</&>: </td>
- <td class="value"><input type="text" name="EmailAddress" value="<%$UserObj->EmailAddress%>" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Real Name</&>:</td>
- <td class="value"><input type="text" name="RealName" value="<%$UserObj->RealName%>" /></td> </tr>
- <tr>
- <td class="label"><&|/l&>Nickname</&>:</td>
- <td class="value"><input type="text" name="NickName" value="<%$UserObj->NickName || ''%>" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Language</&>:</td>
- <td class="value"><& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Timezone</&>:</td>
- <td class="value"><& /Elements/SelectTimezone, Name => 'Timezone', Default => $UserObj->Timezone &></td>
- </tr>
-<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
-</table>
-</&>
-<&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &>
-<table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Residence</&>:</td>
- <td class="value"><input type="tel" name="HomePhone" value="<%$UserObj->HomePhone || ''%>" size="13" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Work</&>:</td>
- <td class="value"><input type="tel" name="WorkPhone" value="<%$UserObj->WorkPhone || ''%>" size="13" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Mobile</&>:</td>
- <td class="value"><input type="tel" name="MobilePhone" value="<%$UserObj->MobilePhone || ''%>" size="13" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Pager</&>:</td>
- <td class="value"><input type="tel" name="PagerPhone" value="<%$UserObj->PagerPhone || ''%>" size="13" /></td>
- </tr>
-<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &>
-</table>
-</&>
+<div class="col-md-12">
+ <div class="form-row">
+ <div class="col-md-8">
+ <&| /Widgets/TitleBox, title => loc('Identity'), id => "user-prefs-identity" &>
+ <input type="hidden" class="hidden" name="Name" value="<%$UserObj->Name%>" />
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Email</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="EmailAddress" value="<%$UserObj->EmailAddress%>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Real Name</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="RealName" value="<%$UserObj->RealName%>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Nickname</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="NickName" value="<%$UserObj->NickName || ''%>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Language</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Timezone</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectTimezone, Name => 'Timezone', Default => $UserObj->Timezone &>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-12">
+ <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
+ </div>
+ </div>
+ </&>
+ </div>
+
+ <div class="col-md-4">
+ <&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Residence</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="tel" name="HomePhone" value="<%$UserObj->HomePhone || ''%>" size="13" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Work</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="tel" name="WorkPhone" value="<%$UserObj->WorkPhone || ''%>" size="13" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Mobile</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input type="tel" name="MobilePhone" value="<%$UserObj->MobilePhone || ''%>" size="13" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Pager</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="tel" name="PagerPhone" value="<%$UserObj->PagerPhone || ''%>" size="13" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-12">
+ <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &>
+ </div>
+ </div>
+ </&>
+ </div>
+ </div>
+
+ <div class="form-row">
%if ($UserObj->Privileged) {
-<&| /Widgets/TitleBox, title => loc('Signature'), id => "user-prefs-signature" &>
-<textarea cols="80" rows="5" name="Signature" class="signature" wrap="hard">
-<%$UserObj->Signature || ''%></textarea>
-</&>
+ <div class="col-md-4">
+ <&| /Widgets/TitleBox, title => loc('Signature'), id => "user-prefs-signature" &>
+ <textarea class="form-control" cols="80" rows="5" name="Signature" class="signature" wrap="hard">
+ <%$UserObj->Signature || ''%></textarea>
+ </&>
+ </div>
% }
% $m->callback( %ARGS, UserObj => $UserObj, CallbackName => 'FormLeftColumn' );
-</td>
-<td valign="top" class="boxcontainer">
-<&| /Widgets/TitleBox, title => loc( $AccessControlName ), id => "user-prefs-access-control" &>
+ <div class="col-md-4">
+ <&| /Widgets/TitleBox, title => loc( $AccessControlName ), id => "user-prefs-access-control" &>
% if ( $UserObj->__Value('Password') ne '*NO-PASSWORD*' ) {
-<& /Elements/EditPassword,
- User => $UserObj,
- Name => $PasswordName,
-&>
+ <& /Elements/EditPassword,
+ User => $UserObj,
+ Name => $PasswordName,
+ &>
% }
-<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Access control' &>
-</&>
+ <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Access control' &>
+ </&>
+ </div>
%my $AdminUser = $session{'CurrentUser'}->HasRight( Object => RT->System, Right => 'AdminUsers' );
-<&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &>
-<table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Organization</&>:</td>
+ <div class="col-md-4">
+ <&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Organization</&>:
+ </div>
+ <div class="col-md-9 value">
%if ( $AdminUser ) {
- <td class="value"><input type="text" name="Organization" value="<%$UserObj->Organization || ''%>" /></td>
+ <input class="form-row" type="text" name="Organization" value="<%$UserObj->Organization || ''%>" />
%} else {
- <td class="value"><%$UserObj->Organization || ''%></td>
+ <%$UserObj->Organization || ''%>
%}
- </tr>
- <tr>
- <td class="label"><&|/l&>Address1</&>:</td>
- <td class="value"><input type="text" name="Address1" value="<%$UserObj->Address1 || ''%>" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Address2</&>:</td>
- <td class="value"><input type="text" name="Address2" value="<%$UserObj->Address2 || ''%>" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>City</&>:</td>
- <td><input type="text" name="City" value="<%$UserObj->City || ''%>" size="14" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>State</&>:</td>
- <td class="value"><input type="text" name="State" value="<%$UserObj->State || ''%>" size="3" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Zip</&>:</td>
- <td class="value"><input type="text" name="Zip" value="<%$UserObj->Zip || ''%>" size="9" /></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Country</&>:</td>
- <td class="value"><input type="text" name="Country" value="<%$UserObj->Country || ''%>" /></td>
- </tr>
-<& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
-</table>
-</&>
-<& /Elements/EditCustomFieldCustomGroupings, Object => $UserObj &>
-
-<& /Elements/Submit, Label => loc('Save Preferences') &>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Address1</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="Address1" value="<%$UserObj->Address1 || ''%>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Address2</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input type="text" name="Address2" value="<%$UserObj->Address2 || ''%>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>City</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="City" value="<%$UserObj->City || ''%>" size="14" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>State</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="State" value="<%$UserObj->State || ''%>" size="3" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Zip</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input type="text" name="Zip" value="<%$UserObj->Zip || ''%>" size="9" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Country</&>:
+ </div>
+ <div class="col-md-9 value">
+ <input class="form-control" type="text" name="Country" value="<%$UserObj->Country || ''%>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/EditCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
+ </div>
+ </div>
+ </&>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/EditCustomFieldCustomGroupings, Object => $UserObj &>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save Preferences') &>
+ </div>
+ </div>
%if ( $AdminUser ) {
-<&| /Widgets/TitleBox, title => loc('Secret authentication token'), id => "user-prefs-feeds" &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <&| /Widgets/TitleBox, title => loc('Secret authentication token'), id => "user-prefs-feeds" &>
-<&|/l&>All iCal feeds embed a secret token which authorizes you. If the URL for one of your iCal feeds was exposed to the outside world, you can get a new secret, <b>breaking all existing iCal feeds</b>, below.</&>
+ <&|/l&>All iCal feeds embed a secret token which authorizes you. If the URL for one of your iCal feeds was exposed to the outside world, you can get a new secret, <b>breaking all existing iCal feeds</b>, below.</&>
-<a href="#" id="ResetAuthTokenPrompt" style="display: none">
- <&|/l&>I want to reset my secret token.</&>
-</a>
-<& /Elements/Submit,
- Label => loc('Reset secret authentication token'),
- Name => "ResetAuthToken",
- id => "ResetAuthTokenContainer" &>
+ <a href="#" id="ResetAuthTokenPrompt" style="display: none">
+ <&|/l&>I want to reset my secret token.</&>
+ </a>
+ <& /Elements/Submit,
+ Label => loc('Reset secret authentication token'),
+ Name => "ResetAuthToken",
+ id => "ResetAuthTokenContainer" &>
<script>
jQuery("#ResetAuthTokenContainer").hide();
jQuery("#ResetAuthTokenPrompt").show().click(function(ev){
@@ -180,13 +288,13 @@
ev.preventDefault();
});
</script>
-</&>
+ </&>
+ </div>
+ </div>
%}
% $m->callback( %ARGS, UserObj => $UserObj, CallbackName => 'FormRightColumn' );
-</td>
-</tr>
-</table>
+</div>
<%ARGS>
$UserObj
diff --git a/share/html/Prefs/Elements/ShowAboutMe b/share/html/Prefs/Elements/ShowAboutMe
index d3daa456d..1cccb3878 100644
--- a/share/html/Prefs/Elements/ShowAboutMe
+++ b/share/html/Prefs/Elements/ShowAboutMe
@@ -45,104 +45,203 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<table width="100%" border="0">
- <tr>
- <td valign="top" class="boxcontainer">
+<div class="col-md-12">
+ <div class="form-row">
+ <div class="col-md-8">
<&| /Widgets/TitleBox, title => loc('Identity'), id => "user-prefs-identity" &>
- <input type="hidden" class="hidden" name="Name" value="<%$UserObj->Name%>" />
- <table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Email</&>:</td>
- <td class="value"><%$UserObj->EmailAddress%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Real Name</&>:</td>
- <td class="value"><%$UserObj->RealName%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Nickname</&>:</td>
- <td class="value"><%$UserObj->NickName || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Language</&>:</td>
+ <input type="hidden" class="hidden" name="Name" value="<%$UserObj->Name%>" />
+ <div class="col-md-12">
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Email</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->EmailAddress%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Real Name</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->RealName%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Nickname</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->NickName || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Language</&>:
+ </div>
+ <div class="col-md-9 value">
% if ( $UserObj->Lang ) {
- <td class="value"><&|/l, $lang &>[_1]</&></td>
+ <&|/l, $lang &>[_1]</&>
% } else {
- <td class="value"><&|/l&>System Default</&> (<% I18N::LangTags::List::name($session{CurrentUser}->LanguageHandle->language_tag) %>)</td>
+ <&|/l&>System Default</&> (<% I18N::LangTags::List::name($session{CurrentUser}->LanguageHandle->language_tag) %>)
% }
- </tr>
- <tr>
- <td class="label"><&|/l&>Timezone</&>:</td>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Timezone</&>:
+ </div>
+ <div class="col-md-9 value">
% if ( $UserObj->Timezone ) {
- <td class="value"><%$UserObj->Timezone%></td>
+ <%$UserObj->Timezone%>
% } else {
- <td class="value"><&|/l&>System Default</&> (<% RT->Config->Get('Timezone') %>)</td>
+ <&|/l&>System Default</&> (<% RT->Config->Get('Timezone') %>)
% }
- </tr>
- <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
- </table>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>
+ </div>
+ </div>
+
+ </div>
</&>
+ </div>
+ <div class="col-md-4">
<&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &>
- <table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Residence</&>:</td>
- <td class="value"><%$UserObj->HomePhone || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Work</&>:</td>
- <td class="value"><%$UserObj->WorkPhone || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Mobile</&>:</td>
- <td class="value"><%$UserObj->MobilePhone || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Pager</&>:</td>
- <td class="value"><%$UserObj->PagerPhone || ''%></td>
- </tr>
- <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &>
- </table>
+ <div class="col-md-12">
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Residence</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->HomePhone || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Work</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->WorkPhone || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Mobile</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->MobilePhone || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Pager</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->PagerPhone || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Phones', InTable => 1 &>
+ </div>
+ </div>
+ </div>
</&>
- </td>
- <td valign="top" class="boxcontainer">
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-4">
<&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &>
- <table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Organization</&>:</td>
- <td class="value"><%$UserObj->Organization || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Address1</&>:</td>
- <td class="value"><%$UserObj->Address1 || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Address2</&>:</td>
- <td class="value"><%$UserObj->Address2 || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>City</&>:</td>
- <td class="value"><%$UserObj->City || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>State</&>:</td>
- <td class="value"><%$UserObj->State || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Zip</&>:</td>
- <td class="value"><%$UserObj->Zip || ''%></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Country</&>:</td>
- <td class="value"><%$UserObj->Country || ''%></td>
- </tr>
- <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
- </table>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Organization</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->Organization || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Address1</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->Address1 || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Address2</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->Address2 || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>City</&>:</td>
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->City || ''%>
+ </doiv>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>State</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->State || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Zip</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->Zip || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Country</&>:
+ </div>
+ <div class="col-md-9 value">
+ <%$UserObj->Country || ''%>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Location', InTable => 1 &>
+ </div>
+ </div>
</&>
- <& /Elements/ShowCustomFieldCustomGroupings, Object => $UserObj &>
- </td>
- </tr>
-</table>
+ </div>
+ </div>
+ <div class="form-row">
+ <& /Elements/ShowCustomFieldCustomGroupings, Object => $UserObj &>
+ </div>
+</div>
<%INIT>
use I18N::LangTags::List;
my $lang = I18N::LangTags::List::name( $UserObj->Lang );
diff --git a/share/html/Prefs/QueueList.html b/share/html/Prefs/QueueList.html
index 1df3bc46d..70ee8d08f 100644
--- a/share/html/Prefs/QueueList.html
+++ b/share/html/Prefs/QueueList.html
@@ -51,18 +51,22 @@
<& /Elements/ListActions, actions => \@actions &>
<h1><&|/l&>Select queues to be displayed on the "RT at a glance" page</&></h1>
<form method="post" action="QueueList.html" name="Preferences">
-<ul>
+<div class="col-md-12">
+ <ul class="list-group">
% for my $queue (@queues) {
-<li><input type="checkbox" class="checkbox" id="Want-<%$queue->Name%>" name="Want-<%$queue->Name%>" value="1"
+ <li class="list-item">
+ <div class="custom-control custom-checkbox">
+ <input class="custom-control-input" type="checkbox" class="checkbox" id="Want-<%$queue->Name%>" name="Want-<%$queue->Name%>" value="1"
% unless ($unwanted->{$queue->Name}) {
checked="checked"
% }
-/>
-<label for="Want-<%$queue->Name%>"><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></label>
-</li>
+ />
+ <label class="custom-control-label" for="Want-<%$queue->Name%>"><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></label>
+ </div>
+ </li>
% }
-</ul>
-<& /Elements/Submit,
+ </ul>
+ <& /Elements/Submit,
Caption => loc("Save Changes"),
Label => loc('Save'),
Name => 'Save',
@@ -70,8 +74,8 @@ checked="checked"
CheckAll => 1,
ClearAll => 1,
CheckboxNameRegex => '/^Want-/',
- &>
-
+ &>
+</div>
</form>
<%INIT>
diff --git a/share/html/Prefs/Search.html b/share/html/Prefs/Search.html
index 7c7f5f557..60382c52b 100644
--- a/share/html/Prefs/Search.html
+++ b/share/html/Prefs/Search.html
@@ -49,6 +49,8 @@
<& /Elements/Tabs
&>
<& /Elements/ListActions, actions => \@actions &>
+
+<div class="col-md-12">
% if ($session{'CurrentUser'}->HasRight( Object=> $RT::System, Right => 'SuperUser')) {
<p>
<&|/l&>You can also edit the predefined search itself</&>:
@@ -62,10 +64,11 @@
<input type="hidden" name="name" value="<%$ARGS{name}%>" class="hidden" />
<input type="hidden" name="Format" value="<%$ARGS{Format}%>" class="hidden" />
-<& /Search/Elements/DisplayOptions, %$SearchArg, %ARGS,
- AvailableColumns => $AvailableColumns, CurrentFormat => $CurrentFormat &>
-<& /Elements/Submit, Caption => loc("Save Changes"), Label => loc('Save'), Name => 'Save'&>
-
+ <div class="form-row">
+ <& /Search/Elements/DisplayOptions, %$SearchArg, %ARGS,
+ AvailableColumns => $AvailableColumns, CurrentFormat => $CurrentFormat &>
+ <& /Elements/Submit, Caption => loc("Save Changes"), Label => loc('Save'), Name => 'Save'&>
+ </div>
</form>
<&|/Widgets/TitleBox, title => loc("Reset") &>
@@ -75,7 +78,7 @@
<input type="submit" class="button" name="ResetSearchOptions" value="<% loc('Reset to default') %>">
</form>
</&>
-
+</div>
<%INIT>
my @actions;
my $title = loc("Customize").' ';
diff --git a/share/html/SelfService/Prefs.html b/share/html/SelfService/Prefs.html
index 15a605356..63766cfc3 100644
--- a/share/html/SelfService/Prefs.html
+++ b/share/html/SelfService/Prefs.html
@@ -54,35 +54,49 @@
% if ( $pref eq 'edit-prefs' || $pref eq 'edit-prefs-view-info' ) {
<form method="post">
-<table width="100%" border="0">
-<tr>
-<td valign="top" class="boxcontainer" width=50%>
-<&| /Widgets/TitleBox, title => loc('Locale'), id => "user-prefs-identity" &>
-<table cellspacing="0" cellpadding="0">
- <tr>
- <td class="label"><&|/l&>Language</&>:</td>
- <td class="value"><& /Elements/SelectLang, Name => 'Lang', Default => $user->Lang &></td>
- </tr>
- <tr>
- <td class="label"><&|/l&>Timezone</&>:</td>
- <td class="value"><& /Elements/SelectTimezone, Name => 'Timezone', Default => $user->Timezone &></td>
- </tr>
-</table>
-</&>
-</td>
-<td valign="top">
-<&| /Widgets/TitleBox, title => loc('Change password') &>
+<div class="col-md-12">
+ <div class="form-row">
+ <div class="col-md-6">
+ <&| /Widgets/TitleBox, title => loc('Locale'), id => "user-prefs-identity" &>
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Language</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectLang, Name => 'Lang', Default => $user->Lang &>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="label col-md-3">
+ <&|/l&>Timezone</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectTimezone, Name => 'Timezone', Default => $user->Timezone &>
+ </div>
+ </div>
+ </&>
+ </div>
+
+ <div class="col-md-6">
+ <&| /Widgets/TitleBox, title => loc('Change password') &>
% if ( $user->__Value('Password') ne '*NO-PASSWORD*' ) {
-<& /Elements/EditPassword,
- User => $user,
- Name => $password,
-&>
+ <& /Elements/EditPassword,
+ User => $user,
+ Name => $password,
+ &>
% }
-</&>
+ </&>
+ </div>
+
+ </div>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save Changes') &>
+ </div>
+ </div>
+</div>
-</td></tr></table>
-<br />
-<& /Elements/Submit, Label => loc('Save Changes') &>
</form>
% }
-----------------------------------------------------------------------
More information about the rt-commit
mailing list