X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FElements%2FChart;h=05a0422b1f2c780216ec1e2634c795ff86d0237f;hp=e25a9efd0b7851076d33e752ed77436fdf5b554f;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984

diff --git a/rt/share/html/Search/Elements/Chart b/rt/share/html/Search/Elements/Chart
index e25a9efd0..05a0422b1 100644
--- a/rt/share/html/Search/Elements/Chart
+++ b/rt/share/html/Search/Elements/Chart
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -48,7 +48,6 @@
 <%args>
 $Query => "id > 0"
 $PrimaryGroupBy => 'Queue'
-$SecondaryGroupBy => undef
 $ChartStyle => 'bars'
 </%args>
 <%init>
@@ -89,65 +88,66 @@ my %loc_keys;
 foreach my $key (@keys) { $data{$key} = shift @values; $loc_keys{$key} = loc($key); }
 my @sorted_keys = map { $loc_keys{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
 my @sorted_values = map { $data{$_}} sort { $loc_keys{$a} cmp $loc_keys{$b} } keys %loc_keys;
-
-
 my $query_string = $m->comp('/Elements/QueryString', %ARGS);
-</%init>
-
-<% loc('Query:') %>&nbsp;<% $Query %><br />
 
+my ($i,$total);
+</%init>
+<div class="chart-wrapper">
+<span class="chart image">
 % if (RT->Config->Get('DisableGD')) {
 <% loc('Graphical charts are not available.') %><br />
 % } else {
-<img src="<%RT->Config->Get('WebPath')%>/Search/Chart?<%$query_string|n%>" /><br />
+<img src="<%RT->Config->Get('WebPath')%>/Search/Chart?<%$query_string|n%>" />
 % }
-
-<table class="collection-as-table">
+</span>
+<table class="collection-as-table chart">
 <tr>
 <th class="collection-as-table"><% loc($tix->Label($PrimaryGroupBy)) %>
 </th>
 <th class="collection-as-table"><&|/l&>Tickets</&>
 </th>
 </tr>
-% my ($i,$total);
-% while (my $key = shift @sorted_keys) {
-% $i++;
-% my $value = shift @sorted_values;
-% $total += $value;
-<tr class="<%$i%2 ? 'evenline' : 'oddline' %>">
+<%perl>
+ while (my $key = shift @sorted_keys) {
+ $i++;
+ my $value = shift @sorted_values;
+ $total += $value;
+</%perl>
+<tr class="<% $i%2 ? 'evenline' : 'oddline' %>">
+<%perl>
+# TODO sadly we don't have "creator.city is null" or alike support yet
+# so no link if the key is undef for now
+ if ( $PrimaryGroupBy !~ /(Hourly|Daily|Monthly|Annually)$/
+        && $key ne loc('(no value)') ) {
+ my $group = $PrimaryGroupBy; $group =~ s! !.!;
+ my %orig_keys = reverse %loc_keys;
+ my $QueryString = $m->comp('/Elements/QueryString',
+           Query => "$Query and $group = '$orig_keys{$key}'",
+                           Format  => $ARGS{Format},
+                           Rows    => $ARGS{Rows},
+                           OrderBy => $ARGS{OrderBy},
+                           Order   => $ARGS{Order},
+                         );
+</%perl>
 <td class="label collection-as-table">
-%# TODO sadly we don't have "creator.city is null" or alike support yet
-%# so no link if the key is undef for now
-% if ( $PrimaryGroupBy !~ /(Hourly|Daily|Monthly|Annually)$/
-%        && $key ne loc('(no value)') ) {
-% my $group = $PrimaryGroupBy; $group =~ s! !.!;
-% my %orig_keys = reverse %loc_keys;
-% my $QueryString = $m->comp('/Elements/QueryString',
-%           Query => "$Query and $group = '$orig_keys{$key}'",
-%                           Format  => $ARGS{Format},
-%                           Rows    => $ARGS{Rows},
-%                           OrderBy => $ARGS{OrderBy},
-%                           Order   => $ARGS{Order},
-%                          );
-<a href=<% RT->Config->Get('WebURL') %>Search/Results.html?<%$QueryString%>><%$key%></a>
-% } else {
-<% $key %>
-% }
+<a href=<% RT->Config->Get('WebPath') %>/Search/Results.html?<%$QueryString%>><%$key%></a>
 </td>
 <td class="value collection-as-table">
-<%$value%>
+<a href=<% RT->Config->Get('WebPath') %>/Search/Results.html?<%$QueryString%>><%$value%></a>
 </td>
+% } else {
+<td class="label collection-as-table"><% $key %></td>
+<td class="value collection-as-table"><% $value %></td>
+% }
 </tr>
 % }
 
 %$i++;
-<tr class="<%$i%2 ? 'evenline' : 'oddline' %>">
-<td class="label collection-as-table">
-<%loc('Total')%>
-</td>
-<td class="value collection-as-table">
-<%$total||''%>
-</td>
+<tr class="<%$i%2 ? 'evenline' : 'oddline' %> total">
+<td class="label collection-as-table"><%loc('Total')%></td>
+<td class="value collection-as-table"><%$total||'0'%></td>
 </tr>
 
 </table>
+<div class="query"><span class="label"><% loc('Query') %>:</span><span class="value"><% $Query %></span></div>
+</div>