[Rt-commit] r4308 - in RT-Extension-ActivityReports: . html/Reports/Activity html/Reports/Activity/Elements

jesse at bestpractical.com jesse at bestpractical.com
Tue Dec 13 22:44:26 EST 2005


Author: jesse
Date: Tue Dec 13 22:44:25 2005
New Revision: 4308

Added:
   RT-Extension-ActivityReports/html/Reports/Activity/Elements/PrintFooter
   RT-Extension-ActivityReports/html/Reports/Activity/Elements/PrintHeader
   RT-Extension-ActivityReports/html/Reports/Activity/Elements/ScreenFooter
   RT-Extension-ActivityReports/html/Reports/Activity/Elements/ScreenHeader
   RT-Extension-ActivityReports/html/Reports/Activity/Elements/Tabs
   RT-Extension-ActivityReports/html/Reports/Activity/Elements/Wrapper
Modified:
   RT-Extension-ActivityReports/   (props changed)
   RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html
   RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html
   RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html
   RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html
Log:
 r20441 at truegrounds:  jesse | 2005-12-13 18:38:43 -0500
  checkpoint;
 


Modified: RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html	Tue Dec 13 22:44:25 2005
@@ -1,7 +1,7 @@
-<& /Elements/Header, Title => loc("Activity detail") &>
-<& Elements/Tabs,
-    current_tab => "Reports/Activity/ActivityDetail.html",
-    Title => loc("Activity detail") &>
+<&|Elements/Wrapper, %ARGS, title => loc("Activity detail"),
+    path => "Reports/Activity/ActivityDetail.html",
+    query => $query
+    &>
 
 <& Elements/MiniPlot, data => \%counts &>
 
@@ -26,6 +26,7 @@
 <textarea name="query"><% $query %></textarea>
 <& /Elements/Submit, Name => 'LimitReport', Label => loc('Limit') &>
 </form>
+</&>
 <%args>
 $query => 'id > 0'
 $start => "'2005/01/01'"
@@ -71,7 +72,7 @@
                        time => (split ' ', $txn->CreatedObj->ISO)[1],
                        status => $txn->NewValue || 'new',
                        actor => $txn->CreatorObj->Name,
-                       notes => (substr($txn->Content, 0, 60) ||  $txn->BriefDescription)
+                       notes => ($txn->Content ne 'This transaction appears to have no content' ? substr($txn->Content, 0, 60) :  $txn->BriefDescription)
                      };
     }
 }
@@ -84,4 +85,4 @@
         || $a->{'notes'}  <=> $b->{'notes'}
 } @items;
 
-</%init>
\ No newline at end of file
+</%init>

Modified: RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html	Tue Dec 13 22:44:25 2005
@@ -1,7 +1,8 @@
-<& /Elements/Header, Title => loc("Activity summary") &>
-<& Elements/Tabs,
-    current_tab => "Reports/Activity/ActivitySummary.html",
-    Title => loc("Activity summary") &>
+<&|Elements/wrapper,
+    path => "Reports/Activity/ActivitySummary.html",
+    title=> loc("Activity summary"),
+    query => $query
+    &>
 
 <& Elements/MiniPlot, data => \%queues &>
 
@@ -33,6 +34,7 @@
 <textarea name="query"><% $query %></textarea>
 <& /Elements/Submit, Name => 'LimitReport', Label => loc('Limit') &>
 </form>
+</&>
 <%args>
 $query => 'id > 0'
 $start => "'2005/01/01'"
@@ -63,4 +65,4 @@
 }
 
 
-</%init>
\ No newline at end of file
+</%init>

Added: RT-Extension-ActivityReports/html/Reports/Activity/Elements/PrintFooter
==============================================================================
--- (empty file)
+++ RT-Extension-ActivityReports/html/Reports/Activity/Elements/PrintFooter	Tue Dec 13 22:44:25 2005
@@ -0,0 +1,7 @@
+<hr/>
+<div style="text-align: center;">
+<%$RT::ReportFooterMessage || 'Proprietary and Confidential' %>
+</div>
+</body>
+</html>
+%$m->abort();

