[Rt-commit] rt branch, 4.6-theme-trunk, updated. rt-4.4.4-261-g64bc92526
? sunnavy
sunnavy at bestpractical.com
Fri May 24 02:12:33 EDT 2019
The branch, 4.6-theme-trunk has been updated
via 64bc92526364e9433b3a3cbd8c1d63f5501dced3 (commit)
via 39b73c67909deb8ec1f8e3812650ed6bf7f25a47 (commit)
from 118631f5a72f7cf26712316e6756b80693718a3c (commit)
Summary of changes:
share/html/SelfService/Article/Search.html | 46 +++++++++++++-----------
share/html/SelfService/Create.html | 8 +++--
share/html/SelfService/Elements/GotoTicket | 2 +-
share/html/SelfService/Elements/RequestUpdate | 35 ++++++++++++------
share/html/SelfService/Elements/SearchArticle | 2 +-
share/html/SelfService/Prefs.html | 41 +++++++++++----------
share/html/SelfService/Update.html | 4 +--
share/html/SelfService/User/Elements/RelatedData | 25 +++++++------
share/static/css/elevator-light/misc.css | 7 ++++
9 files changed, 104 insertions(+), 66 deletions(-)
- Log -----------------------------------------------------------------
commit 39b73c67909deb8ec1f8e3812650ed6bf7f25a47
Author: Craig Kaiser <craig at bestpractical.com>
Date: Fri May 3 10:54:09 2019 -0400
Migrate SelfService pages to elevator theme
diff --git a/share/html/SelfService/Article/Search.html b/share/html/SelfService/Article/Search.html
index e6df774bc..bf899498b 100644
--- a/share/html/SelfService/Article/Search.html
+++ b/share/html/SelfService/Article/Search.html
@@ -47,18 +47,22 @@
%# END BPS TAGGED BLOCK }}}
<& /SelfService/Elements/Header, Title => loc('Search Articles') &>
-<table>
<form action="<%RT->Config->Get('WebPath')%>/SelfService/Article/Search.html">
-<tr>
-<td><&|/l&>Search for Articles matching</&></td>
-<td><input type="text" size=20 name="Articles_Content" /></td>
-<td><input type="submit" value="Search"></td>
-</tr>
+ <div class="form-row">
+ <span class="label col-md-auto">
+ <&|/l&>Search for Articles matching</&>
+ </span>
+ <div class="value col-md-auto">
+ <input class="form-control" type="text" size=20 name="Articles_Content" />
+ </div>
+ <div class="col-md-auto">
+ <input class="form-control btn btn-primary" type="submit" value="Search">
+ </div>
+ </div>
</form>
-<tr>
-<td> </td>
-<td>
+ <div class="form-row">
+ <span class="label col-md-auto">
% if ($Articles_Content) {
% if ($articles_basics->Count || $articles_content->Count) {
<&|/l,$Articles_Content&>Articles matching [_1]</&>
@@ -66,26 +70,28 @@
<&|/l,$Articles_Content&>No Articles match [_1]</&>
% }
% }
-</td>
-</tr>
+ </span>
+ </div>
% my %dedupe_articles;
% while (my $article = $articles_content->Next) {
% $dedupe_articles{$article->Id}++;
-<tr>
-<td> </td>
-<td><a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%><a></td>
-</tr>
+ <div class="form-row">
+ <span class="value col-md-auto">
+ <a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%></a>
+ </span>
+ </div>
% }
% while (my $article = $articles_basics->Next) {
% next if $dedupe_articles{$article->Id};
-<tr>
-<td> </td>
-<td><a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%><a></td>
-</tr>
+ <div class="form-row">
+ <span class="value col-md-auto">
+ <a href="Display.html?id=<%$article->Id%>"><%$article->Name || loc('(no name)')%>: <%$article->Summary%></a>
+ </span>
+ </div>
% }
-</table>
+</div>
<%init>
use RT::Articles;
diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 15c1c6cdf..39eca31b5 100644
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -88,7 +88,7 @@
<&|/l&>Subject</&>:
</span>
<span class="value">
-<input type="text" name="Subject" size="60" maxsize="200" value="<%$ARGS{Subject} || ''%>" />
+<input class="form-control" type="text" name="Subject" size="60" maxsize="200" value="<%$ARGS{Subject} || ''%>" />
</span>
</div>
<& /Elements/EditCustomFields,
@@ -103,7 +103,11 @@
<&|/l&>Describe the issue below</&>:<br />
<& /Elements/MessageBox, Default => $ARGS{Content} || '' &>
-<& /Elements/Submit, Label => loc("Create ticket")&>
+<div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc("Create ticket")&>
+ </div>
+</div>
</&>
diff --git a/share/html/SelfService/Elements/GotoTicket b/share/html/SelfService/Elements/GotoTicket
index c491f0775..f8fbde973 100644
--- a/share/html/SelfService/Elements/GotoTicket
+++ b/share/html/SelfService/Elements/GotoTicket
@@ -46,5 +46,5 @@
%#
%# END BPS TAGGED BLOCK }}}
<form action="<% RT->Config->Get('WebPath') %>/SelfService/Display.html" method="get" id="GotoTicket" name="GotoTicket">
-<input name="id" class="field" placeholder="<&|/l&>Go to Ticket</&>..." type="search"/>
+<input name="id" class="field form-control" placeholder="<&|/l&>Go to Ticket</&>..." type="search"/>
</form>
diff --git a/share/html/SelfService/Elements/RequestUpdate b/share/html/SelfService/Elements/RequestUpdate
index 490a3582a..7c7a87eb7 100644
--- a/share/html/SelfService/Elements/RequestUpdate
+++ b/share/html/SelfService/Elements/RequestUpdate
@@ -53,17 +53,30 @@ action="<%RT->Config->Get('WebPath')%><% $r->path_info %>"
% $m->callback(CallbackName => 'InFormElement');
>
<input type="hidden" class="hidden" name="QuickCreate" value="1" />
- <table>
- <tr class="input-row">
- <td class="label"><&|/l&>Subject</&>:</td>
- <td colspan="3" class="value"><input type="text" size="50" name="Subject" value="<% $args->{Subject} || loc('Please update my user information') %>" /></td>
- </tr>
- <tr class="input-row">
- <td class="labeltop"><&|/l&>Description</&>:</td>
- <td colspan="3" class="value"><textarea name="Content" cols="50" rows="3"><% $args->{Content} || ''%></textarea></td>
- </tr>
- </table>
-<& /Elements/Submit, Label => loc('Submit') &>
+ <div class="form-row">
+ <span class="label col-md-3">
+ <&|/l&>Subject</&>:
+ </span>
+ <div class="value col-md-9">
+ <input class="form-control" type="text" size="50" name="Subject" value="<% $args->{Subject} || loc('Please update my user information') %>" />
+ </div>
+ </div>
+
+ <div class="form-row">
+ <span class="label col-md-3">
+ <&|/l&>Description</&>:
+ </span>
+ <div class="value col-md-9">
+ <textarea class="form-control" name="Content" cols="50" rows="3"><% $args->{Content} || ''%></textarea></td>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Submit') &>
+ </div>
+ </div>
+
</form>
</&>
</div>
diff --git a/share/html/SelfService/Elements/SearchArticle b/share/html/SelfService/Elements/SearchArticle
index f41af331e..c47b5a443 100644
--- a/share/html/SelfService/Elements/SearchArticle
+++ b/share/html/SelfService/Elements/SearchArticle
@@ -46,6 +46,6 @@
%#
%# END BPS TAGGED BLOCK }}}
<form action="<% RT->Config->Get('WebPath') %>/SelfService/Article/Search.html" id="ArticleSearch">
-<input name="Articles_Content" class="field" placeholder="<&|/l&>Search Articles</&>..." type="search" />
+<input name="Articles_Content" class="field form-control" placeholder="<&|/l&>Search Articles</&>..." type="search" />
</form>
diff --git a/share/html/SelfService/Prefs.html b/share/html/SelfService/Prefs.html
index 15a605356..9b64aeb2a 100644
--- a/share/html/SelfService/Prefs.html
+++ b/share/html/SelfService/Prefs.html
@@ -54,23 +54,25 @@
% 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>
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Language</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectLang, Name => 'Lang', Default => $user->Lang &>
+ </div>
+ </div>
+
+ <div class="form-row">
+ <div class="col-md-3 label">
+ <&|/l&>Timezone</&>:
+ </div>
+ <div class="col-md-9 value">
+ <& /Elements/SelectTimezone, Name => 'Timezone', Default => $user->Timezone &>
+ </div>
+ </div>
</&>
-</td>
-<td valign="top">
<&| /Widgets/TitleBox, title => loc('Change password') &>
% if ( $user->__Value('Password') ne '*NO-PASSWORD*' ) {
<& /Elements/EditPassword,
@@ -80,9 +82,12 @@
% }
</&>
-</td></tr></table>
-<br />
-<& /Elements/Submit, Label => loc('Save Changes') &>
+<div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Label => loc('Save Changes') &>
+ </div>
+</div>
+
</form>
% }
diff --git a/share/html/SelfService/Update.html b/share/html/SelfService/Update.html
index 84ec93b4c..89895f61c 100644
--- a/share/html/SelfService/Update.html
+++ b/share/html/SelfService/Update.html
@@ -76,12 +76,12 @@
<&|/l&>Subject</&>
</span>
<span class="value">
- <input type="text" name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $Ticket->Subject || '' %>" />
+ <input class="form-control" type="text" name="UpdateSubject" size="60" value="<% $ARGS{UpdateSubject} || $Ticket->Subject || '' %>" />
</span>
</div>
<& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
- <& /Elements/EditCustomFields, Object => $Ticket, InTable => 1 &>
+ <& /Elements/EditCustomFields, Object => $Ticket &>
</div>
% if (exists $ARGS{UpdateContent}) {
% # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
diff --git a/share/html/SelfService/User/Elements/RelatedData b/share/html/SelfService/User/Elements/RelatedData
index dee238e1f..5673bd65a 100644
--- a/share/html/SelfService/User/Elements/RelatedData
+++ b/share/html/SelfService/User/Elements/RelatedData
@@ -50,19 +50,22 @@
title => loc("Download My Data"),
&>
-<div>
-<div id="download-my-data" class="inline-row">
- <div class="inline-cell">
- <a href="/SelfService/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="button"><% $UserDataButton %></a>
- <i class="label"><&|/l&>Base user data</&></i>
- </div>
- <div class="inline-cell">
- <a href="/SelfService/Search/Results.tsv?UserData=1&Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="button"><% $UserTicketsButton %></a>
+ <div id="download-my-data" class="download-user-data-buttons">
+ <div class="form-row">
+ <div class="inline-cell col-md-auto">
+ <a class="button btn btn-primary" href="/SelfService/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="form-control btn btn-primary btn-sm"><% $UserDataButton %></a>
+ <i class="label"><&|/l&>Base user data</&></i>
+ </div>
+
+ <div class="inline-cell col-md-auto">
+ <a class="button btn btn-primary" href="/SelfService/Search/Results.tsv?UserData=1&Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="form-control btn btn-primary btn-sm"><% $UserTicketsButton %></a>
<i class="label"><&|/l&>Tickets with you as a requestor</&></i>
- </div>
- <div class="inline-cell">
- <a href="/SelfService/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="button"><% $UserTxnButton %></a>
+ </div>
+
+ <div class="inline-cell col-md-auto">
+ <a class="button btn btn-primary" href="/SelfService/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="form-control btn btn-primary btn-sm"><% $UserTxnButton %></a>
<i class="label"><&|/l&>Replies you sent</&></i>
+ </div>
</div>
</div>
</&>
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index e9cea321f..a6e12b26f 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -37,3 +37,10 @@ table.myday h2 {
table.myday td {
padding: 0.25em
}
+
+#download-my-data div.form-row i {
+ text-align: left;
+ display: block;
+ font-size: 0.8em;
+ white-space: normal;
+}
commit 64bc92526364e9433b3a3cbd8c1d63f5501dced3
Merge: 118631f5a 39b73c679
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri May 24 14:07:52 2019 +0800
Merge branch '4.6-theme/selfservice-pages' into 4.6-theme-trunk
-----------------------------------------------------------------------
More information about the rt-commit
mailing list