[freeside-commits] branch master updated. 7b19b666fc36f8dc28747a11bd2b389d8d2ef75f

[Mark Wells]

The branch, master has been updated
       via  7b19b666fc36f8dc28747a11bd2b389d8d2ef75f (commit)
      from  5a204201503f8e0db6087db6e53b84297cbc739a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b19b666fc36f8dc28747a11bd2b389d8d2ef75f
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Aug 10 16:07:50 2012 -0700

    sqlradius data usage report, #18823

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 019afe9..c656cb9 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -256,6 +256,8 @@ tie my %report_inventory, 'Tie::IxHash',
 tie my %report_rating, 'Tie::IxHash';
 $report_rating{'RADIUS sessions'} = [ $fsurl.'search/sqlradius.html', '' ]
   if $curuser->access_right("Usage: RADIUS sessions");
+$report_rating{'RADIUS data usage'} = [ $fsurl.'search/report_sqlradius_usage.html', '' ]
+  if $curuser->access_right("Usage: RADIUS sessions");
 $report_rating{'Call Detail Records (CDRs)'} = [ $fsurl.'search/report_cdr.html', '' ]
   if $curuser->access_right("Usage: Call Detail Records (CDRs)");
 $report_rating{'Unrateable CDRs'} = [ $fsurl.'search/cdr.html?freesidestatus=failed;cdrbatchnum=_ALL_' ]
diff --git a/httemplate/search/elements/search-html.html b/httemplate/search/elements/search-html.html
index c277714..cf60d8f 100644
--- a/httemplate/search/elements/search-html.html
+++ b/httemplate/search/elements/search-html.html
@@ -134,9 +134,9 @@
 %                 and !$opt{'disable_download'}
 %                 and $type ne 'html-print' ) { 
 
-              <TD ALIGN="right">
+              <TD ALIGN="right" CLASS="noprint">
 
-                Download full results<BR>
+                <% $opt{'download_label'} || 'Download full results' %><BR>
 
 %               $cgi->param('_type', "$xlsname.xls" ); 
                 as <A HREF="<% "$self_url?". $cgi->query_string %>">Excel spreadsheet</A><BR>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 9bc66b6..eca68a2 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -162,7 +162,11 @@ Example:
     # Excel-specific listref of ( hashrefs or coderefs )
     # each hashref: http://search.cpan.org/dist/Spreadsheet-WriteExcel/lib/Spreadsheet/WriteExcel.pm#Format_methods_and_Format_properties
     'xls_format' => => [],
-    
+   
+
+    # miscellany
+   'download_label' => 'Download this report',
+                        # defaults to 'Download full results' 
   &>
 
 </%doc>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/menu.html               |    2 ++
 httemplate/search/elements/search-html.html |    4 ++--
 httemplate/search/elements/search.html      |    6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)