Added: RT-Extension-ActivityReports/html/Reports/Activity/Elements/PrintHeader
==============================================================================
--- (empty file)
+++ RT-Extension-ActivityReports/html/Reports/Activity/Elements/PrintHeader	Tue Dec 13 22:44:25 2005
@@ -0,0 +1,32 @@
+<%args>
+$title => undef
+$path => undef
+$query => undef
+</%args>
+<HTML>
+<HEAD>
+<TITLE><%$title%></TITLE>
+<link rel="shortcut icon" href="<%$RT::WebImagesURL%>/favicon.png" type="image/png" />
+<link media="all" rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/webrt.css" type="text/css" />
+<link media="print" rel="stylesheet" href="<%$RT::WebPath%>/NoAuth/printrt.css" type="text/css" />
+%# XXX TODO THIS SHOULD NOT BE A TABLE
+<body>
+<table width="100%">
+<tr>
+<td align="left">
+<div id="username">User: <%$session{'CurrentUser'}->Name%></div>
+<div id="reportdate">
+%my $d= RT::Date->new($session{'CurrentUser'}); $d->SetToNow; 
+<%$d->AsString%></div>
+</td>
+<td align="center">
+<h1><%$title%></h1>
+</td>
+<td align="right">
+<img src="<%$RT::LogoURL%>" alt="RT Logo"/>
+</td>
+</tr>
+</table>
+<hr/>
+<&|/l&>Report criteria:</&> <%$query%>
+<hr />

Added: RT-Extension-ActivityReports/html/Reports/Activity/Elements/ScreenFooter
==============================================================================

Added: RT-Extension-ActivityReports/html/Reports/Activity/Elements/ScreenHeader
==============================================================================
--- (empty file)
+++ RT-Extension-ActivityReports/html/Reports/Activity/Elements/ScreenHeader	Tue Dec 13 22:44:25 2005
@@ -0,0 +1,9 @@
+<%args>
+$title => undef
+$path => undef
+</%args>
+<& /Elements/Header, Title => $title &>
+<& Tabs,
+    current_tab => $path,
+    Title => $title &> 
+

Added: RT-Extension-ActivityReports/html/Reports/Activity/Elements/Tabs
==============================================================================
--- (empty file)
+++ RT-Extension-ActivityReports/html/Reports/Activity/Elements/Tabs	Tue Dec 13 22:44:25 2005
@@ -0,0 +1 @@
+% $m->comp('/Elements/Tabs', %ARGS);

Added: RT-Extension-ActivityReports/html/Reports/Activity/Elements/Wrapper
==============================================================================
--- (empty file)
+++ RT-Extension-ActivityReports/html/Reports/Activity/Elements/Wrapper	Tue Dec 13 22:44:25 2005
@@ -0,0 +1,16 @@
+<%args>
+$mode => 'screen'
+</%args>
+
+% if ($mode eq 'print') {
+<& PrintHeader, %ARGS &>
+%} else {
+<& ScreenHeader, %ARGS &>
+% }
+<%$m->content |n%>
+% if ($mode eq 'print') {
+<& PrintFooter, %ARGS &>
+%} else {
+<& ScreenFooter, %ARGS &>
+% }
+

Modified: RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html	Tue Dec 13 22:44:25 2005
@@ -1,8 +1,7 @@
-<& /Elements/Header, Title => loc("Activity detail") &>
-<& Elements/Tabs,
-    current_tab => "Reports/Activity/ResolutionComments.html",
-    Title => loc("Activity detail") &>
-
+<&|Elements/PageWrapper, %ARGS, title => loc("Resolution Comments"), 
+    path => "Reports/Activity/ResolutionComments.html",
+    query => $query
+    &>
 
 <table style="width: 100%">
 <tr>
@@ -29,6 +28,8 @@
 <textarea name="query"><% $query %></textarea>
 <& /Elements/Submit, Name => 'LimitReport', Label => loc('Limit') &>
 </form>
+</&>
+
 <%args>
 $query => 'id > 0'
 $start => "'2005/01/01'"

Modified: RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html	Tue Dec 13 22:44:25 2005
@@ -1,8 +1,7 @@
-<& /Elements/Header, Title => loc("Resolution statistics") &>
-<& Elements/Tabs,
-    current_tab => "Reports/Activity/ResolutionStatistics.html",
-    Title => loc("Activity detail") &>
-
+<&|Elements/Wrapper, %ARGS, title => loc("Resolution statistics"),
+    path => "Reports/Activity/ResolutionStatistics.html",
+    query => $query,
+&>
 <& Elements/MiniPlot,
    data => \%plot,
    major => ['Date range','Last 30 days','Last 60 days','Last 90 days','Ever'],
@@ -41,7 +40,7 @@
 <textarea name="query"><% $query %></textarea>
 <& /Elements/Submit, Name => 'LimitReport', Label => loc('Limit') &>
 </form>
-
+</&>
 <%args>
 $query => 'id > 0'
 $start => "'2005/01/01'"
@@ -97,4 +96,4 @@
     $average_resolve_times{$period}{'_all'}  = Time::Duration::concise(Time::Duration::duration($plot{$period}{Average}));
 }
 
-</%init>
\ No newline at end of file
+</%init>


More information about the Rt-commit mailing list