[freeside-commits] freeside/httemplate/elements
checkboxes-table-name.html, 1.1, 1.2 checkboxes-table.html,
1.2, 1.3 header-popup.html, 1.1, 1.2 header.html, 1.8,
1.9 jsrsServer.html, 1.2, 1.3 menu.html, 1.7, 1.8 menubar.html,
1.2, 1.3 pager.html, 1.2, 1.3 phonenumber.html, 1.2,
1.3 progress-init.html, 1.9, 1.10 progress-popup.html, 1.5,
1.6 search-cust_main.html, 1.1, 1.2 select-access_group.html,
1.1, 1.2 select-agent.html, 1.4, 1.5 select-cust-fields.html,
1.1, 1.2 select-cust_pkg-status.html, 1.1,
1.2 select-month_year.html, 1.2, 1.3 select-part_referral.html,
1.1, 1.2 select-pkg_class.html, 1.2, 1.3 select-table.html,
1.4, 1.5 select-taxclass.html, 1.2, 1.3 small_custview.html,
1.2, 1.3 table-grid.html, 1.3, 1.4 table.html, 1.1,
1.2 tr-select-access_group.html, 1.1, 1.2 tr-select-agent.html,
1.3, 1.4 tr-select-cust-fields.html, 1.1,
1.2 tr-select-cust_pkg-status.html, 1.1,
1.2 tr-select-from_to.html, 1.1,
1.2 tr-select-part_referral.html, 1.1,
1.2 tr-select-pkg_class.html, 1.2, 1.3 xmlhttp.html, 1.7, 1.8
Ivan,,,
ivan at wavetail.420.am
Wed Aug 23 15:25:40 PDT 2006
- Previous message: [freeside-commits] freeside/httemplate/misc/process
batch-cust_pay.cgi, 1.2, 1.3 catchall.cgi, 1.4,
1.5 cdr-import.html, 1.2, 1.3 cust_main-import.cgi, 1.4,
1.5 cust_main-import_charges.cgi, 1.3, 1.4 delete-customer.cgi,
1.4, 1.5 expire_pkg.cgi, 1.1, 1.2 inventory_item-import.html,
1.2, 1.3 link.cgi, 1.14, 1.15 meta-import.cgi, 1.6,
1.7 payment.cgi, 1.2, 1.3
- Next message: [freeside-commits] freeside/httemplate/search cdr.html, 1.3,
1.4 cust_bill.html, 1.17, 1.18 cust_bill_event.cgi, 1.9,
1.10 cust_bill_event.html, 1.8, 1.9 cust_bill_pkg.cgi, 1.5,
1.6 cust_credit.html, 1.9, 1.10 cust_main-otaker.cgi, 1.5,
1.6 cust_main-zip.html, 1.1, 1.2 cust_main.cgi, 1.67,
1.68 cust_pay.cgi, 1.25, 1.26 cust_pkg.cgi, 1.38,
1.39 cust_tax_exempt_pkg.cgi, 1.2, 1.3 inventory_item.html,
1.3, 1.4 prepay_credit.html, 1.1, 1.2 queue.html, 1.1,
1.2 reg_code.html, 1.2, 1.3 report_cdr.html, 1.3,
1.4 report_cust_bill.html, 1.3, 1.4 report_cust_credit.html,
1.7, 1.8 report_cust_main-zip.html, 1.1,
1.2 report_cust_pay.html, 1.11, 1.12 report_cust_pkg.html, 1.1,
1.2 report_prepaid_income.cgi, 1.6,
1.7 report_prepaid_income.html, 1.4,
1.5 report_receivables.cgi, 1.31, 1.32 report_receivables.html,
1.1, 1.2 report_tax.cgi, 1.32, 1.33 report_tax.html, 1.10,
1.11 sql.html, 1.3, 1.4 sqlradius.cgi, 1.9,
1.10 sqlradius.html, 1.5, 1.6 svc_Smart.html, 1.1,
1.2 svc_acct.cgi, 1.36, 1.37 svc_broadband.cgi, 1.1,
1.2 svc_domain.cgi, 1.20, 1.21 svc_external.cgi, 1.3,
1.4 svc_forward.cgi, 1.9, 1.10 svc_phone.cgi, 1.1,
1.2 svc_www.cgi, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail:/tmp/cvs-serv18630/httemplate/elements
Modified Files:
checkboxes-table-name.html checkboxes-table.html
header-popup.html header.html jsrsServer.html menu.html
menubar.html pager.html phonenumber.html progress-init.html
progress-popup.html search-cust_main.html
select-access_group.html select-agent.html
select-cust-fields.html select-cust_pkg-status.html
select-month_year.html select-part_referral.html
select-pkg_class.html select-table.html select-taxclass.html
small_custview.html table-grid.html table.html
tr-select-access_group.html tr-select-agent.html
tr-select-cust-fields.html tr-select-cust_pkg-status.html
tr-select-from_to.html tr-select-part_referral.html
tr-select-pkg_class.html xmlhttp.html
Log Message:
Will things ever be the same again?
It's the final masonize
Index: select-pkg_class.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-pkg_class.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- select-pkg_class.html 7 May 2006 20:27:21 -0000 1.2
+++ select-pkg_class.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,12 +1,13 @@
-<%
- my( $classnum, %opt ) = @_;
-
- $opt{'records'} = delete $opt{'pkg_class'}
- if $opt{'pkg_class'};
-
- #warn "***** select-pkg-class: \n". Dumper(%opt);
-
-%><%= include( '/elements/select-table.html',
+%
+% my( $classnum, %opt ) = @_;
+%
+% $opt{'records'} = delete $opt{'pkg_class'}
+% if $opt{'pkg_class'};
+%
+% #warn "***** select-pkg-class: \n". Dumper(%opt);
+%
+%
+<% include( '/elements/select-table.html',
'table' => 'pkg_class',
'name_col' => 'classname',
'value' => $classnum,
Index: select-cust-fields.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-cust-fields.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- select-cust-fields.html 19 Jun 2006 08:05:28 -0000 1.1
+++ select-cust-fields.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,23 +1,24 @@
-<%
- my( $cust_fields, %opt ) = @_;
-
- use FS::ConfDefaults;
- $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
-
- tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
+%
+% my( $cust_fields, %opt ) = @_;
+%
+% use FS::ConfDefaults;
+% $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
+%
+% tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
+%
+%
-%>
<SELECT NAME="cust_fields">
<OPTION VALUE="">(configured default)
+%
+% foreach my $value ( keys %hash ) {
- <%
- foreach my $value ( keys %hash ) { %>
- <OPTION VALUE="<%= $value %>"><%= $hash{$value} %>
+ <OPTION VALUE="<% $value %>"><% $hash{$value} %>
+% }
- <% } %>
</SELECT>
Index: tr-select-part_referral.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-part_referral.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr-select-part_referral.html 11 Aug 2006 08:02:26 -0000 1.1
+++ tr-select-part_referral.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,30 +1,30 @@
-<%
- my( $refnum, %opt ) = @_;
-
- $opt{'part_referrals'} ||=
- [ FS::part_referral->all_part_referral( 1 ) ]; #1: include global
-
- my $r = qq!<font color="#ff0000">*</font> !;
-
-%>
+%
+% my( $refnum, %opt ) = @_;
+%
+% $opt{'part_referrals'} ||=
+% [ FS::part_referral->all_part_referral( 1 ) ]; #1: include global
+%
+% my $r = qq!<font color="#ff0000">*</font> !;
+%
+%
+% if ( scalar( @{$opt{'part_referrals'}} ) == 0 ) {
+% eidiot "You have not created any advertising sources. You must create at least one advertising source before adding a customer. Go to ". popurl(2). "browse/part_referral.html and create one or more advertising sources.";
+% } elsif ( scalar( @{$opt{'part_referrals'}} ) == 1 ) {
+%
-<% if ( scalar( @{$opt{'part_referrals'}} ) == 0 ) {
- eidiot "You have not created any advertising sources. You must create at least one advertising source before adding a customer. Go to ". popurl(2). "browse/part_referral.html and create one or more advertising sources.";
- } elsif ( scalar( @{$opt{'part_referrals'}} ) == 1 ) {
-%>
- <INPUT TYPE="hidden" NAME="refnum" VALUE="<%= $opt{'part_referrals'}->[0]->refnum %>">
+ <INPUT TYPE="hidden" NAME="refnum" VALUE="<% $opt{'part_referrals'}->[0]->refnum %>">
+% } else {
-<% } else { %>
<TR>
- <TH ALIGN="right"><%=$r%>Advertising source</TH>
+ <TH ALIGN="right"><%$r%>Advertising source</TH>
<TD>
- <%= include( '/elements/select-part_referral.html', $refnum,
+ <% include( '/elements/select-part_referral.html', $refnum,
'part_referrals' => $opt{'part_referrals'},
)
%>
</TD>
</TR>
+% }
-<% } %>
Index: tr-select-cust-fields.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-cust-fields.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr-select-cust-fields.html 19 Jun 2006 08:05:28 -0000 1.1
+++ tr-select-cust-fields.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,14 +1,15 @@
-<%
- my( $cust_fields, %opt ) = @_;
-
- use FS::ConfDefaults;
- $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
+%
+% my( $cust_fields, %opt ) = @_;
+%
+% use FS::ConfDefaults;
+% $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
+%
+%
-%>
<TR>
- <TD ALIGN="right"><%= $opt{'label'} || 'Customer fields' %></TD>
+ <TD ALIGN="right"><% $opt{'label'} || 'Customer fields' %></TD>
<TD>
- <%= include( '/elements/select-cust-fields.html', $cust_fields, %opt ) %>
+ <% include( '/elements/select-cust-fields.html', $cust_fields, %opt ) %>
</TD>
</TR>
Index: pager.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/pager.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pager.html 22 Apr 2004 07:38:04 -0000 1.2
+++ pager.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,42 +1,43 @@
-<%
-
- my %opt = @_;
+%
+%
+% my %opt = @_;
+%
+% my $pager = '';
+% if ( $opt{'total'} != $opt{'num_rows'} && $opt{'maxrecords'} ) {
+% unless ( $opt{'offset'} == 0 ) {
+% $cgi->param('offset', $opt{'offset'} - $opt{'maxrecords'});
+%
- my $pager = '';
- if ( $opt{'total'} != $opt{'num_rows'} && $opt{'maxrecords'} ) {
- unless ( $opt{'offset'} == 0 ) {
- $cgi->param('offset', $opt{'offset'} - $opt{'maxrecords'});
-%>
- <A HREF="<%= $cgi->self_url %>"><B><FONT SIZE="+1">Previous</FONT></B></A>
+ <A HREF="<% $cgi->self_url %>"><B><FONT SIZE="+1">Previous</FONT></B></A>
+%
+% }
+% my $page = 0;
+% for ( my $poff = 0; $poff < $opt{'total'}; $poff += $opt{'maxrecords'} ) {
+% $page++;
+% if ( $opt{'offset'} == $poff ) {
+%
-<%
- }
- my $page = 0;
- for ( my $poff = 0; $poff < $opt{'total'}; $poff += $opt{'maxrecords'} ) {
- $page++;
- if ( $opt{'offset'} == $poff ) {
-%>
- <FONT SIZE="+2"><%= $page %></FONT>
+ <FONT SIZE="+2"><% $page %></FONT>
+%
+% } else {
+% $cgi->param('offset', $poff);
+%
-<%
- } else {
- $cgi->param('offset', $poff);
-%>
- <A HREF="<%= $cgi->self_url %>"><%= $page %></A>
+ <A HREF="<% $cgi->self_url %>"><% $page %></A>
+%
+% }
+% }
+% unless ( $opt{'offset'} + $opt{'maxrecords'} > $opt{'total'} ) {
+% $cgi->param('offset', $opt{'offset'} + $opt{'maxrecords'});
+%
-<%
- }
- }
- unless ( $opt{'offset'} + $opt{'maxrecords'} > $opt{'total'} ) {
- $cgi->param('offset', $opt{'offset'} + $opt{'maxrecords'});
-%>
- <A HREF="<%= $cgi->self_url %>"><B><FONT SIZE="+1">Next</FONT></B></A>
+ <A HREF="<% $cgi->self_url %>"><B><FONT SIZE="+1">Next</FONT></B></A>
+%
+% }
+% }
+%
-<%
- }
- }
-%>
Index: checkboxes-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/checkboxes-table.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- checkboxes-table.html 18 Jun 2006 12:54:48 -0000 1.2
+++ checkboxes-table.html 23 Aug 2006 22:25:37 -0000 1.3
@@ -1,122 +1,123 @@
-<%
-
- ##
- # required
- ##
- # 'target_table' => 'table_name',
- # 'link_table' => 'table_name',
- #
- # 'name_col' => 'name_column',
- # #or
- # 'name_callback' => sub { },
- #
- ##
- # recommended (required?)
- ##
- # 'source_obj' => $obj,
- # #or?
- # #'source_table' => 'table_name',
- # #'sourcenum' => '4', #current value of primary key in source_table
- # # # (none is okay, just pass it if you have it)
- ##
- # optional
- ##
- # 'disable-able' => 1,
-
- my( %opt ) = @_;
-
- my $target_pkey = dbdef->table($opt{'target_table'})->primary_key;
-
- my( $source_pkey, $sourcenum, $source_obj );
- if ( $opt{'source_obj'} ) {
-
- $source_obj = $opt{'source_obj'};
- #$source_table = $source_obj->dbdef_table->table;
- $source_pkey = $source_obj->dbdef_table->primary_key;
- $sourcenum = $source_obj->$source_pkey();
-
- } else {
-
- #$source_obj?
- $source_pkey = $opt{'source_table'}
- ? dbdef->table($opt{'source_table'})->primary_key
- : '';
- $sourcenum = $opt{'sourcenum'};
- }
-
- my $hashref = $opt{'hashref'} || {};
-
- my $extra_sql = '';
-
- if ( $opt{'disable-able'} ) {
- $hashref->{'disabled'} = '';
-
- $extra_sql .= ( $sourcenum && $source_pkey )
- ? "OR $source_pkey = $sourcenum"
- : '';
- }
-
-%>
-
-<% foreach my $target_obj (
- qsearch({ 'table' => $opt{'target_table'},
- 'hashref' => $hashref,
- 'select' => $opt{'target_table'}. '.*',
- 'addl_from' => "LEFT JOIN $opt{'link_table'} USING ( $target_pkey )",
- 'extra_sql' => $extra_sql,
- })
- ) {
-
- my $targetnum = $target_obj->$target_pkey();
-
- my $checked;
- if ( $cgi->param('error') ) {
-
- $checked = $cgi->param($target_pkey.$targetnum)
- ? 'CHECKED'
- : '';
-
- } else {
-
- $checked = qsearchs( $opt{'link_table'}, {
- $source_pkey => $sourcenum,
- $target_pkey => $targetnum,
- } )
- ? 'CHECKED'
- : ''
-
- }
-
-%>
-
- <INPUT TYPE="checkbox" NAME="<%= $target_pkey. $targetnum %>" <%= $checked %> VALUE="ON">
+%
+%
+% ##
+% # required
+% ##
+% # 'target_table' => 'table_name',
+% # 'link_table' => 'table_name',
+% #
+% # 'name_col' => 'name_column',
+% # #or
+% # 'name_callback' => sub { },
+% #
+% ##
+% # recommended (required?)
+% ##
+% # 'source_obj' => $obj,
+% # #or?
+% # #'source_table' => 'table_name',
+% # #'sourcenum' => '4', #current value of primary key in source_table
+% # # # (none is okay, just pass it if you have it)
+% ##
+% # optional
+% ##
+% # 'disable-able' => 1,
+%
+% my( %opt ) = @_;
+%
+% my $target_pkey = dbdef->table($opt{'target_table'})->primary_key;
+%
+% my( $source_pkey, $sourcenum, $source_obj );
+% if ( $opt{'source_obj'} ) {
+%
+% $source_obj = $opt{'source_obj'};
+% #$source_table = $source_obj->dbdef_table->table;
+% $source_pkey = $source_obj->dbdef_table->primary_key;
+% $sourcenum = $source_obj->$source_pkey();
+%
+% } else {
+%
+% #$source_obj?
+% $source_pkey = $opt{'source_table'}
+% ? dbdef->table($opt{'source_table'})->primary_key
+% : '';
+% $sourcenum = $opt{'sourcenum'};
+% }
+%
+% my $hashref = $opt{'hashref'} || {};
+%
+% my $extra_sql = '';
+%
+% if ( $opt{'disable-able'} ) {
+% $hashref->{'disabled'} = '';
+%
+% $extra_sql .= ( $sourcenum && $source_pkey )
+% ? "OR $source_pkey = $sourcenum"
+% : '';
+% }
+%
+%
+% foreach my $target_obj (
+% qsearch({ 'table' => $opt{'target_table'},
+% 'hashref' => $hashref,
+% 'select' => $opt{'target_table'}. '.*',
+% 'addl_from' => "LEFT JOIN $opt{'link_table'} USING ( $target_pkey )",
+% 'extra_sql' => $extra_sql,
+% })
+% ) {
+%
+% my $targetnum = $target_obj->$target_pkey();
+%
+% my $checked;
+% if ( $cgi->param('error') ) {
+%
+% $checked = $cgi->param($target_pkey.$targetnum)
+% ? 'CHECKED'
+% : '';
+%
+% } else {
+%
+% $checked = qsearchs( $opt{'link_table'}, {
+% $source_pkey => $sourcenum,
+% $target_pkey => $targetnum,
+% } )
+% ? 'CHECKED'
+% : ''
+%
+% }
+%
+%
- <% if ( $opt{'target_link'} ) { %>
- <A HREF="<%= $opt{'target_link'} %><%= $targetnum %>"><%
+ <INPUT TYPE="checkbox" NAME="<% $target_pkey. $targetnum %>" <% $checked %> VALUE="ON">
+% if ( $opt{'target_link'} ) {
- }
- %><%= $targetnum %>:
- <% if ( $opt{'name_callback'} ) { %>
+ <A HREF="<% $opt{'target_link'} %><% $targetnum %>">
+%
+%
+% }
+%
+<% $targetnum %>:
+% if ( $opt{'name_callback'} ) {
- <%= &{ $opt{'name_callback'} }( $target_obj ) %><%= $opt{'target_link'} ? '</A>' : '' %>
- <% } else {
- my $name_col = $opt{'name_col'};
- %>
+ <% &{ $opt{'name_callback'} }( $target_obj ) %><% $opt{'target_link'} ? '</A>' : '' %>
+% } else {
+% my $name_col = $opt{'name_col'};
+%
- <%= $target_obj->$name_col() %><%= $opt{'target_link'} ? '</A>' : '' %>
- <% } %>
+ <% $target_obj->$name_col() %><% $opt{'target_link'} ? '</A>' : '' %>
+% }
+% if ( $opt{'disable-able'} ) {
- <% if ( $opt{'disable-able'} ) { %>
- <%= $target_obj->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
+ <% $target_obj->disabled =~ /^Y/i ? ' (DISABLED)' : '' %>
+% }
- <% } %>
<BR>
+% }
-<% } %>
Index: tr-select-agent.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-agent.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tr-select-agent.html 11 Aug 2006 08:02:26 -0000 1.3
+++ tr-select-agent.html 23 Aug 2006 22:25:38 -0000 1.4
@@ -1,34 +1,34 @@
-<%
- my( $agentnum, %opt ) = @_;
-
- my @agents;
- if ( $opt{'agents'} ) {
- #@agents = @{ $opt{'agents'} };
- #here is the agent virtualization
- my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
- @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
- delete $opt{'agents'};
- } else {
- @agents = $FS::CurrentUser::CurrentUser->agents;
- }
-
-%>
+%
+% my( $agentnum, %opt ) = @_;
+%
+% my @agents;
+% if ( $opt{'agents'} ) {
+% #@agents = @{ $opt{'agents'} };
+% #here is the agent virtualization
+% my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href;
+% @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} };
+% delete $opt{'agents'};
+% } else {
+% @agents = $FS::CurrentUser::CurrentUser->agents;
+% }
+%
+%
+% if ( scalar(@agents) == 1 ) {
-<% if ( scalar(@agents) == 1 ) { %>
- <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
+ <INPUT TYPE="hidden" NAME="agentnum" VALUE="<% $agents[0]->agentnum %>">
+% } else {
-<% } else { %>
<TR>
- <TD ALIGN="right"><%= $opt{'label'} || 'Agent' %></TD>
+ <TD ALIGN="right"><% $opt{'label'} || 'Agent' %></TD>
<TD>
- <%= include( '/elements/select-agent.html', $agentnum,
+ <% include( '/elements/select-agent.html', $agentnum,
'agents' => \@agents,
%opt,
)
%>
</TD>
</TR>
+% }
-<% } %>
Index: header.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/header.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- header.html 14 Aug 2006 12:13:39 -0000 1.8
+++ header.html 23 Aug 2006 22:25:37 -0000 1.9
@@ -1,21 +1,22 @@
-<%
- my($title, $menubar) = ( shift, shift );
- my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
- my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
- my $conf = new FS::Conf;
+%
+% my($title, $menubar) = ( shift, shift );
+% my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
+% my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
+% my $conf = new FS::Conf;
+%
+%
-%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
<HEAD>
<TITLE>
- <%= $title %>
+ <% $title %>
</TITLE>
<META HTTP-Equiv="Cache-Control" Content="no-cache">
<META HTTP-Equiv="Pragma" Content="no-cache">
<META HTTP-Equiv="Expires" Content="0">
- <%= include('menu.html', 'freeside_baseurl' => $fsurl ) %>
+ <% include('menu.html', 'freeside_baseurl' => $fsurl ) %>
<SCRIPT TYPE="text/javascript">
function clearhint_search_cust (what) {
@@ -39,17 +40,17 @@
}
</SCRIPT>
- <%= $head %>
+ <% $head %>
</HEAD>
- <BODY BACKGROUND="<%=$fsurl%>images/background-cheat.png" <%= $etc %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
+ <BODY BACKGROUND="<%$fsurl%>images/background-cheat.png" <% $etc %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
<table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0; padding-right:4">
<tr>
- <td rowspan=2 BGCOLOR="#ffffff"><IMG BORDER=0 ALT="freeside" SRC="<%=$fsurl%>images/small-logo.png"></td>
+ <td rowspan=2 BGCOLOR="#ffffff"><IMG BORDER=0 ALT="freeside" SRC="<%$fsurl%>images/small-logo.png"></td>
<td align=left rowspan=2 BGCOLOR="#ffffff"> <!-- valign="top" -->
- <font size=6><%= $conf->config('company_name') || 'ExampleCo' %></font>
+ <font size=6><% $conf->config('company_name') || 'ExampleCo' %></font>
</td>
- <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><%= getotaker %> </b><br></FONT><FONT SIZE="-2"><a href="<%=$fsurl%>pref/XXXwritethis">Preferences</a> <BR></FONT>
+ <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% getotaker %> </b><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/XXXwritethis">Preferences</a> <BR></FONT>
</td>
</tr>
<tr>
@@ -59,20 +60,22 @@
<tr>
<td align=right BGCOLOR="#ffffff">
<FONT SIZE="-2">
- <A HREF="http://www.sisd.com/freeside">Freeside</A> v<%= $FS::VERSION %><BR>
- <A HREF="<%= $fsurl %>docs/">Documentation</A><BR>
+ <A HREF="http://www.sisd.com/freeside">Freeside</A> v<% $FS::VERSION %><BR>
+ <A HREF="<% $fsurl %>docs/">Documentation</A><BR>
</FONT>
</td>
- <% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %>
- <% eval "use RT;"; %>
+% if ( $conf->config('ticket_system') eq 'RT_Internal' ) {
+% eval "use RT;";
+
<td bgcolor=#000000></td>
<td align=left>
<FONT SIZE="-2">
- <A HREF="http://www.bestpractical.com/rt">RT<A> v<%= $RT::VERSION %><BR>
+ <A HREF="http://www.bestpractical.com/rt">RT<A> v<% $RT::VERSION %><BR>
<A HREF="http://wiki.bestpractical.com/">Documentation</A><BR>
</FONT>
</td>
- <% } %>
+% }
+
</tr>
</table>
@@ -115,50 +118,54 @@
<TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=0>
<TR>
- <TD COLSPAN=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
+ <TD COLSPAN=5 WIDTH="100%" STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%$fsurl%>images/black-gradient.png" HEIGHT="13" WIDTH="100%"></TD>
</TR>
<TR>
<TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
- <FORM ACTION="<%=$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
+ <FORM ACTION="<%$fsurl%>edit/cust_main.cgi" METHOD="GET" STYLE="margin:0">
<INPUT TYPE="submit" VALUE="New customer" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="vertical-align:bottom">
</FORM>
</TD>
<TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
- <FORM ACTION="<%=$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
+ <FORM ACTION="<%$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
<INPUT NAME="search_cust" TYPE="text" VALUE="(cust #, name, company or phone)" SIZE="28" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
- <A HREF="<%=$fsurl%>search/cust_main.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
+ <A HREF="<%$fsurl%>search/cust_main.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
<INPUT TYPE="submit" VALUE="Search customers" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
</FORM>
</TD>
<TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
- <% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { %>
- <FORM ACTION="<%=$fsurl%>search/cust_bill.html" METHOD="GET" STYLE="margin:0;display:inline">
+% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) {
+
+ <FORM ACTION="<%$fsurl%>search/cust_bill.html" METHOD="GET" STYLE="margin:0;display:inline">
<INPUT NAME="invnum" TYPE="text" VALUE="(inv #)" SIZE="4" onFocus="clearhint_search_invoice(this);" onClick="clearhint_search_invoice(this);" STYLE="vertical-align:bottom;text-align:right;margin-bottom:1px">
- <% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { %>
- <A HREF="<%=$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
- <% } %>
+% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) {
+
+ <A HREF="<%$fsurl%>search/report_cust_bill.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
+% }
+
<BR>
<INPUT TYPE="submit" VALUE="Search invoices" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
</FORM>
- <% } %>
+% }
+
</TD>
<TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right">
- <FORM ACTION="<%=$fsurl%>search/svc_Smart.html" METHOD="GET" STYLE="margin:0">
+ <FORM ACTION="<%$fsurl%>search/svc_Smart.html" METHOD="GET" STYLE="margin:0">
<INPUT NAME="search_svc" TYPE="text" VALUE="(user, user at domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
- <A HREF="<%=$fsurl%>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
+ <A HREF="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%">Advanced</A>
<INPUT TYPE="submit" VALUE="Search services"CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%">
</FORM>
</TD>
<TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right" STYLE="padding-right:4px">
- <FORM ACTION="<%=$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
+ <FORM ACTION="<%$fsurl%>rt/index.html" METHOD="GET" STYLE="margin:0">
<INPUT NAME="q" TYPE="text" VALUE="(ticket # or subject string)" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" STYLE="vertical-align:bottom;text-align:right"><BR>
- <A HREF="<%=$fsurl%>rt/Search/Build.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
+ <A HREF="<%$fsurl%>rt/Search/Build.html" STYLE="color: #ffffff; font-size: 70%">Advanced</A>
<INPUT TYPE="submit" VALUE="Search tickets" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%;padding-left:2px;padding-right:2px">
</FORM>
</TD>
@@ -168,8 +175,8 @@
<TABLE WIDTH="100%" HEIGHT="100%" CELLSPACING=0 CELLPADDING=4>
<TR>
<TD BGCOLOR="#000000" STYLE="padding:0" WIDTH="154"></TD>
- <TD STYLE="padding:0" WIDTH="13"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gray-corner.png"></TD>
- <TD STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD>
+ <TD STYLE="padding:0" WIDTH="13"><IMG BORDER=0 ALT="" SRC="<%$fsurl%>images/black-gray-corner.png"></TD>
+ <TD STYLE="padding:0"><IMG BORDER=0 ALT="" SRC="<%$fsurl%>images/black-gray-top.png" HEIGHT="13" WIDTH="100%"></TD>
</TR>
<TR HEIGHT="100%">
<TD BGCOLOR="#000000" ALIGN="left" HEIGHT="100%" WIDTH="154" VALIGN="top" ALIGN="right">
@@ -177,15 +184,15 @@
document.write(myBar);
</SCRIPT>
<BR>
- <IMG SRC="<%=$fsurl%>images/32clear.gif" HEIGHT="1" WIDTH="154">
+ <IMG SRC="<%$fsurl%>images/32clear.gif" HEIGHT="1" WIDTH="154">
</TD>
- <TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<%=$fsurl%>images/black-gray-side.png"></TD>
+ <TD STYLE="padding:0" HEIGHT="100%" WIDTH=13 VALIGN="top"><IMG WIDTH="13" HEIGHT="100%" BORDER=0 ALT="" SRC="<%$fsurl%>images/black-gray-side.png"></TD>
<TD BGCOLOR="#e8e8e8" HEIGHT="100%"> <!-- WIDTH="100%"> -->
<FONT SIZE=6>
- <%= $title %>
+ <% $title %>
</FONT>
<BR><BR>
- <%= $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
+ <% $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
Index: menubar.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/menubar.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- menubar.html 14 May 2006 16:47:30 -0000 1.2
+++ menubar.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,9 +1,10 @@
-<%
- my($item, $url, @html);
- while (@_) {
- ($item, $url) = splice(@_,0,2);
- next if $item =~ /^\s*Main\s+Menu\s*$/i;
- push @html, qq!<A HREF="$url">$item</A>!;
- }
-%>
-<%= join(' | ', @html) %>
+%
+% my($item, $url, @html);
+% while (@_) {
+% ($item, $url) = splice(@_,0,2);
+% next if $item =~ /^\s*Main\s+Menu\s*$/i;
+% push @html, qq!<A HREF="$url">$item</A>!;
+% }
+%
+
+<% join(' | ', @html) %>
Index: xmlhttp.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/xmlhttp.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xmlhttp.html 11 Mar 2006 05:21:20 -0000 1.7
+++ xmlhttp.html 23 Aug 2006 22:25:38 -0000 1.8
@@ -1,15 +1,16 @@
-<%
- my ( %opt ) = @_;
-
- my $url = $opt{'url'};
- my $method = exists($opt{'method'}) ? $opt{'method'} : 'GET';
- #my @subs = @{ $opt{'subs'};
- my $key = exists($opt{'key'}) ? $opt{'key'} : '';
-
- $url .= ( ($url =~ /\?/) ? '&' : '?' )
- if $method eq 'GET';
+%
+% my ( %opt ) = @_;
+%
+% my $url = $opt{'url'};
+% my $method = exists($opt{'method'}) ? $opt{'method'} : 'GET';
+% #my @subs = @{ $opt{'subs'};
+% my $key = exists($opt{'key'}) ? $opt{'key'} : '';
+%
+% $url .= ( ($url =~ /\?/) ? '&' : '?' )
+% if $method eq 'GET';
+%
+%
-%>
<SCRIPT TYPE="text/javascript">
@@ -31,22 +32,22 @@
return A;
}
+% foreach my $func ( @{$opt{'subs'}} ) {
+%
+% my $furl = $url;
+% $furl =~ s/\"/\\\\\"/; #javascript escape
+%
+%
- <% foreach my $func ( @{$opt{'subs'}} ) {
-
- my $furl = $url;
- $furl =~ s/\"/\\\\\"/; #javascript escape
-
- %>
- function <%=$key%><%=$func%>() {
+ function <%$key%><%$func%>() {
// count args; build URL
- var url = "<%=$furl%>";
- var a = <%=$key%><%=$func%>.arguments;
+ var url = "<%$furl%>";
+ var a = <%$key%><%$func%>.arguments;
var args;
var len;
- var content = 'sub=<%= uri_escape($func) %>';
+ var content = 'sub=<% uri_escape($func) %>';
if ( a && typeof a == 'object' && a[0].constructor == Array ) {
args = a[0];
len = args.length
@@ -58,14 +59,14 @@
content = content + "&arg=" + escape(args[i]);
content = content.replace( /[+]/g, '%2B'); // fix unescaped plus signs
- if ( '<%=$method%>' == 'GET' ) {
+ if ( '<%$method%>' == 'GET' ) {
url = url + content;
}
- //alert('<%=$method%> ' + url);
+ //alert('<%$method%> ' + url);
var xmlhttp = rs_init_object();
- xmlhttp.open("<%=$method%>", url, true);
+ xmlhttp.open("<%$method%>", url, true);
xmlhttp.onreadystatechange = function() {
if (xmlhttp.readyState != 4)
@@ -89,7 +90,7 @@
}
}
- if ( '<%=$method%>' == 'POST' ) {
+ if ( '<%$method%>' == 'POST' ) {
xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xmlhttp.send(content);
@@ -104,7 +105,7 @@
//rs_debug("x_$func_name url = " + url);
//rs_debug("x_$func_name waiting..");
}
+% }
- <% } %>
</SCRIPT>
Index: select-agent.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-agent.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- select-agent.html 11 Aug 2006 08:02:26 -0000 1.4
+++ select-agent.html 23 Aug 2006 22:25:38 -0000 1.5
@@ -1,10 +1,11 @@
-<%
- my( $agentnum, %opt ) = @_;
-
- $opt{'records'} = delete $opt{'agents'}
- if $opt{'agents'};
-
-%><%= include( '/elements/select-table.html',
+%
+% my( $agentnum, %opt ) = @_;
+%
+% $opt{'records'} = delete $opt{'agents'}
+% if $opt{'agents'};
+%
+%
+<% include( '/elements/select-table.html',
'table' => 'agent',
'name_col' => 'agent',
'value' => $agentnum,
Index: header-popup.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/header-popup.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- header-popup.html 21 Jun 2006 12:57:36 -0000 1.1
+++ header-popup.html 23 Aug 2006 22:25:37 -0000 1.2
@@ -1,22 +1,23 @@
-<%
- my($title, $menubar) = ( shift, shift ); #$menubar is unused here though
- my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
- my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
- my $conf = new FS::Conf;
-%>
+%
+% my($title, $menubar) = ( shift, shift ); #$menubar is unused here though
+% my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
+% my $head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
+% my $conf = new FS::Conf;
+%
+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
<HEAD>
<TITLE>
- <%= $title %>
+ <% $title %>
</TITLE>
<META HTTP-Equiv="Cache-Control" Content="no-cache">
<META HTTP-Equiv="Pragma" Content="no-cache">
<META HTTP-Equiv="Expires" Content="0">
- <%= $head %>
+ <% $head %>
</HEAD>
- <BODY BGCOLOR="#e8e8e8" <%= $etc %>>
+ <BODY BGCOLOR="#e8e8e8" <% $etc %>>
<FONT SIZE=6>
- <CENTER><%= $title %></CENTER>
+ <CENTER><% $title %></CENTER>
</FONT>
<BR><!--<BR>-->
Index: table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/table.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- table.html 8 Aug 2003 05:42:13 -0000 1.1
+++ table.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,8 +1,11 @@
-<%
- my $color = shift;
- if ( $color ) {
-%>
- <TABLE BGCOLOR="<%= $color %>" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
-<% } else { %>
+%
+% my $color = shift;
+% if ( $color ) {
+%
+
+ <TABLE BGCOLOR="<% $color %>" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
+% } else {
+
<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">
-<% } %>
+% }
+
Index: small_custview.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/small_custview.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- small_custview.html 3 Oct 2005 01:41:45 -0000 1.2
+++ small_custview.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,2 +1,3 @@
-<% my $conf = new FS::Conf; %>
-<%= small_custview( shift, shift || scalar($conf->config('countrydefault')), @_ ) %>
+% my $conf = new FS::Conf;
+
+<% small_custview( shift, shift || scalar($conf->config('countrydefault')), @_ ) %>
Index: select-cust_pkg-status.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-cust_pkg-status.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- select-cust_pkg-status.html 19 Jun 2006 08:05:28 -0000 1.1
+++ select-cust_pkg-status.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,19 +1,20 @@
-<%
- my( $status, %opt ) = @_;
-
- $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+%
+% my( $status, %opt ) = @_;
+%
+% $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+%
+%
-%>
<SELECT NAME="status">
<OPTION VALUE="">all
+% foreach my $status ( @{ $opt{'statuses'} } ) {
- <% foreach my $status ( @{ $opt{'statuses'} } ) { %>
- <OPTION VALUE="<%= $status %>"><%= $status %>
+ <OPTION VALUE="<% $status %>"><% $status %>
+% }
- <% } %>
</SELECT>
Index: select-taxclass.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-taxclass.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- select-taxclass.html 27 Oct 2005 17:04:25 -0000 1.2
+++ select-taxclass.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,42 +1,40 @@
-<%
- my $conf = new FS::Conf;
- my $selected_taxclass = scalar(@_) ? shift : '';
-%>
+%
+% my $conf = new FS::Conf;
+% my $selected_taxclass = scalar(@_) ? shift : '';
+%
+% if ( $conf->exists('enable_taxclasses') ) {
-<% if ( $conf->exists('enable_taxclasses') ) { %>
<SELECT NAME="taxclass">
+% if ( $conf->exists('require_taxclasses') ) {
- <% if ( $conf->exists('require_taxclasses') ) { %>
<OPTION VALUE="(select)">Select tax class
+% } else {
- <% } else { %>
<OPTION VALUE="">
+% }
+%
+% my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+% or die dbh->errstr;
+% $sth->execute or die $sth->errstr;
+% my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
+% my @taxclasses = grep $_, keys %taxclasses;
+%
+% foreach my $taxclass ( @taxclasses ) {
- <% } %>
-
- <%
- my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
- or die dbh->errstr;
- $sth->execute or die $sth->errstr;
- my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
- my @taxclasses = grep $_, keys %taxclasses;
- %>
-
- <% foreach my $taxclass ( @taxclasses ) { %>
-
- <OPTION VALUE="<%= $taxclass %>"<%= $taxclass eq $selected_taxclass ? ' SELECTED' : '' %>><%= $taxclass %>
- <% } %>
+ <OPTION VALUE="<% $taxclass %>"<% $taxclass eq $selected_taxclass ? ' SELECTED' : '' %>><% $taxclass %>
+% }
+
</SELECT>
+% } else {
-<% } else { %>
- <INPUT TYPE="hidden" NAME="taxclass" VALUE="<%= $selected_taxclass %>">
-
-<% } %>
+ <INPUT TYPE="hidden" NAME="taxclass" VALUE="<% $selected_taxclass %>">
+% }
+
Index: jsrsServer.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/jsrsServer.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jsrsServer.html 25 Sep 2005 08:13:35 -0000 1.2
+++ jsrsServer.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,3 +1,4 @@
-<%
- my $server = new FS::UI::Web::JSRPC '', $cgi;
-%><%= $server->process %>
+%
+% my $server = new FS::UI::Web::JSRPC '', $cgi;
+%
+<% $server->process %>
Index: tr-select-cust_pkg-status.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-cust_pkg-status.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr-select-cust_pkg-status.html 19 Jun 2006 08:05:28 -0000 1.1
+++ tr-select-cust_pkg-status.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,13 +1,14 @@
-<%
- my( $status, %opt ) = @_;
-
- $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+%
+% my( $status, %opt ) = @_;
+%
+% $opt{'statuses'} ||= [ FS::cust_pkg->statuses() ]; # { disabled=>'' } )
+%
+%
-%>
<TR>
- <TD ALIGN="right"><%= $opt{'label'} || 'Status' %></TD>
+ <TD ALIGN="right"><% $opt{'label'} || 'Status' %></TD>
<TD>
- <%= include( '/elements/select-cust_pkg-status.html', $status, %opt ) %>
+ <% include( '/elements/select-cust_pkg-status.html', $status, %opt ) %>
</TD>
</TR>
Index: tr-select-pkg_class.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-pkg_class.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tr-select-pkg_class.html 7 May 2006 20:27:21 -0000 1.2
+++ tr-select-pkg_class.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,22 +1,22 @@
-<%
- my( $classnum, %opt ) = @_;
-
- $opt{'pkg_class'} ||= [ qsearch( 'pkg_class', {} ) ]; # { disabled=>'' } )
-
- #warn "***** tr-select-pkg-class: \n". Dumper(%opt);
-%>
+%
+% my( $classnum, %opt ) = @_;
+%
+% $opt{'pkg_class'} ||= [ qsearch( 'pkg_class', {} ) ]; # { disabled=>'' } )
+%
+% #warn "***** tr-select-pkg-class: \n". Dumper(%opt);
+%
+% if ( scalar(@{ $opt{'pkg_class'} }) == 0 ) {
-<% if ( scalar(@{ $opt{'pkg_class'} }) == 0 ) { %>
<INPUT TYPE="hidden" NAME="classnum" VALUE="">
+% } else {
-<% } else { %>
<TR>
- <TD ALIGN="right"><%= $opt{'label'} || 'Package class' %></TD>
+ <TD ALIGN="right"><% $opt{'label'} || 'Package class' %></TD>
<TD>
- <%= include( '/elements/select-pkg_class.html', $classnum, %opt ) %>
+ <% include( '/elements/select-pkg_class.html', $classnum, %opt ) %>
</TD>
</TR>
+% }
-<% } %>
Index: search-cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/search-cust_main.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- search-cust_main.html 14 Aug 2006 12:13:39 -0000 1.1
+++ search-cust_main.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,27 +1,28 @@
-<%
- my( %opt ) = @_;
- $opt{'field_name'} ||= 'custnum';
+%
+% my( %opt ) = @_;
+% $opt{'field_name'} ||= 'custnum';
+%
+% my $cust_main = '';
+% if ( $opt{'value'} ) {
+% $cust_main = qsearchs(
+% 'table' => 'cust_main',
+% 'hashref' => { 'custnum' => $opt{'value'} },
+% 'extra_sql' => " AND ". $FS::CurrentUser::CurrentUser->agentnums_sql,
+% );
+% }
+%
- my $cust_main = '';
- if ( $opt{'value'} ) {
- $cust_main = qsearchs(
- 'table' => 'cust_main',
- 'hashref' => { 'custnum' => $opt{'value'} },
- 'extra_sql' => " AND ". $FS::CurrentUser::CurrentUser->agentnums_sql,
- );
- }
-%>
-<INPUT TYPE="hidden" NAME="<%= $opt{'field_name'} %>" VALUE="<%= $opt{'value'} %>">
+<INPUT TYPE="hidden" NAME="<% $opt{'field_name'} %>" VALUE="<% $opt{'value'} %>">
<!-- some false laziness w/ misc/batch-cust_pay.html, though not as bad as i'd thought at first... -->
-<INPUT TYPE="text" NAME="<%= $opt{'field_name'} %>_search" ID="<%= $opt{'field_name'} %>_search" SIZE="32" VALUE="<%= $cust_main ? $cust_main->name : '(cust #, name or company)' %>" onFocus="clearhint_<%= $opt{'field_name'} %>_search(this);" onClick="clearhint_<%= $opt{'field_name'} %>_search(this);" onChange="smart_<%= $opt{'field_name'} %>_search(this);">
+<INPUT TYPE="text" NAME="<% $opt{'field_name'} %>_search" ID="<% $opt{'field_name'} %>_search" SIZE="32" VALUE="<% $cust_main ? $cust_main->name : '(cust #, name or company)' %>" onFocus="clearhint_<% $opt{'field_name'} %>_search(this);" onClick="clearhint_<% $opt{'field_name'} %>_search(this);" onChange="smart_<% $opt{'field_name'} %>_search(this);">
-<SELECT NAME="<%= $opt{'field_name'} %>_select" ID="<%= $opt{'field_name'} %>_select" STYLE="color:#ff0000; display:none" onChange="select_<%= $opt{'field_name'} %>(this);">
+<SELECT NAME="<% $opt{'field_name'} %>_select" ID="<% $opt{'field_name'} %>_select" STYLE="color:#ff0000; display:none" onChange="select_<% $opt{'field_name'} %>(this);">
</SELECT>
-<%= include('/elements/xmlhttp.html',
+<% include('/elements/xmlhttp.html',
'url' => $p. 'misc/xmlhttp-cust_main-search.cgi',
'subs' => [ 'smart_search' ],
)
@@ -29,7 +30,7 @@
<SCRIPT TYPE="text/javascript">
- function clearhint_<%= $opt{'field_name'} %>_search (what) {
+ function clearhint_<% $opt{'field_name'} %>_search (what) {
what.style.color = '#000000';
@@ -41,7 +42,7 @@
}
- function smart_<%= $opt{'field_name'} %>_search(what) {
+ function smart_<% $opt{'field_name'} %>_search(what) {
var customer = what.value;
@@ -59,11 +60,11 @@
what.style.color= '#000000';
what.style.backgroundColor = '#dddddd';
- var customer_select = document.getElementById('<%= $opt{'field_name'} %>_select');
+ var customer_select = document.getElementById('<% $opt{'field_name'} %>_select');
//alert("search for customer " + customer);
- function <%= $opt{'field_name'} %>_search_update(customers) {
+ function <% $opt{'field_name'} %>_search_update(customers) {
//alert('customers returned: ' + customers);
@@ -74,7 +75,7 @@
if ( customerArray.length == 0 ) {
- what.form.<%= $opt{'field_name'} %>.value = '';
+ what.form.<% $opt{'field_name'} %>.value = '';
what.value = 'Customer not found: ' + what.value;
what.style.color = '#ff0000';
@@ -86,7 +87,7 @@
//alert('one customer found: ' + customerArray[0]);
- what.form.<%= $opt{'field_name'} %>.value = customerArray[0][0];
+ what.form.<% $opt{'field_name'} %>.value = customerArray[0][0];
what.value = customerArray[0][1];
what.style.display = '';
@@ -115,17 +116,17 @@
}
- smart_search( customer, <%= $opt{'field_name'} %>_search_update );
+ smart_search( customer, <% $opt{'field_name'} %>_search_update );
}
- function select_<%= $opt{'field_name'} %> (what) {
+ function select_<% $opt{'field_name'} %> (what) {
var custnum = what.options[what.selectedIndex].value;
var customer = what.options[what.selectedIndex].text;
- var customer_obj = document.getElementById('<%= $opt{'field_name'} %>_search');
+ var customer_obj = document.getElementById('<% $opt{'field_name'} %>_search');
if ( custnum == '' ) {
//what.style.color = '#ff0000';
@@ -140,7 +141,7 @@
} else {
- what.form.<%= $opt{'field_name'} %>.value = custnum;
+ what.form.<% $opt{'field_name'} %>.value = custnum;
customer_obj.value = customer;
customer_obj.style.color = '#000000';
Index: progress-popup.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/progress-popup.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- progress-popup.html 13 Mar 2006 22:32:51 -0000 1.5
+++ progress-popup.html 23 Aug 2006 22:25:38 -0000 1.6
@@ -1,16 +1,17 @@
-<%
- my $jobnum = $cgi->param('jobnum');
- my $url = $cgi->param('url');
- my $message = $cgi->param('message');
- my $formname = scalar($cgi->param('formname'));
-%>
+%
+% my $jobnum = $cgi->param('jobnum');
+% my $url = $cgi->param('url');
+% my $message = $cgi->param('message');
+% my $formname = scalar($cgi->param('formname'));
+%
+
<HTML>
<HEAD>
<TITLE></TITLE>
</HEAD>
<BODY BGCOLOR="#ccccff" onLoad="refreshStatus()">
-<%= include('/elements/xmlhttp.html',
+<% include('/elements/xmlhttp.html',
'url' => $p.'elements/jsrsServer.html',
'subs' => [ 'job_status' ],
)
@@ -20,9 +21,9 @@
<SCRIPT TYPE="text/javascript" src="../elements/qlib/progress.js"></SCRIPT>
<SCRIPT TYPE="text/javascript">
function refreshStatus () {
- //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
+ //jsrsExecute( '<%$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<% $jobnum %>' );
- job_status( '<%= $jobnum %>', updateStatus );
+ job_status( '<% $jobnum %>', updateStatus );
}
function updateStatus( status_statustext ) {
@@ -37,29 +38,33 @@
document.getElementById("progress_percent").innerHTML = statustext + '%';
bar1.set(statustext);
bar1.update;
- //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
- job_status( '<%= $jobnum %>', updateStatus );
+ //jsrsExecute( '<%$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<% $jobnum %>' );
+ job_status( '<% $jobnum %>', updateStatus );
} else if ( status.indexOf('complete') > -1 ) {
-<% if ( $message ) { %>
- document.getElementById("progress_message").innerHTML = "<%= $message %>";
+% if ( $message ) {
+
+ document.getElementById("progress_message").innerHTML = "<% $message %>";
document.getElementById("progress_bar").innerHTML = '';
document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
document.getElementById("progress_jobnum").innerHTML = '';
- if ( parent.document.<%=$formname%>.submit.disabled == true ) {
- parent.document.<%=$formname%>.submit.disabled=false;
+ if ( parent.document.<%$formname%>.submit.disabled == true ) {
+ parent.document.<%$formname%>.submit.disabled=false;
}
-<% } elsif ( $url ) { %>
- window.top.location.href = '<%= $url %>';
-<% } else { %>
+% } elsif ( $url ) {
+
+ window.top.location.href = '<% $url %>';
+% } else {
+
alert('job done but no url or message specified');
-<% } %>
+% }
+
} else if ( status.indexOf('error') > -1 ) {
document.getElementById("progress_message").innerHTML = '<FONT SIZE="+1" COLOR="#FF0000">Error: ' + statustext + '</FONT>';
document.getElementById("progress_bar").innerHTML = '';
document.getElementById("progress_percent").innerHTML = '<INPUT TYPE="button" VALUE="OK" onClick="parent.nd(1);">';
document.getElementById("progress_jobnum").innerHTML = '';
- if ( parent.document.<%=$formname%>.submit.disabled == true ) {
- parent.document.<%=$formname%>.submit.disabled=false;
+ if ( parent.document.<%$formname%>.submit.disabled == true ) {
+ parent.document.<%$formname%>.submit.disabled=false;
}
} else {
alert('XXX unknown status returned from server: ' + status);
@@ -90,7 +95,7 @@
</TD>
</TR><TR>
<TD ALIGN="center" ID="progress_jobnum">
- (progress of job #<%= $jobnum %>)
+ (progress of job #<% $jobnum %>)
</TD>
</TR>
</TABLE>
Index: tr-select-from_to.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-from_to.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr-select-from_to.html 7 May 2006 20:27:21 -0000 1.1
+++ tr-select-from_to.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,33 +1,34 @@
-<%
-
- #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
- my ($curmon,$curyear) = (localtime(time))[4,5];
-
- #find first month
- my $syear = 1899+$curyear;
- my $smonth = $curmon+1;
-
- #want 12 month by default, not 13
- $smonth++;
- if ( $smonth > 12 ) { $smonth-=12; $syear++ }
-
- #find last month
- my $eyear = 1900+$curyear;
- my $emonth = $curmon+1;
-
- my %hash = (
- 'show_month_abbr' => 1,
- 'start_year' => '1999',
- 'end_year' => '2012', #haha, well...
- @_,
- );
+%
+%
+% #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+% my ($curmon,$curyear) = (localtime(time))[4,5];
+%
+% #find first month
+% my $syear = 1899+$curyear;
+% my $smonth = $curmon+1;
+%
+% #want 12 month by default, not 13
+% $smonth++;
+% if ( $smonth > 12 ) { $smonth-=12; $syear++ }
+%
+% #find last month
+% my $eyear = 1900+$curyear;
+% my $emonth = $curmon+1;
+%
+% my %hash = (
+% 'show_month_abbr' => 1,
+% 'start_year' => '1999',
+% 'end_year' => '2012', #haha, well...
+% @_,
+% );
+%
+%
-%>
<TR>
<TD ALIGN="right">From: </TD>
<TD>
- <%= include('/elements/select-month_year.html',
+ <% include('/elements/select-month_year.html',
'prefix' => 'start',
'selected_mon' => $smonth,
'selected_year' => $syear,
@@ -40,7 +41,7 @@
<TR>
<TD ALIGN="right">To: </TD>
<TD>
- <%= include('/elements/select-month_year.html',
+ <% include('/elements/select-month_year.html',
'prefix' => 'end',
'selected_mon' => $emonth,
'selected_year' => $eyear,
Index: checkboxes-table-name.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/checkboxes-table-name.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- checkboxes-table-name.html 18 Jun 2006 12:54:48 -0000 1.1
+++ checkboxes-table-name.html 23 Aug 2006 22:25:37 -0000 1.2
@@ -1,85 +1,85 @@
-<%
-
- ##
- # required
- ##
- # 'link_table' => 'table_name',
- #
- # 'name_col' => 'name_column',
- # #or
- # 'name_callback' => sub { },
- #
- # 'names_list' => [ 'value', 'other value' ],
- #
- ##
- # recommended (required?)
- ##
- # 'source_obj' => $obj,
- # #or?
- # #'source_table' => 'table_name',
- # #'sourcenum' => '4', #current value of primary key in source_table
- # # # (none is okay, just pass it if you have it)
- ##
- # optional
- ##
- # 'num_col' => 'col_name' #if column name is different in link_table than
- # #source_table
- # 'link_static' => { 'column' => 'value' },
-
- my( %opt ) = @_;
-
- my( $source_pkey, $sourcenum, $source_obj );
- if ( $opt{'source_obj'} ) {
-
- $source_obj = $opt{'source_obj'};
- #$source_table = $source_obj->dbdef_table->table;
- $source_pkey = $source_obj->dbdef_table->primary_key;
- $sourcenum = $source_obj->$source_pkey();
-
- } else {
-
- #$source_obj?
- $source_pkey = $opt{'source_table'}
- ? dbdef->table($opt{'source_table'})->primary_key
- : '';
- $sourcenum = $opt{'sourcenum'};
- }
-
- $source_pkey = $opt{'num_col'} || $source_pkey;
-
- my $link_static = $opt{'link_static'} || {};
-
-%>
-
-<% foreach my $name ( @{ $opt{'names_list'} } ) {
-
- my $checked;
- if ( $cgi->param('error') ) {
-
- $checked = $cgi->param($opt{'link_table'}. ".$name" )
- ? 'CHECKED'
- : '';
-
- } else {
-
- $checked =
- qsearchs( $opt{'link_table'}, {
- $source_pkey => $sourcenum,
- $opt{'name_col'} => $name,
- %$link_static,
- } )
- ? 'CHECKED'
- : ''
-
- }
+%
+%
+% ##
+% # required
+% ##
+% # 'link_table' => 'table_name',
+% #
+% # 'name_col' => 'name_column',
+% # #or
+% # 'name_callback' => sub { },
+% #
+% # 'names_list' => [ 'value', 'other value' ],
+% #
+% ##
+% # recommended (required?)
+% ##
+% # 'source_obj' => $obj,
+% # #or?
+% # #'source_table' => 'table_name',
+% # #'sourcenum' => '4', #current value of primary key in source_table
+% # # # (none is okay, just pass it if you have it)
+% ##
+% # optional
+% ##
+% # 'num_col' => 'col_name' #if column name is different in link_table than
+% # #source_table
+% # 'link_static' => { 'column' => 'value' },
+%
+% my( %opt ) = @_;
+%
+% my( $source_pkey, $sourcenum, $source_obj );
+% if ( $opt{'source_obj'} ) {
+%
+% $source_obj = $opt{'source_obj'};
+% #$source_table = $source_obj->dbdef_table->table;
+% $source_pkey = $source_obj->dbdef_table->primary_key;
+% $sourcenum = $source_obj->$source_pkey();
+%
+% } else {
+%
+% #$source_obj?
+% $source_pkey = $opt{'source_table'}
+% ? dbdef->table($opt{'source_table'})->primary_key
+% : '';
+% $sourcenum = $opt{'sourcenum'};
+% }
+%
+% $source_pkey = $opt{'num_col'} || $source_pkey;
+%
+% my $link_static = $opt{'link_static'} || {};
+%
+%
+% foreach my $name ( @{ $opt{'names_list'} } ) {
+%
+% my $checked;
+% if ( $cgi->param('error') ) {
+%
+% $checked = $cgi->param($opt{'link_table'}. ".$name" )
+% ? 'CHECKED'
+% : '';
+%
+% } else {
+%
+% $checked =
+% qsearchs( $opt{'link_table'}, {
+% $source_pkey => $sourcenum,
+% $opt{'name_col'} => $name,
+% %$link_static,
+% } )
+% ? 'CHECKED'
+% : ''
+%
+% }
+%
+%
-%>
- <INPUT TYPE="checkbox" NAME="<%= $opt{'link_table'}. ".$name" %>" <%= $checked %> VALUE="ON">
+ <INPUT TYPE="checkbox" NAME="<% $opt{'link_table'}. ".$name" %>" <% $checked %> VALUE="ON">
- <%= $name %>
+ <% $name %>
<BR>
+% }
-<% } %>
Index: select-table.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-table.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- select-table.html 24 Jun 2006 16:41:45 -0000 1.4
+++ select-table.html 23 Aug 2006 22:25:38 -0000 1.5
@@ -1,63 +1,65 @@
-<%
-
- ##required
- # 'table' => 'table_name',
- # 'name_col' => 'name_column',
- #
- ##strongly recommended (you want your forms to be "sticky" on errors, right?)
- # 'value' => 'current_value',
- #
- ##opt
- # 'empty_label' => '', #better specify it though, the default might change
- # 'hashref' => {},
- # 'extra_sql' => '',
- # 'records' => \@records, #instead of hashref
- # 'pre_options' => [ 'value' => 'option' ], #before normal options
- # 'element_name' => '', #HTML element name, defaults to the name of
- # # the primary key column
- # 'element_etc' => '', #additional attributes (i.e. "DISABLED") for the
- # #<SELECT> element
-
- my( %opt ) = @_;
-
- #warn "***** select-table: \n". Dumper(%opt);
-
- my $key = dbdef->table($opt{'table'})->primary_key; #? $opt{'primary_key'} ||
-
- my $name_col = $opt{'name_col'};
-
- my @records = ();
- if ( $opt{'records'} ) {
- @records = @{ $opt{'records'} };
- } else {
- @records = qsearch( {
- 'table' => $opt{'table'},
- 'hashref' => ( $opt{'hashref'} || {} ),
- 'extra_sql' => ( $opt{'extra_sql'} || '' ),
- });
- }
+%
+%
+% ##required
+% # 'table' => 'table_name',
+% # 'name_col' => 'name_column',
+% #
+% ##strongly recommended (you want your forms to be "sticky" on errors, right?)
+% # 'value' => 'current_value',
+% #
+% ##opt
+% # 'empty_label' => '', #better specify it though, the default might change
+% # 'hashref' => {},
+% # 'extra_sql' => '',
+% # 'records' => \@records, #instead of hashref
+% # 'pre_options' => [ 'value' => 'option' ], #before normal options
+% # 'element_name' => '', #HTML element name, defaults to the name of
+% # # the primary key column
+% # 'element_etc' => '', #additional attributes (i.e. "DISABLED") for the
+% # #<SELECT> element
+%
+% my( %opt ) = @_;
+%
+% #warn "***** select-table: \n". Dumper(%opt);
+%
+% my $key = dbdef->table($opt{'table'})->primary_key; #? $opt{'primary_key'} ||
+%
+% my $name_col = $opt{'name_col'};
+%
+% my @records = ();
+% if ( $opt{'records'} ) {
+% @records = @{ $opt{'records'} };
+% } else {
+% @records = qsearch( {
+% 'table' => $opt{'table'},
+% 'hashref' => ( $opt{'hashref'} || {} ),
+% 'extra_sql' => ( $opt{'extra_sql'} || '' ),
+% });
+% }
+%
+% my @pre_options = $opt{'pre_options'} ? @{ $opt{'pre_options'} } : ();
+%
+%
- my @pre_options = $opt{'pre_options'} ? @{ $opt{'pre_options'} } : ();
-%>
+<SELECT NAME="<% $opt{'element_name'} || $key %>" <% $opt{'element_etc'} %>>
+% while ( @pre_options ) {
-<SELECT NAME="<%= $opt{'element_name'} || $key %>" <%= $opt{'element_etc'} %>>
+ <OPTION VALUE="<% shift(@pre_options) %>"><% shift(@pre_options) %>
+% }
- <% while ( @pre_options ) { %>
- <OPTION VALUE="<%= shift(@pre_options) %>"><%= shift(@pre_options) %>
- <% } %>
- <OPTION VALUE=""><%= $opt{'empty_label'} || 'all' %>
+ <OPTION VALUE=""><% $opt{'empty_label'} || 'all' %>
+% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() }
+% @records
+% )
+% {
+%
- <% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col() }
- @records
- )
- {
- %>
- <OPTION VALUE="<%= $record->$key() %>"<%= $opt{'value'} == $record->$key() ? ' SELECTED' : '' %>><%= $record->$name_col() %>
+ <OPTION VALUE="<% $record->$key() %>"<% $opt{'value'} == $record->$key() ? ' SELECTED' : '' %>><% $record->$name_col() %>
+% }
- <% } %>
</SELECT>
Index: select-month_year.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-month_year.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- select-month_year.html 7 May 2006 20:27:21 -0000 1.2
+++ select-month_year.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,59 +1,62 @@
-<%
-
- my %opt = @_;
-
- my $prefix = $opt{'prefix'} || '';
- my $disabled = $opt{'disabled'} || '';
- my $empty = $opt{'empty_option'} || '';
- my $start_year = $opt{'start_year'};
- my $end_year = $opt{'end_year'} || '2037';
-
- my @mon;
- if ( $opt{'show_month_abbr'} ) {
- @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
- } else {
- @mon = ( 1 .. 12 );
- }
-
- my $date = $opt{'selected_date'} || '';
- $date = '' if $date eq '-';
- #$date ||= '01-2000' unless $empty;
+%
+%
+% my %opt = @_;
+%
+% my $prefix = $opt{'prefix'} || '';
+% my $disabled = $opt{'disabled'} || '';
+% my $empty = $opt{'empty_option'} || '';
+% my $start_year = $opt{'start_year'};
+% my $end_year = $opt{'end_year'} || '2037';
+%
+% my @mon;
+% if ( $opt{'show_month_abbr'} ) {
+% @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+% } else {
+% @mon = ( 1 .. 12 );
+% }
+%
+% my $date = $opt{'selected_date'} || '';
+% $date = '' if $date eq '-';
+% #$date ||= '01-2000' unless $empty;
+%
+% my $mon = $opt{'selected_mon'} || 0;
+% my $year = $opt{'selected_year'} || 0;
+% if ( $date ) {
+% if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
+% ( $mon, $year ) = ( $2, $1 );
+% } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
+% ( $mon, $year ) = ( $1, $3 );
+% } else {
+% die "unrecognized expiration date format: $date";
+% }
+% }
+%
+% unless ( $start_year ) {
+% my @t = localtime;
+% $start_year = $t[5] + 1900;
+% }
+% $start_year = $year if $start_year > $year && $year > 0;
+%
+%
- my $mon = $opt{'selected_mon'} || 0;
- my $year = $opt{'selected_year'} || 0;
- if ( $date ) {
- if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format
- ( $mon, $year ) = ( $2, $1 );
- } elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) {
- ( $mon, $year ) = ( $1, $3 );
- } else {
- die "unrecognized expiration date format: $date";
- }
- }
- unless ( $start_year ) {
- my @t = localtime;
- $start_year = $t[5] + 1900;
- }
- $start_year = $year if $start_year > $year && $year > 0;
+<SELECT NAME="<% $prefix %>_month" SIZE="1" <% $disabled%>>
-%>
+<% $empty ? '<OPTION VALUE="">' : '' %>
+% foreach ( 1 .. 12 ) {
-<SELECT NAME="<%= $prefix %>_month" SIZE="1" <%= $disabled%>>
+ <OPTION<% $_ == $mon ? ' SELECTED' : '' %> VALUE="<% $_ %>"><% $mon[$_-1] %>
+% }
-<%= $empty ? '<OPTION VALUE="">' : '' %>
-<% foreach ( 1 .. 12 ) { %>
- <OPTION<%= $_ == $mon ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $mon[$_-1] %>
-<% } %>
+</SELECT>/<SELECT NAME="<% $prefix %>_year" SIZE="1" <% $disabled%>>
-</SELECT>/<SELECT NAME="<%= $prefix %>_year" SIZE="1" <%= $disabled%>>
+<% $empty ? '<OPTION VALUE="">' : '' %>
+% for ( $start_year .. $end_year ) {
-<%= $empty ? '<OPTION VALUE="">' : '' %>
+ <OPTION<% $_ == $year ? ' SELECTED' : '' %> VALUE="<% $_ %>"><% $_ %>
+% }
-<% for ( $start_year .. $end_year ) { %>
- <OPTION<%= $_ == $year ? ' SELECTED' : '' %> VALUE="<%= $_ %>"><%= $_ %>
-<% } %>
</SELECT>
Index: phonenumber.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/phonenumber.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- phonenumber.html 16 Jul 2006 00:55:06 -0000 1.2
+++ phonenumber.html 23 Aug 2006 22:25:38 -0000 1.3
@@ -1,17 +1,22 @@
-<%
- my( $number, %opt ) = @_;
- my $conf = new FS::Conf;
- ( my $snumber = $number ) =~ s/\D//g;
-%>
+%
+% my( $number, %opt ) = @_;
+% my $conf = new FS::Conf;
+% ( my $snumber = $number ) =~ s/\D//g;
+%
+
<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
<SCRIPT TYPE="text/javascript" SRC="../elements/iframecontentmws.js"></SCRIPT>
-<% if ( length($number) ) { %>
- <%= $number %>
- <% if ( $opt{'callable'} && $conf->config('vonage-username') ) { %>
- <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('https://secure.click2callu.com/tpcc/makecall?username=<%= $conf->config('vonage-username') %>&password=<%= $conf->config('vonage-password') %>&fromnumber=<%= $conf->config('vonage-fromnumber')%>&tonumber=1<%= $snumber %>', 240, 64, 'call_popup'), CAPTION, 'Initiating call', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE, WIDTH, 240, HEIGHT, 64 ); return false;" TITLE="Call this number"><IMG SRC="<%=$fsurl%>images/red_telephone_mimooh_01.png" BORDER=0 ALT="Call this number"></A>
- <% } %>
-<% } else { %>
+% if ( length($number) ) {
+
+ <% $number %>
+% if ( $opt{'callable'} && $conf->config('vonage-username') ) {
+
+ <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('https://secure.click2callu.com/tpcc/makecall?username=<% $conf->config('vonage-username') %>&password=<% $conf->config('vonage-password') %>&fromnumber=<% $conf->config('vonage-fromnumber')%>&tonumber=1<% $snumber %>', 240, 64, 'call_popup'), CAPTION, 'Initiating call', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE, WIDTH, 240, HEIGHT, 64 ); return false;" TITLE="Call this number"><IMG SRC="<%$fsurl%>images/red_telephone_mimooh_01.png" BORDER=0 ALT="Call this number"></A>
+% }
+% } else {
+
-<% } %>
+% }
+
Index: table-grid.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/table-grid.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- table-grid.html 25 Jul 2006 08:33:46 -0000 1.3
+++ table-grid.html 23 Aug 2006 22:25:38 -0000 1.4
@@ -1,9 +1,10 @@
-<%
- my %opt = @_;
- $opt{cellspacing} ||= 0;
- $opt{cellpadding} ||= 0;
+%
+% my %opt = @_;
+% $opt{cellspacing} ||= 0;
+% $opt{cellpadding} ||= 0;
+%
+%
-%>
<STYLE TYPE="text/css">
.grid table { border: solid; empty-cells: show }
@@ -16,5 +17,5 @@
</STYLE>
-<TABLE CLASS="grid" CELLSPACING=<%= $opt{cellspacing} %> CELLPADDING=<%= $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+<TABLE CLASS="grid" CELLSPACING=<% $opt{cellspacing} %> CELLPADDING=<% $opt{cellpadding} %> BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
Index: select-access_group.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-access_group.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- select-access_group.html 14 May 2006 16:47:30 -0000 1.1
+++ select-access_group.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,10 +1,11 @@
-<%
- my( $groupnum, %opt ) = @_;
-
- %opt{'records'} = delete $opt{'access_group'}
- if $opt{'access_group'};
-
-%><%= include( '/elements/select-table.html',
+%
+% my( $groupnum, %opt ) = @_;
+%
+% %opt{'records'} = delete $opt{'access_group'}
+% if $opt{'access_group'};
+%
+%
+<% include( '/elements/select-table.html',
'table' => 'access_group',
'name_col' => 'groupname',
'value' => $groupnum,
Index: select-part_referral.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-part_referral.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- select-part_referral.html 11 Aug 2006 08:02:26 -0000 1.1
+++ select-part_referral.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,10 +1,11 @@
-<%
- my( $refnum, %opt ) = @_;
-
- $opt{'records'} = delete $opt{'part_referrals'}
- if $opt{'part_referrals'};
-
-%><%= include( '/elements/select-table.html',
+%
+% my( $refnum, %opt ) = @_;
+%
+% $opt{'records'} = delete $opt{'part_referrals'}
+% if $opt{'part_referrals'};
+%
+%
+<% include( '/elements/select-table.html',
'table' => 'part_referral',
'name_col' => 'referral',
'value' => $refnum,
Index: menu.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/menu.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- menu.html 10 Aug 2006 11:55:50 -0000 1.7
+++ menu.html 23 Aug 2006 22:25:38 -0000 1.8
@@ -1,329 +1,330 @@
-<%
- my( %opt ) = @_;
- my $conf = new FS::Conf;
- my $fsurl = $opt{'freeside_baseurl'};
-
- my $curuser = $FS::CurrentUser::CurrentUser;
-
- #Active tickets not assigned to a customer
-
- tie my %report_customers_lists, 'Tie::IxHash',
- 'by customer number' => [ $fsurl. 'search/cust_main.cgi?browse=custnum', '' ],
- 'by last name' => [ $fsurl. 'search/cust_main.cgi?browse=last', '' ],
- 'by company name' => [ $fsurl. 'search/cust_main.cgi?browse=company', '' ],
- 'by active trouble tickets' => [ $fsurl. 'search/cust_main.cgi?browse=tickets', '' ],
- ;
-
- tie my %report_customers_search, 'Tie::IxHash',
- 'by ordering employee' => [ $fsurl. 'search/cust_main-otaker.cgi' ],
- ;
-
- tie my %report_customers, 'Tie::IxHash',
- 'List customers' => [ \%report_customers_lists, 'List customers' ],
- 'Search customers' => [ \%report_customers_search, 'Search customers' ],
- 'Zip code distribution' => [ $fsurl.'search/report_cust_main-zip.html', 'Zip codes by number of customers' ],
- ;
-
- tie my %report_invoices_open, 'Tie::IxHash',
- 'All open invoices' => [ $fsurl.'search/cust_bill.html?OPEN_date', 'All invoices with an unpaid balance' ],
- '15 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN15_date', 'Invoices 15 days or older with an unpaid balance' ],
- '30 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN30_date', 'Invoices 30 days or older with an unpaid balance' ],
- '60 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN60_date', 'Invoices 60 days or older with an unpaid balance' ],
- '90 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN90_date', 'Invoices 90 days or older with an unpaid balance' ],
- '120 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN120_date', 'Invoices 120 days or older with an unpaid balance' ],
- ;
-
- tie my %report_invoices, 'Tie::IxHash',
- 'Open invoices' => [ \%report_invoices_open, 'Open invoices' ],
- 'All invoices' => [ $fsurl. 'search/cust_bill.html?date', 'List all invoices' ],
- 'Advanced invoice reports' => [ $fsurl.'search/report_cust_bill.html', 'by agent, date range, etc.' ],
- ;
-
- tie my %report_services_acct, 'Tie::IxHash',
- 'All accounts by username' => [ $fsurl.'search/svc_acct.cgi?username', '' ],
- 'All accounts by UID' => [ $fsurl.'search/svc_acct.cgi?uid', '' ],
- ;
- $report_services_acct{'Unlinked accounts'} = [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ]
- if $curuser->access_right('View/link unlinked services');
-
- tie my %report_services_domain, 'Tie::IxHash',
- 'All domains' => [ $fsurl.'search/svc_domain.cgi?domain', '' ],
- ;
- $report_services_domain{'Unlinked domains'} = [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ]
- if $curuser->access_right('View/link unlinked services');
-
- tie my %report_services_forward, 'Tie::IxHash',
- 'All mail forwards' => [ $fsurl.'search/svc_forward.cgi?svcnum', '' ],
- ;
- $report_services_forward{'Unlinked mail forwards'} = [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ]
- if $curuser->access_right('View/link unlinked services');
-
- tie my %report_services_www, 'Tie::IxHash',
- 'All virtual hosts' => [ $fsurl.'search/svc_www.cgi?svcnum', '' ],
- ;
- $report_services_www{'Unlinked virtual hosts'} = [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ]
- if $curuser->access_right('View/link unlinked services');
-
- tie my %report_services_broadband, 'Tie::IxHash',
- 'All broadband services' => [ $fsurl.'search/svc_broadband.cgi?svcnum', '' ],
- #'Unlinked domain' => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside domains without a customer record' ],
- ;
-
- tie my %report_services_phone, 'Tie::IxHash',
- 'All phone numbers' => [ $fsurl.'search/svc_phone.cgi?svcnum', '' ],
- ;
-
- tie my %report_services_external, 'Tie::IxHash',
- 'All external services' => [ $fsurl.'search/svc_external.cgi?id', '' ],
- ;
- $report_services_external{'Unlinked external services'} = [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ]
- if $curuser->access_right('View/link unlinked services');
-
- tie my %report_services, 'Tie::IxHash';
- if ( $curuser->access_right('Configuration') ) {
- $report_services{'Service definitions'} = [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ];
- $report_services{'separator'} = '';
- }
- $report_services{'Accounts'} = [ \%report_services_acct, 'Access accounts and mailboxes' ];
- $report_services{'Domains'} = [ \%report_services_domain, 'Domains', ];
- $report_services{'Mail forwards'} = [ \%report_services_forward, 'Mail forwards', ];
- $report_services{'Virtual hosts'} = [ \%report_services_www, 'Virtual hosting', ];
- $report_services{'Broadband services'} = [ \%report_services_broadband, 'Fixed (username-less) broadband services', ];
- $report_services{'Phone numbers'} = [ \%report_services_phone, 'Telephone numbers', ];
- $report_services{'External services'} = [ \%report_services_external, 'External services', ];
-
- tie my %report_packages, 'Tie::IxHash';
- if ( $curuser->access_right('Configuration') ) {
- $report_packages{'Package definitions'} = [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ];
- $report_packages{'separator'} = '';
- }
- $report_packages{'All customer packages'} = [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ];
- $report_packages{'Suspended customer packages'} = [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ];
- $report_packages{'Customer packages with unconfigured services'} = [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
- $report_packages{'Advanced package reports'} = [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ];
-
- tie my %report_rating, 'Tie::IxHash',
- 'Call Detail Records (CDRs)' => [ $fsurl.'search/report_cdr.html', '' ],
- ;
-
- tie my %report_financial, 'Tie::IxHash',
- 'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
- 'Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg.html', 'Sales report and graph (by agent, package class and/or date range)' ],
- 'Credit Report' => [ $fsurl.'search/report_cust_credit.html', 'Credit report (by employee and/or date range)' ],
- 'Payment Report' => [ $fsurl.'search/report_cust_pay.html', 'Credit report (by type and/or date range)' ],
- 'A/R Aging' => [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ],
- 'Prepaid Income' => [ $fsurl.'search/report_prepaid_income.html', 'Prepaid income (unearned revenue) report' ],
- 'Sales Tax Liability' => [ $fsurl.'search/report_tax.html', 'Sales tax liability report' ],
- ;
-
- tie my %report_menu, 'Tie::IxHash';
- $report_menu{'Customers'} = [ \%report_customers, 'Customer reports' ]
- if $curuser->access_right('List customers');
- $report_menu{'Invoices'} = [ \%report_invoices, 'Invoice reports' ]
- if $curuser->access_right('List invoices');
- $report_menu{'Packages'} = [ \%report_packages, 'Package reports' ]
- if $curuser->access_right('List packages');
- $report_menu{'Services'} = [ \%report_services, 'Services reports' ]
- if $curuser->access_right('List services');
- $report_menu{'Rating data'} = [ \%report_rating, 'Rating reports' ]
- if $curuser->access_right('List rating data');
- $report_menu{'Financial'} = [ \%report_financial, 'Financial reports' ]
- if $curuser->access_right('Financial reports');
-
- tie my %tools_importing, 'Tie::IxHash',
- 'Import customers from CSV file' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
- 'Import one-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ],
- 'Import Call Detail Records (CDRs) from CSV file' => [ $fsurl.'misc/cdr-import.html', '' ],
- ;
-
- tie my %tools_exporting, 'Tie::IxHash',
- 'Download database dump' => [ $fsurl. 'misc/dump.cgi', '' ],
- ;
-
- # <!-- <BR>View active NAS ports:
- # <A HREF="browse/nas.cgi">session server</A> -->
- # <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
- # <BR> -->
-
- tie my %tools_menu, 'Tie::IxHash', ();
- $tools_menu{'Quick payment entry'} = [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ]
- if $curuser->access_right('Post payment batch');
- $tools_menu{'Job Queue'} = [ $fsurl.'search/queue.html', 'View pending job queue' ]
- if $curuser->access_right('Job queue');
- $tools_menu{'Importing'} = [ \%tools_importing, 'Import tools' ]
- if $curuser->access_right('Import');
- $tools_menu{'Exporting'} = [ \%tools_exporting, 'Export tools' ]
- if $curuser->access_right('Export');
-
- tie my %config_employees, 'Tie::IxHash',
- 'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
- 'View/Edit employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
- ;
-
- tie my %config_export_svc_pkg, 'Tie::IxHash',
- 'View/Edit exports' => [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ],
- 'View/Edit service definitions' => [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ],
- 'View/Edit package definitions' => [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ],
- 'View/Edit package classes' => [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for reporting and convenience purposes.' ],
- ;
-
- tie my %config_agent, 'Tie::IxHash',
- 'View/Edit agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
- 'View/Edit agents' => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
- ;
-
- tie my %config_billing, 'Tie::IxHash',
- 'View/Edit payment gateways' => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
- 'View/Edit invoice events' => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
- 'View/Edit prepaid cards' => [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ],
- 'View/Edit call rates and regions' => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
- 'View/Edit locales and tax rates' => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
- ;
-
- tie my %config_dialup, 'Tie::IxHash',
- 'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
- ;
-
- tie my %config_broadband, 'Tie::IxHash',
- 'View/Edit routers' => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
- 'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
- ;
-
- tie my %config_misc, 'Tie::IxHash';
- $config_misc{'View/Edit advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service. Tracked for informational purposes' ]
- if $curuser->access_right('Configuration')
- || $curuser->access_right('Edit advertising sources')
- || $curuser->access_right('Edit global advertising sources');
- if ( $curuser->access_right('Configuration') ) {
- $config_misc{'View/Edit virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ];
- $config_misc{'View/Edit message catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ];
- $config_misc{'View/Edit inventory classes and inventory'} = [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ];
- }
-
- tie my %config_menu, 'Tie::IxHash';
- if ( $curuser->access_right('Configuration' ) ) {
- %config_menu = (
- 'Settings' => [ $fsurl.'config/config-view.cgi', '' ],
- 'separator' => '', #its a separator!
- 'Employees' => [ \%config_employees, '' ],
- 'Provisioning, services and packages'
- => [ \%config_export_svc_pkg, '' ],
- 'Resellers' => [ \%config_agent, '' ],
- 'Billing' => [ \%config_billing, '' ],
- 'Dialup' => [ \%config_dialup, '' ],
- 'Fixed (username-less) broadband'
- => [ \%config_broadband, '' ],
- );
- }
- $config_menu{'Miscellaneous'} = [ \%config_misc, '' ]
- if $curuser->access_right('Configuration')
- || $curuser->access_right('Edit advertising sources')
- || $curuser->access_right('Edit global advertising sources');
-
- tie my %menu, 'Tie::IxHash',
- 'Billing Main' => [ $fsurl, 'Billing start page', ],
- 'Ticketing Main' => [
- ( $conf->config('ticket_system') eq 'RT_External'
- ? FS::TicketSystem->baseurl()
- : $fsurl.'rt/'
- ),
- 'Ticketing start page',
- ],
- ;
- $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
- if keys %report_menu;
- $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
- if keys %tools_menu;
- $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
- if $curuser->access_right('Configuration')
- || $curuser->access_right('Edit advertising sources')
- || $curuser->access_right('Edit global advertising sources');
-
- use vars qw($gmenunum);
- $gmenunum = 0;
-
- sub submenu {
- my($submenu, $title) = @_;
- my $menunum = $gmenunum++;
-
- #return two args: html, menuname
-
- "var myMenu$menunum = new WebFXMenu;\n".
- #"myMenu$menunum.useAutoPosition = true;\n".
- "myMenu$menunum.emptyText = '$title';\n".
-
- (
- join("\n", map {
-
- if ( !ref( $submenu->{$_} ) ) {
-
- "myMenu$menunum.add(new WebFXMenuSeparator());";
-
- } else {
-
- my($url_or_submenu, $tooltip ) = @{ $submenu->{$_} };
- if ( ref($url_or_submenu) ) {
-
- my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
-
- "$subhtml\n".
- "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
-
- } else {
-
- "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
-
- }
-
- }
-
- } keys %$submenu )
- ). "\n".
- "myMenu$menunum.width = 224\n",
-
- "myMenu$menunum";
-
- }
+%
+% my( %opt ) = @_;
+% my $conf = new FS::Conf;
+% my $fsurl = $opt{'freeside_baseurl'};
+%
+% my $curuser = $FS::CurrentUser::CurrentUser;
+%
+% #Active tickets not assigned to a customer
+%
+% tie my %report_customers_lists, 'Tie::IxHash',
+% 'by customer number' => [ $fsurl. 'search/cust_main.cgi?browse=custnum', '' ],
+% 'by last name' => [ $fsurl. 'search/cust_main.cgi?browse=last', '' ],
+% 'by company name' => [ $fsurl. 'search/cust_main.cgi?browse=company', '' ],
+% 'by active trouble tickets' => [ $fsurl. 'search/cust_main.cgi?browse=tickets', '' ],
+% ;
+%
+% tie my %report_customers_search, 'Tie::IxHash',
+% 'by ordering employee' => [ $fsurl. 'search/cust_main-otaker.cgi' ],
+% ;
+%
+% tie my %report_customers, 'Tie::IxHash',
+% 'List customers' => [ \%report_customers_lists, 'List customers' ],
+% 'Search customers' => [ \%report_customers_search, 'Search customers' ],
+% 'Zip code distribution' => [ $fsurl.'search/report_cust_main-zip.html', 'Zip codes by number of customers' ],
+% ;
+%
+% tie my %report_invoices_open, 'Tie::IxHash',
+% 'All open invoices' => [ $fsurl.'search/cust_bill.html?OPEN_date', 'All invoices with an unpaid balance' ],
+% '15 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN15_date', 'Invoices 15 days or older with an unpaid balance' ],
+% '30 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN30_date', 'Invoices 30 days or older with an unpaid balance' ],
+% '60 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN60_date', 'Invoices 60 days or older with an unpaid balance' ],
+% '90 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN90_date', 'Invoices 90 days or older with an unpaid balance' ],
+% '120 day open invoices' => [ $fsurl.'search/cust_bill.html?OPEN120_date', 'Invoices 120 days or older with an unpaid balance' ],
+% ;
+%
+% tie my %report_invoices, 'Tie::IxHash',
+% 'Open invoices' => [ \%report_invoices_open, 'Open invoices' ],
+% 'All invoices' => [ $fsurl. 'search/cust_bill.html?date', 'List all invoices' ],
+% 'Advanced invoice reports' => [ $fsurl.'search/report_cust_bill.html', 'by agent, date range, etc.' ],
+% ;
+%
+% tie my %report_services_acct, 'Tie::IxHash',
+% 'All accounts by username' => [ $fsurl.'search/svc_acct.cgi?username', '' ],
+% 'All accounts by UID' => [ $fsurl.'search/svc_acct.cgi?uid', '' ],
+% ;
+% $report_services_acct{'Unlinked accounts'} = [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside accounts without a customer record' ]
+% if $curuser->access_right('View/link unlinked services');
+%
+% tie my %report_services_domain, 'Tie::IxHash',
+% 'All domains' => [ $fsurl.'search/svc_domain.cgi?domain', '' ],
+% ;
+% $report_services_domain{'Unlinked domains'} = [ $fsurl.'search/svc_domain.cgi?UN_domain', 'Pre-Freeside domains without a customer record' ]
+% if $curuser->access_right('View/link unlinked services');
+%
+% tie my %report_services_forward, 'Tie::IxHash',
+% 'All mail forwards' => [ $fsurl.'search/svc_forward.cgi?svcnum', '' ],
+% ;
+% $report_services_forward{'Unlinked mail forwards'} = [ $fsurl.'search/svc_forward.cgi?UN_svcnum', 'Pre-Freeside mail forwards without a customer record' ]
+% if $curuser->access_right('View/link unlinked services');
+%
+% tie my %report_services_www, 'Tie::IxHash',
+% 'All virtual hosts' => [ $fsurl.'search/svc_www.cgi?svcnum', '' ],
+% ;
+% $report_services_www{'Unlinked virtual hosts'} = [ $fsurl.'search/svc_www.cgi?UN_svcnum', 'Pre-Freeside virtual hosts without a customer record' ]
+% if $curuser->access_right('View/link unlinked services');
+%
+% tie my %report_services_broadband, 'Tie::IxHash',
+% 'All broadband services' => [ $fsurl.'search/svc_broadband.cgi?svcnum', '' ],
+% #'Unlinked domain' => [ $fsurl.'search/svc_acct.cgi?UN_uid', 'Pre-Freeside domains without a customer record' ],
+% ;
+%
+% tie my %report_services_phone, 'Tie::IxHash',
+% 'All phone numbers' => [ $fsurl.'search/svc_phone.cgi?svcnum', '' ],
+% ;
+%
+% tie my %report_services_external, 'Tie::IxHash',
+% 'All external services' => [ $fsurl.'search/svc_external.cgi?id', '' ],
+% ;
+% $report_services_external{'Unlinked external services'} = [ $fsurl.'search/svc_external.cgi?UN_id', 'Pre-Freeside domains without a customer record' ]
+% if $curuser->access_right('View/link unlinked services');
+%
+% tie my %report_services, 'Tie::IxHash';
+% if ( $curuser->access_right('Configuration') ) {
+% $report_services{'Service definitions'} = [ $fsurl.'browse/part_svc.cgi?orderby=active', 'Service definitions by number of active packages' ];
+% $report_services{'separator'} = '';
+% }
+% $report_services{'Accounts'} = [ \%report_services_acct, 'Access accounts and mailboxes' ];
+% $report_services{'Domains'} = [ \%report_services_domain, 'Domains', ];
+% $report_services{'Mail forwards'} = [ \%report_services_forward, 'Mail forwards', ];
+% $report_services{'Virtual hosts'} = [ \%report_services_www, 'Virtual hosting', ];
+% $report_services{'Broadband services'} = [ \%report_services_broadband, 'Fixed (username-less) broadband services', ];
+% $report_services{'Phone numbers'} = [ \%report_services_phone, 'Telephone numbers', ];
+% $report_services{'External services'} = [ \%report_services_external, 'External services', ];
+%
+% tie my %report_packages, 'Tie::IxHash';
+% if ( $curuser->access_right('Configuration') ) {
+% $report_packages{'Package definitions'} = [ $fsurl.'browse/part_pkg.cgi?active=1', 'Package definitions by number of active packages' ];
+% $report_packages{'separator'} = '';
+% }
+% $report_packages{'All customer packages'} = [ $fsurl.'search/cust_pkg.cgi?pkgnum', 'List all customer packages', ];
+% $report_packages{'Suspended customer packages'} = [ $fsurl.'search/cust_pkg.cgi?magic=suspended', 'List suspended packages' ];
+% $report_packages{'Customer packages with unconfigured services'} = [ $fsurl.'search/cust_pkg.cgi?APKG_pkgnum', 'List packages which have provisionable services' ];
+% $report_packages{'Advanced package reports'} = [ $fsurl.'search/report_cust_pkg.html', 'by agent, date range, status, package definition' ];
+%
+% tie my %report_rating, 'Tie::IxHash',
+% 'Call Detail Records (CDRs)' => [ $fsurl.'search/report_cdr.html', '' ],
+% ;
+%
+% tie my %report_financial, 'Tie::IxHash',
+% 'Sales, Credits and Receipts' => [ $fsurl.'graph/report_money_time.html', 'Sales, credits and receipts summary graph' ],
+% 'Sales Report' => [ $fsurl.'graph/report_cust_bill_pkg.html', 'Sales report and graph (by agent, package class and/or date range)' ],
+% 'Credit Report' => [ $fsurl.'search/report_cust_credit.html', 'Credit report (by employee and/or date range)' ],
+% 'Payment Report' => [ $fsurl.'search/report_cust_pay.html', 'Credit report (by type and/or date range)' ],
+% 'A/R Aging' => [ $fsurl.'search/report_receivables.html', 'Accounts Receivable Aging report' ],
+% 'Prepaid Income' => [ $fsurl.'search/report_prepaid_income.html', 'Prepaid income (unearned revenue) report' ],
+% 'Sales Tax Liability' => [ $fsurl.'search/report_tax.html', 'Sales tax liability report' ],
+% ;
+%
+% tie my %report_menu, 'Tie::IxHash';
+% $report_menu{'Customers'} = [ \%report_customers, 'Customer reports' ]
+% if $curuser->access_right('List customers');
+% $report_menu{'Invoices'} = [ \%report_invoices, 'Invoice reports' ]
+% if $curuser->access_right('List invoices');
+% $report_menu{'Packages'} = [ \%report_packages, 'Package reports' ]
+% if $curuser->access_right('List packages');
+% $report_menu{'Services'} = [ \%report_services, 'Services reports' ]
+% if $curuser->access_right('List services');
+% $report_menu{'Rating data'} = [ \%report_rating, 'Rating reports' ]
+% if $curuser->access_right('List rating data');
+% $report_menu{'Financial'} = [ \%report_financial, 'Financial reports' ]
+% if $curuser->access_right('Financial reports');
+%
+% tie my %tools_importing, 'Tie::IxHash',
+% 'Import customers from CSV file' => [ $fsurl.'misc/cust_main-import.cgi', '' ],
+% 'Import one-time charges from CSV file' => [ $fsurl.'misc/cust_main-import_charges.cgi', '' ],
+% 'Import Call Detail Records (CDRs) from CSV file' => [ $fsurl.'misc/cdr-import.html', '' ],
+% ;
+%
+% tie my %tools_exporting, 'Tie::IxHash',
+% 'Download database dump' => [ $fsurl. 'misc/dump.cgi', '' ],
+% ;
+%
+% # <!-- <BR>View active NAS ports:
+% # <A HREF="browse/nas.cgi">session server</A> -->
+% # <!-- or <A HREF="browse/nas-sqlradius.cgi">RADIUS</A>
+% # <BR> -->
+%
+% tie my %tools_menu, 'Tie::IxHash', ();
+% $tools_menu{'Quick payment entry'} = [ $fsurl.'misc/batch-cust_pay.html', 'Enter multiple payments in a batch' ]
+% if $curuser->access_right('Post payment batch');
+% $tools_menu{'Job Queue'} = [ $fsurl.'search/queue.html', 'View pending job queue' ]
+% if $curuser->access_right('Job queue');
+% $tools_menu{'Importing'} = [ \%tools_importing, 'Import tools' ]
+% if $curuser->access_right('Import');
+% $tools_menu{'Exporting'} = [ \%tools_exporting, 'Export tools' ]
+% if $curuser->access_right('Export');
+%
+% tie my %config_employees, 'Tie::IxHash',
+% 'View/Edit employees' => [ $fsurl.'browse/access_user.html', 'Setup internal users' ],
+% 'View/Edit employee groups' => [ $fsurl.'browse/access_group.html', 'Employee groups allow you to control access to the backend' ],
+% ;
+%
+% tie my %config_export_svc_pkg, 'Tie::IxHash',
+% 'View/Edit exports' => [ $fsurl.'browse/part_export.cgi', 'Provisioning services to external machines, databases and APIs' ],
+% 'View/Edit service definitions' => [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ],
+% 'View/Edit package definitions' => [ $fsurl.'browse/part_pkg.cgi', 'One or more services are grouped together into a package and given pricing information. Customers purchase packages, not services' ],
+% 'View/Edit package classes' => [ $fsurl.'browse/pkg_class.html', 'Package classes define groups of packages, for reporting and convenience purposes.' ],
+% ;
+%
+% tie my %config_agent, 'Tie::IxHash',
+% 'View/Edit agent types' => [ $fsurl.'browse/agent_type.cgi', 'Agent types define groups of package definitions that you can then assign to particular agents' ],
+% 'View/Edit agents' => [ $fsurl.'browse/agent.cgi', 'Agents are resellers of your service. Agents may be limited to a subset of your full offerings (via their type)' ],
+% ;
+%
+% tie my %config_billing, 'Tie::IxHash',
+% 'View/Edit payment gateways' => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ],
+% 'View/Edit invoice events' => [ $fsurl.'browse/part_bill_event.cgi', 'Actions for overdue invoices' ],
+% 'View/Edit prepaid cards' => [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ],
+% 'View/Edit call rates and regions' => [ $fsurl.'browse/rate.cgi', 'Manage rate plans, regions and prefixes for VoIP and call billing' ],
+% 'View/Edit locales and tax rates' => [ $fsurl.'browse/cust_main_county.cgi', 'Change tax rates, or break down a country into states, or a state into counties and assign different tax rates to each' ],
+% ;
+%
+% tie my %config_dialup, 'Tie::IxHash',
+% 'View/Edit access numbers' => [ $fsurl.'browse/svc_acct_pop.cgi', 'Points of Presence' ],
+% ;
+%
+% tie my %config_broadband, 'Tie::IxHash',
+% 'View/Edit routers' => [ $fsurl.'browse/router.cgi', 'Broadband access routers' ],
+% 'View/Edit address blocks' => [ $fsurl.'browse/addr_block.cgi', 'Manage address blocks and block assignments to broadband routers' ],
+% ;
+%
+% tie my %config_misc, 'Tie::IxHash';
+% $config_misc{'View/Edit advertising sources'} = [ $fsurl.'browse/part_referral.html', 'Where a customer heard about your service. Tracked for informational purposes' ]
+% if $curuser->access_right('Configuration')
+% || $curuser->access_right('Edit advertising sources')
+% || $curuser->access_right('Edit global advertising sources');
+% if ( $curuser->access_right('Configuration') ) {
+% $config_misc{'View/Edit virtual fields'} = [ $fsurl.'browse/part_virtual_field.cgi', 'Locally defined fields', ];
+% $config_misc{'View/Edit message catalog'} = [ $fsurl.'browse/msgcat.cgi', 'Change error messages and other customizable labels' ];
+% $config_misc{'View/Edit inventory classes and inventory'} = [ $fsurl.'browse/inventory_class.html', 'Setup inventory classes and stock inventory' ];
+% }
+%
+% tie my %config_menu, 'Tie::IxHash';
+% if ( $curuser->access_right('Configuration' ) ) {
+% %config_menu = (
+% 'Settings' => [ $fsurl.'config/config-view.cgi', '' ],
+% 'separator' => '', #its a separator!
+% 'Employees' => [ \%config_employees, '' ],
+% 'Provisioning, services and packages'
+% => [ \%config_export_svc_pkg, '' ],
+% 'Resellers' => [ \%config_agent, '' ],
+% 'Billing' => [ \%config_billing, '' ],
+% 'Dialup' => [ \%config_dialup, '' ],
+% 'Fixed (username-less) broadband'
+% => [ \%config_broadband, '' ],
+% );
+% }
+% $config_menu{'Miscellaneous'} = [ \%config_misc, '' ]
+% if $curuser->access_right('Configuration')
+% || $curuser->access_right('Edit advertising sources')
+% || $curuser->access_right('Edit global advertising sources');
+%
+% tie my %menu, 'Tie::IxHash',
+% 'Billing Main' => [ $fsurl, 'Billing start page', ],
+% 'Ticketing Main' => [
+% ( $conf->config('ticket_system') eq 'RT_External'
+% ? FS::TicketSystem->baseurl()
+% : $fsurl.'rt/'
+% ),
+% 'Ticketing start page',
+% ],
+% ;
+% $menu{'Reports'} = [ \%report_menu, 'Lists, reporting and graphing' ]
+% if keys %report_menu;
+% $menu{'Tools'} = [ \%tools_menu, 'Tools' ]
+% if keys %tools_menu;
+% $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ]
+% if $curuser->access_right('Configuration')
+% || $curuser->access_right('Edit advertising sources')
+% || $curuser->access_right('Edit global advertising sources');
+%
+% use vars qw($gmenunum);
+% $gmenunum = 0;
+%
+% sub submenu {
+% my($submenu, $title) = @_;
+% my $menunum = $gmenunum++;
+%
+% #return two args: html, menuname
+%
+% "var myMenu$menunum = new WebFXMenu;\n".
+% #"myMenu$menunum.useAutoPosition = true;\n".
+% "myMenu$menunum.emptyText = '$title';\n".
+%
+% (
+% join("\n", map {
+%
+% if ( !ref( $submenu->{$_} ) ) {
+%
+% "myMenu$menunum.add(new WebFXMenuSeparator());";
+%
+% } else {
+%
+% my($url_or_submenu, $tooltip ) = @{ $submenu->{$_} };
+% if ( ref($url_or_submenu) ) {
+%
+% my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
+%
+% "$subhtml\n".
+% "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
+%
+% } else {
+%
+% "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
+%
+% }
+%
+% }
+%
+% } keys %$submenu )
+% ). "\n".
+% "myMenu$menunum.width = 224\n",
+%
+% "myMenu$menunum";
+%
+% }
+%
+%
-%>
-<script type="text/javascript" src="<%=$fsurl%>elements/cssexpr.js"></script>
-<script type="text/javascript" src="<%=$fsurl%>elements/xmenu.js"></script>
-<link href="<%=$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
-<link href="<%=$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+<script type="text/javascript" src="<%$fsurl%>elements/cssexpr.js"></script>
+<script type="text/javascript" src="<%$fsurl%>elements/xmenu.js"></script>
+<link href="<%$fsurl%>elements/xmenu.css" type="text/css" rel="stylesheet">
+<link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
<SCRIPT TYPE="text/javascript">
- webfxMenuImagePath = "<%=$fsurl%>images/";
+ webfxMenuImagePath = "<%$fsurl%>images/";
webfxMenuUseHover = 1;
webfxMenuShowTime = 300;
webfxMenuHideTime = 300;
var myBar = new WebFXMenuBar;
+% foreach my $item ( keys %menu ) {
+%
+% my( $url_or_submenu, $tooltip ) = @{ $menu{$item} };
+%
+% if ( ref($url_or_submenu) ) {
+%
+% #warn $item;
+%
+% my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
+%
+%
- <% foreach my $item ( keys %menu ) {
-
- my( $url_or_submenu, $tooltip ) = @{ $menu{$item} };
-
- if ( ref($url_or_submenu) ) {
-
- #warn $item;
-
- my( $subhtml, $submenuname ) = submenu($url_or_submenu, $item);
-
- %>
- <%= $subhtml %>
- myBar.add(new WebFXMenuButton("<%= $item %>", null, "<%= $tooltip %>", <%= $submenuname %> ));
+ <% $subhtml %>
+ myBar.add(new WebFXMenuButton("<% $item %>", null, "<% $tooltip %>", <% $submenuname %> ));
+% } else {
- <% } else { %>
- myBar.add(new WebFXMenuButton("<%= $item %>", "<%= $url_or_submenu %>", "<%= $tooltip %>" ));
-
- <% }
+ myBar.add(new WebFXMenuButton("<% $item %>", "<% $url_or_submenu %>", "<% $tooltip %>" ));
+% }
+%
+% }
+%
- }
- %>
myBar.show( null, 'vertical' );
//myBar.show( null, 'horizontal' );
Index: tr-select-access_group.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-access_group.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr-select-access_group.html 14 May 2006 16:47:30 -0000 1.1
+++ tr-select-access_group.html 23 Aug 2006 22:25:38 -0000 1.2
@@ -1,22 +1,22 @@
-<%
- my( $groupnum, %opt ) = @_;
-
- $opt{'access_group'} ||= [ qsearch( 'access_group', {} ) ]; # { disabled=>'' } )
-
- #warn "***** tr-select-access_group: \n". Dumper(%opt);
-%>
+%
+% my( $groupnum, %opt ) = @_;
+%
+% $opt{'access_group'} ||= [ qsearch( 'access_group', {} ) ]; # { disabled=>'' } )
+%
+% #warn "***** tr-select-access_group: \n". Dumper(%opt);
+%
+% if ( scalar(@{ $opt{'access_group'} }) == 0 ) {
-<% if ( scalar(@{ $opt{'access_group'} }) == 0 ) { %>
<INPUT TYPE="hidden" NAME="groupnum" VALUE="">
+% } else {
-<% } else { %>
<TR>
- <TD ALIGN="right"><%= $opt{'label'} || 'Access group' %></TD>
+ <TD ALIGN="right"><% $opt{'label'} || 'Access group' %></TD>
<TD>
- <%= include( '/elements/select-access_group.html', $groupnum, %opt ) %>
+ <% include( '/elements/select-access_group.html', $groupnum, %opt ) %>
</TD>
</TR>
+% }
-<% } %>
Index: progress-init.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/progress-init.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- progress-init.html 13 Mar 2006 22:32:51 -0000 1.9
+++ progress-init.html 23 Aug 2006 22:25:38 -0000 1.10
@@ -1,17 +1,18 @@
-<%
- my( $formname, $fields, $action, $url_or_message, $key ) = @_;
- $key = '' unless defined $key;
+%
+% my( $formname, $fields, $action, $url_or_message, $key ) = @_;
+% $key = '' unless defined $key;
+%
+% my $url_or_message_link;
+% if ( ref($url_or_message) ) { #its a message or something
+% $url_or_message_link =
+% 'message='. uri_escape( $url_or_message->{'message'} )
+% } else {
+% $url_or_message_link = "url=$url_or_message";
+% }
+%
- my $url_or_message_link;
- if ( ref($url_or_message) ) { #its a message or something
- $url_or_message_link =
- 'message='. uri_escape( $url_or_message->{'message'} )
- } else {
- $url_or_message_link = "url=$url_or_message";
- }
-%>
-<%= include('/elements/xmlhttp.html',
+<% include('/elements/xmlhttp.html',
'method' => 'POST',
'url' => $action,
'subs' => [ 'start_job' ],
@@ -27,12 +28,12 @@
+'<div>[iframe not supported]</div></iframe>');
}
-function <%=$key%>process () {
+function <%$key%>process () {
- //alert('<%=$key%>process for form <%=$formname%>');
+ //alert('<%$key%>process for form <%$formname%>');
- if ( document.<%=$formname%>.submit.disabled == false ) {
- document.<%=$formname%>.submit.disabled=true;
+ if ( document.<%$formname%>.submit.disabled == false ) {
+ document.<%$formname%>.submit.disabled=true;
}
overlib( 'Submitting job to server...', WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
@@ -40,9 +41,9 @@
var Hash = new Array();
var x = 0;
var fieldName;
- for (var i = 0; i<document.<%=$formname%>.elements.length; i++) {
- field = document.<%=$formname%>.elements[i];
- if ( <%= join(' || ', map { "(field.name.indexOf('$_') > -1)" } @$fields ) %>
+ for (var i = 0; i<document.<%$formname%>.elements.length; i++) {
+ field = document.<%$formname%>.elements[i];
+ if ( <% join(' || ', map { "(field.name.indexOf('$_') > -1)" } @$fields ) %>
)
{
if ( field.type == 'select-multiple' ) {
@@ -56,7 +57,7 @@
}
} else if ( ( field.type != 'radio' && field.type != 'checkbox' )
|| ( ( field.type == 'radio' || field.type == 'checkbox' )
- && document.<%=$formname%>.elements[i].checked
+ && document.<%$formname%>.elements[i].checked
)
)
{
@@ -67,17 +68,17 @@
}
// jsrsPOST = true;
- // jsrsExecute( '<%= $action %>', <%=$key%>myCallback, 'start_job', Hash );
+ // jsrsExecute( '<% $action %>', <%$key%>myCallback, 'start_job', Hash );
- //alert('start_job( ' + Hash + ', <%=$key%>myCallback )' );
+ //alert('start_job( ' + Hash + ', <%$key%>myCallback )' );
//alert('start_job()' );
- <%=$key%>start_job( Hash, <%=$key%>myCallback );
+ <%$key%>start_job( Hash, <%$key%>myCallback );
}
-function <%=$key%>myCallback( jobnum ) {
+function <%$key%>myCallback( jobnum ) {
- overlib( OLiframeContent('<%=$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%=$url_or_message_link%>;formname=<%=$formname%>' , 444, 168, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
+ overlib( OLiframeContent('<%$p%>elements/progress-popup.html?jobnum=' + jobnum + ';<%$url_or_message_link%>;formname=<%$formname%>' , 444, 168, 'progress_popup'), CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', CLOSECLICK, MIDX, 0, MIDY, 0 );
}
- Previous message: [freeside-commits] freeside/httemplate/misc/process
batch-cust_pay.cgi, 1.2, 1.3 catchall.cgi, 1.4,
1.5 cdr-import.html, 1.2, 1.3 cust_main-import.cgi, 1.4,
1.5 cust_main-import_charges.cgi, 1.3, 1.4 delete-customer.cgi,
1.4, 1.5 expire_pkg.cgi, 1.1, 1.2 inventory_item-import.html,
1.2, 1.3 link.cgi, 1.14, 1.15 meta-import.cgi, 1.6,
1.7 payment.cgi, 1.2, 1.3
- Next message: [freeside-commits] freeside/httemplate/search cdr.html, 1.3,
1.4 cust_bill.html, 1.17, 1.18 cust_bill_event.cgi, 1.9,
1.10 cust_bill_event.html, 1.8, 1.9 cust_bill_pkg.cgi, 1.5,
1.6 cust_credit.html, 1.9, 1.10 cust_main-otaker.cgi, 1.5,
1.6 cust_main-zip.html, 1.1, 1.2 cust_main.cgi, 1.67,
1.68 cust_pay.cgi, 1.25, 1.26 cust_pkg.cgi, 1.38,
1.39 cust_tax_exempt_pkg.cgi, 1.2, 1.3 inventory_item.html,
1.3, 1.4 prepay_credit.html, 1.1, 1.2 queue.html, 1.1,
1.2 reg_code.html, 1.2, 1.3 report_cdr.html, 1.3,
1.4 report_cust_bill.html, 1.3, 1.4 report_cust_credit.html,
1.7, 1.8 report_cust_main-zip.html, 1.1,
1.2 report_cust_pay.html, 1.11, 1.12 report_cust_pkg.html, 1.1,
1.2 report_prepaid_income.cgi, 1.6,
1.7 report_prepaid_income.html, 1.4,
1.5 report_receivables.cgi, 1.31, 1.32 report_receivables.html,
1.1, 1.2 report_tax.cgi, 1.32, 1.33 report_tax.html, 1.10,
1.11 sql.html, 1.3, 1.4 sqlradius.cgi, 1.9,
1.10 sqlradius.html, 1.5, 1.6 svc_Smart.html, 1.1,
1.2 svc_acct.cgi, 1.36, 1.37 svc_broadband.cgi, 1.1,
1.2 svc_domain.cgi, 1.20, 1.21 svc_external.cgi, 1.3,
1.4 svc_forward.cgi, 1.9, 1.10 svc_phone.cgi, 1.1,
1.2 svc_www.cgi, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list