diff options
| -rw-r--r-- | extensions/BMO/lib/Reports.pm | 6 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/pages/user_activity.html.tmpl | 39 | ||||
| -rw-r--r-- | extensions/BMO/web/styles/reports.css | 5 |
3 files changed, 28 insertions, 22 deletions
diff --git a/extensions/BMO/lib/Reports.pm b/extensions/BMO/lib/Reports.pm index cae19b05d..3337963b9 100644 --- a/extensions/BMO/lib/Reports.pm +++ b/extensions/BMO/lib/Reports.pm @@ -208,6 +208,7 @@ sub user_activity_report { my $operation = {}; my $changes = []; my $incomplete_data = 0; + my %bug_ids; foreach my $entry (@$list) { my ($fieldname, $bugid, $attachid, $when, $removed, $added, $who, @@ -256,6 +257,8 @@ sub user_activity_report { $changes = []; } + $bug_ids{$bugid} = 1; + $operation->{'bug'} = $bugid; $operation->{'who'} = $who; $operation->{'when'} = $when; @@ -285,6 +288,9 @@ sub user_activity_report { $vars->{'incomplete_data'} = $incomplete_data; $vars->{'operations'} = \@operations; + + my @bug_ids = sort { $a <=> $b } keys %bug_ids; + $vars->{'bug_ids'} = \@bug_ids; } $vars->{'action'} = $input->{'action'}; diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl index b42a9d797..dd9449b3d 100644 --- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl +++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl @@ -28,17 +28,9 @@ title = "User Activity Report" _ who_title yui = [ 'autocomplete', 'calendar' ] javascript_urls = [ "js/util.js", "js/field.js" ] -%] - -<style> -#report tr:hover { - background: #dddddd; -} + style_urls = [ "extensions/BMO/web/styles/reports.css" ] -#report-header { - background: #dddddd; -} -</style> +%] [% PROCESS "global/field-descs.none.tmpl" %] [% PROCESS bug/time.html.tmpl %] @@ -46,11 +38,12 @@ <form id="activity_form" name="activity_form" action="page.cgi" method="get"> <input type="hidden" name="id" value="user_activity.html"> <input type="hidden" name="action" value="run"> -<table> +<table id="parameters"> + <tr> - <td> - <b>Who</b>: - </td> + <th> + Who: + </th> <td> [% INCLUDE global/userselect.html.tmpl id => "who" @@ -62,9 +55,9 @@ %] </td> - <td> - <b>Period</b>: - </td> + <th> + Period: + </th> <td> <input type="text" id="from" name="from" size="11" align="right" value="[% from FILTER html %]" maxlength="10" @@ -73,11 +66,7 @@ onclick="showCalendar('from')"><span>Calendar</span> </button> <div id="con_calendar_from"></div> - </td> - <td> - - - </td> - <td> + to <input type="text" name="to" size="11" id="to" align="right" value ="[% to FILTER html %]" maxlength="10" onchange="updateCalendarFromField(this)"> @@ -90,6 +79,7 @@ <input type="submit" id="run" value="Generate Report"> </td> </tr> + </table> </form> @@ -158,6 +148,11 @@ </tr> [% END %] </table> + <p> + <a href="buglist.cgi?bug_id=[% bug_ids.join(',') FILTER url_quote %]"> + Show as a [% terms.Bug %] List</a> + </p> + [% ELSE %] <p> No changes. diff --git a/extensions/BMO/web/styles/reports.css b/extensions/BMO/web/styles/reports.css index f75f72b8b..fa2acf8d3 100644 --- a/extensions/BMO/web/styles/reports.css +++ b/extensions/BMO/web/styles/reports.css @@ -6,6 +6,11 @@ width: 20em; } +#parameters th { + text-align: left; + vertical-align: middle !important; +} + #report tr.bugitem:hover { background: #ccccff; } |