[freeside-commits] freeside/httemplate/search cust_bill.html, 1.19.2.7, 1.19.2.8 cust_bill_event.cgi, 1.12.2.1, 1.12.2.2 cust_pay_batch.cgi, 1.6.2.1, 1.6.2.2 prepay_credit.html, 1.5.2.1, 1.5.2.2 queue.html, 1.5, 1.5.2.1 report_prepaid_income.cgi, 1.8, 1.8.2.1 report_tax.cgi, 1.34.2.3, 1.34.2.4 sqlradius.cgi, 1.17, 1.17.2.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv6296

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_bill.html cust_bill_event.cgi cust_pay_batch.cgi 
	prepay_credit.html queue.html report_prepaid_income.cgi 
	report_tax.cgi sqlradius.cgi 
Log Message:
ACLs

Index: queue.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/queue.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- queue.html	3 Feb 2007 11:36:30 -0000	1.5
+++ queue.html	13 Jan 2008 20:57:38 -0000	1.5.2.1
@@ -1,6 +1,5 @@
 <% include( 'elements/search.html',
                  'title'       => 'Job Queue',
-                 'menubar'     => [ 'Main menu' => $p, ],
                  'name'        => 'jobs',
 		 'html_form'   => qq!<FORM NAME="jobForm" ACTION="$p/misc/queue.cgi" METHOD="POST">!,
                  'query'       => { 'table'     => 'queue',

Index: sqlradius.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/sqlradius.cgi,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- sqlradius.cgi	3 Feb 2007 11:36:30 -0000	1.17
+++ sqlradius.cgi	13 Jan 2008 20:57:38 -0000	1.17.2.1
@@ -1,10 +1,4 @@
-<% include( '/elements/header.html', 'RADIUS Sessions',
-             include('/elements/menubar.html',
-                       'Main menu' => $p, # popurl(2),
-                    ),
-
-    )
-%>
+<% include( '/elements/header.html', 'RADIUS Sessions') %>
 
 % ###
 % # and finally, display the thing

Index: report_prepaid_income.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_prepaid_income.cgi,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- report_prepaid_income.cgi	3 Feb 2007 11:36:30 -0000	1.8
+++ report_prepaid_income.cgi	13 Jan 2008 20:57:38 -0000	1.8.2.1
@@ -1,5 +1,5 @@
-<% include("/elements/header.html", 'Prepaid Income (Unearned Revenue) Report',
-            menubar( 'Main Menu'=>$p, ) )               %>
+<% include("/elements/header.html", 'Prepaid Income (Unearned Revenue) Report') %>
+
 <% table() %>
   <TR>
     <TH>Actual Unearned Revenue</TH>

Index: cust_bill_event.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_event.cgi,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- cust_bill_event.cgi	2 Oct 2007 15:31:18 -0000	1.12.2.1
+++ cust_bill_event.cgi	13 Jan 2008 20:57:38 -0000	1.12.2.2
@@ -130,16 +130,21 @@
   qq!</FORM>!
 } qw( print_ email_ fax_ ) );
 
-my $menubar =  [
-                 'Re-print these events' =>
-                   "javascript:print_process()",
-                 'Re-email these events' =>
-                   "javascript:email_process()",
-               ];
+my $menubar = [];
 
-push @$menubar, 'Re-fax these events' =>
-                  "javascript:fax_process()"
-  if $conf->exists('hylafax');
+if ( $curuser->access_right('Resend invoices') ) {
+
+  push @$menubar, 'Re-print these events' =>
+                    "javascript:print_process()",
+                  'Re-email these events' =>
+                    "javascript:email_process()",
+                ;
+
+  push @$menubar, 'Re-fax these events' =>
+                    "javascript:fax_process()"
+    if $conf->exists('hylafax');
+
+}
 
 my $link_cust = sub {
   my $cust_bill_event = shift;

Index: cust_pay_batch.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pay_batch.cgi,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- cust_pay_batch.cgi	21 Mar 2007 04:12:59 -0000	1.6.2.1
+++ cust_pay_batch.cgi	13 Jan 2008 20:57:38 -0000	1.6.2.2
@@ -1,7 +1,6 @@
 <% include('elements/search.html',
               'title'       => 'Batch payment details',
               'name'        => 'batch details',
-	      'menubar'     => ['Main Menu'  => $p,],
 	      'query'       => $sql_query,
 	      'count_query' => $count_query,
               'html_init'   => $pay_batch ? $html_init : '',

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -d -r1.34.2.3 -r1.34.2.4
--- report_tax.cgi	27 Dec 2007 23:49:32 -0000	1.34.2.3
+++ report_tax.cgi	13 Jan 2008 20:57:38 -0000	1.34.2.4
@@ -7,8 +7,7 @@
               ( $ending == 4294967295
                   ? 'now'
                   : time2str('%h %o %Y', $ending )
-              ),
-            menubar( 'Main Menu'=>$p, )
+              )
           )
 %>
 

Index: prepay_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/prepay_credit.html,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- prepay_credit.html	19 Apr 2007 23:38:34 -0000	1.5.2.1
+++ prepay_credit.html	13 Jan 2008 20:57:38 -0000	1.5.2.2
@@ -2,7 +2,6 @@
                  'title'       => 'Unused Prepaid Cards'.
                                   ($agent ? ' for '. $agent->agent : ''),
                  'menubar'     => [
-                   'Main menu'      => $p,
                    'Generate cards' => $p.'edit/prepay_credit.cgi',
                  ],
                  'name'        => 'prepaid cards',

Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -u -d -r1.19.2.7 -r1.19.2.8
--- cust_bill.html	15 Dec 2007 01:45:26 -0000	1.19.2.7
+++ cust_bill.html	13 Jan 2008 20:57:38 -0000	1.19.2.8
@@ -190,7 +190,6 @@
 } qw( print_ email_ fax_ ) );
 
 my $menubar =  [
-                'Main menu' => $p,
                 'Print these invoices' =>
                   "javascript:print_process()",
                 'Email these invoices' =>