[Bps-public-commit] RT-BugTracker-Public branch, 5.0-updates, updated. 1.00-40-g865da04
? sunnavy
sunnavy at bestpractical.com
Thu Feb 25 14:04:57 EST 2021
The branch, 5.0-updates has been updated
via 865da04903cc93d48f2dc57f8e9ec66fb51eba15 (commit)
via 7ce1a1346c014317cee151a11864978ad9eeda56 (commit)
from 46e16e882a41c1727620cf4ee73a2f287853c2b9 (commit)
Summary of changes:
.../BugTracker-Public/Elements/Tabs/Privileged | 2 +-
html/Public/Dist/Display.html | 15 ++++++--
html/Public/Elements/DistributionList | 19 +++++-----
html/Public/Elements/ErrorNoDist | 2 +-
html/Public/Elements/ErrorNoUser | 2 +-
html/Public/index.html | 42 +++++++++++++++++-----
6 files changed, 60 insertions(+), 22 deletions(-)
- Log -----------------------------------------------------------------
commit 7ce1a1346c014317cee151a11864978ad9eeda56
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Feb 26 02:48:05 2021 +0800
Switch to "__Active__" to be consistent with RT core
diff --git a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
index e337e22..e1a0df0 100644
--- a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
+++ b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
@@ -135,7 +135,7 @@ if ( $queue and $queue->id ) {
my $escaped = $m->interp->apply_escapes($queue->Name, 'u');
PageMenu()->child(
active_bugs => title => loc("Active bugs"),
- path => "/Public/Dist/Display.html?Status=Active;Name=" . $escaped,
+ path => "/Public/Dist/Display.html?Status=__Active__;Name=" . $escaped,
);
PageMenu()->child( resolved_bugs =>
diff --git a/html/Public/Dist/Display.html b/html/Public/Dist/Display.html
index ea5342e..8fe8645 100755
--- a/html/Public/Dist/Display.html
+++ b/html/Public/Dist/Display.html
@@ -77,7 +77,18 @@ unless ( $QueueObj->id ) {
}
$ARGS{'Name'} = $Name = $QueueObj->Name;
-my $title = loc( "$Status bugs for [_1]", $Name );
+my $status_text;
+if ( $Status =~ /__active__/i ) {
+ $status_text = loc('Active');
+}
+elsif ( $Status =~ /__inactive__/i ) {
+ $status_text = loc('Inactive');
+}
+else {
+ $status_text = $Status;
+}
+
+my $title = loc( "[_1] bugs for [_2]", $status_text, $Name );
my $current_tab = "Public/Dist/Display.html"
."?Status=". $m->interp->apply_escapes($Status, 'u')
@@ -91,5 +102,5 @@ $base_url .= '&';
$Name => undef
# Queue is an alias for Name, Name has higher precendance
$Queue => undef
-$Status => 'Active'
+$Status => '__Active__'
</%ARGS>
commit 865da04903cc93d48f2dc57f8e9ec66fb51eba15
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Feb 26 02:54:26 2021 +0800
Sync UI changes from rt-bugtracker
diff --git a/html/Public/Elements/DistributionList b/html/Public/Elements/DistributionList
index 3d1f29b..c145c9f 100644
--- a/html/Public/Elements/DistributionList
+++ b/html/Public/Elements/DistributionList
@@ -45,23 +45,25 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<div class="dist-list">
-<ul>
+<div class="dist-list row mt-2">
+ <div class="col-6">
+ <ul class="list-group">
% my $count = $queues->Count;
% my $broken = 0;
%
% while (my $queue = $queues->Next) {
-%
+%
% if ($count > 10
% and not $broken
% and $queues->_ItemsCounter >= $count / 2)
% {
% $broken = 1;
-</ul>
-
-<ul>
+ </ul>
+ </div>
+ <div class="col-6">
+ <ul class="list-group">
% }
- <li>
+ <li class="list-group-item">
<span class="dist-actions">
<a href="<% $RT::WebPath %>/Public/Dist/Display.html?Name=<% $queue->Name |u %>">Bug list</a>
% if (RT->Config->Get('WebPublicUserReporting')) {
@@ -72,7 +74,8 @@
<strong><% $queue->Name %></strong>
</li>
% }
-</ul>
+ </ul>
+ </div>
</div>
<%args>
diff --git a/html/Public/Elements/ErrorNoDist b/html/Public/Elements/ErrorNoDist
index dcad339..8aa0916 100644
--- a/html/Public/Elements/ErrorNoDist
+++ b/html/Public/Elements/ErrorNoDist
@@ -48,7 +48,7 @@
<& /Elements/Header, Title => loc("Unable to find distribution") &>
<& /Elements/Tabs &>
-<p>
+<p class="mt-2">
% if ($Queue) {
The distribution you specified, <strong><% $Queue %></strong>, could not be found.
% }
diff --git a/html/Public/Elements/ErrorNoUser b/html/Public/Elements/ErrorNoUser
index 8c94954..c71a323 100644
--- a/html/Public/Elements/ErrorNoUser
+++ b/html/Public/Elements/ErrorNoUser
@@ -48,7 +48,7 @@
<& /Elements/Header, Title => loc("Unable to find user") &>
<& /Elements/Tabs &>
-<p>
+<p class="mt-2">
The user you specified, <strong><% $Name %></strong>, could not be found.
</p>
diff --git a/html/Public/index.html b/html/Public/index.html
index a1110f7..29b0e9c 100755
--- a/html/Public/index.html
+++ b/html/Public/index.html
@@ -53,26 +53,50 @@
% unless (RT->Config->Get('BugTracker_ShowAllDistributions')) {
<p>
<form action="<% RT->Config->Get('WebPath') %><% $m->request_path %>" method="get">
- <label for="form-dist-name"><&|/l&>Find a distribution by full name:</&></label>
- <input type="text" name="Distribution" id="form-dist-name" data-autocomplete="Queues" data-autocomplete-autosubmit=1 />
- <input type="submit" class="button" value="<&|/l&>Search</&>" />
+ <div class="form-row">
+ <div class="col-auto label">
+ <&|/l&>Find a distribution by full name:</&>
+ </div>
+ <div class="col-auto">
+ <input type="text" name="Distribution" data-autocomplete="Queues" data-autocomplete-autosubmit=1 autocomplete="off" />
+ </div>
+ <div class="col-auto">
+ <input type="submit" class="button btn btn-primary form-control" value="<&|/l&>Search</&>" />
+ </div>
+ </div>
</form>
</p>
<p>
<form action="<% RT->Config->Get('WebPath') %><% $m->request_path %>" method="get">
- <label for="form-dist-maint"><&|/l&>Find distributions by maintainer:</&></label>
- <input type="text" name="Maintainer" id="form-dist-maint" data-autocomplete="Users" data-autocomplete-autosubmit=1 />
- <input type="submit" class="button" value="<&|/l&>Search</&>" />
+ <div class="form-row">
+ <div class="col-auto label">
+ <&|/l&>Find distributions by maintainer:</&>
+ </div>
+ <div class="col-auto">
+ <input class="form-control" type="text" name="Maintainer" id="form-dist-maint" data-autocomplete="Users" data-autocomplete-autosubmit=1 autocomplete="off" />
+ </div>
+ <div class="col-auto">
+ <input type="submit" class="button btn btn-primary form-control" value="<&|/l&>Search</&>" />
+ </div>
+ </div>
</form>
</p>
% }
<p>
<form action="/Public/Search/Simple.html" method="get">
- <label for="form-simple-query"><&|/l&>General search:</&></label>
- <input type="text" name="q" id="form-simple-query" />
- <input type="submit" class="button" value="<&|/l&>Search</&>" />
+ <div class="form-row">
+ <div class="col-auto label">
+ <&|/l&>General search:</&>
+ </div>
+ <div class="col-auto">
+ <input class="form-control" type="text" name="q" id="form-simple-query" />
+ </div>
+ <div class="col-auto">
+ <input type="submit" class="button btn btn-primary form-control" value="<&|/l&>Search</&>" />
+ </div>
+ </div>
</form>
<&|/l&>This search looks for bug report IDs, distribution names, usernames, and bug report descriptions among other fields.</&>
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list