[freeside-commits] freeside/fs_selfservice/FS-SelfService/cgi selfservice.cgi, 1.36, 1.37 ach_payment_results.html, 1.2, 1.3 change_bill.html, 1.3, 1.4 change_password.html, 1.2, 1.3 change_pay.html, 1.4, 1.5 change_ship.html, 1.3, 1.4 customer_change_pkg.html, 1.2, 1.3 customer_order_pkg.html, 1.2, 1.3 delete_svc.html, 1.3, 1.4 footer.html, 1.1, 1.2 header.html, 1.1, 1.2 login.html, 1.5, 1.6 logout.html, 1.1, 1.2 make_ach_payment.html, 1.3, 1.4 make_payment.html, 1.16, 1.17 myaccount.html, 1.13, 1.14 myaccount_menu.html, 1.11, 1.12 payment_results.html, 1.5, 1.6 process_change_bill.html, 1.3, 1.4 process_change_password.html, 1.2, 1.3 process_change_pay.html, 1.3, 1.4 process_change_pkg.html, 1.2, 1.3 process_change_ship.html, 1.3, 1.4 process_order_pkg.html, 1.2, 1.3 process_order_recharge.html, 1.2, 1.3 process_svc_acct.html, 1.4, 1.5 provision.html, 1.4, 1.5 provision_svc_acct.html, 1.4, 1.5 recharge_prepay.html, 1.2, 1.3 recharge_results.html, 1.3, 1.4 view_invoice.html, 1.6, 1.7 view_usage_details.html, 1.5, 1.6

Ivan,,, ivan at wavetail.420.am
Fri Jul 31 06:20:56 PDT 2009


Update of /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi
In directory wavetail.420.am:/tmp/cvs-serv5318/fs_selfservice/FS-SelfService/cgi

Modified Files:
	selfservice.cgi ach_payment_results.html change_bill.html 
	change_password.html change_pay.html change_ship.html 
	customer_change_pkg.html customer_order_pkg.html 
	delete_svc.html footer.html header.html login.html logout.html 
	make_ach_payment.html make_payment.html myaccount.html 
	myaccount_menu.html payment_results.html 
	process_change_bill.html process_change_password.html 
	process_change_pay.html process_change_pkg.html 
	process_change_ship.html process_order_pkg.html 
	process_order_recharge.html process_svc_acct.html 
	provision.html provision_svc_acct.html recharge_prepay.html 
	recharge_results.html view_invoice.html 
	view_usage_details.html 
Log Message:
skin up self-service according to config passed from backend, RT#5530

Index: process_change_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_change_pkg.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- process_change_pkg.html	1 Feb 2009 12:28:45 -0000	1.2
+++ process_change_pkg.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Package change successful.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: customer_change_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/customer_change_pkg.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- customer_change_pkg.html	1 Feb 2009 12:28:45 -0000	1.2
+++ customer_change_pkg.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,8 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <%= include('change_pkg') %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: myaccount.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/myaccount.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- myaccount.html	10 Mar 2009 16:14:07 -0000	1.13
+++ myaccount.html	31 Jul 2009 13:20:54 -0000	1.14
@@ -1,8 +1,5 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 Hello <%= $name %>!<BR><BR>
 <%= $small_custview %>
@@ -94,5 +91,4 @@
   }
 %>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: change_password.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/change_password.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- change_password.html	1 Feb 2009 12:28:45 -0000	1.2
+++ change_password.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,8 +1,5 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Change password</FONT><BR><BR>
 
@@ -47,5 +44,5 @@
 
 </FORM>
 
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: logout.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/logout.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logout.html	15 Jul 2004 22:40:00 -0000	1.1
+++ logout.html	31 Jul 2009 13:20:54 -0000	1.2
@@ -1,5 +1,13 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
+<HTML>
+  <HEAD>
+    <TITLE>MyAccount</TITLE>
+    <%= $head %>
+  </HEAD>
+  <BODY BGCOLOR="<%= $body_bgcolor || '#e8e8e8' %>">
+  <%= $body_header %>
+
+  <FONT SIZE=5>MyAccount</FONT><BR><BR>
 You have been logged out.
-</BODY></HTML>
+
+<%= $body_footer %>
 

Index: footer.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- footer.html	1 Feb 2009 12:28:45 -0000	1.1
+++ footer.html	31 Jul 2009 13:20:54 -0000	1.2
@@ -1,3 +1,3 @@
-<HR>
-<FONT SIZE="-2">powered by <a href="http://www.freeside.biz/freeside">freeside</a></FONT>
+</TD></TR></TABLE>
+<%= $body_footer %>
 </BODY></HTML>

Index: process_change_pay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_change_pay.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- process_change_pay.html	1 Feb 2009 12:28:45 -0000	1.3
+++ process_change_pay.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Information updated successfully.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: ach_payment_results.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/ach_payment_results.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ach_payment_results.html	1 Feb 2009 12:28:44 -0000	1.2
+++ ach_payment_results.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,13 +1,11 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Payment results</FONT><BR><BR>
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your payment: $error</FONT>!;
 } else {
   $OUT .= 'Your payment was processed successfully.  Thank you.';
 } %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: header.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/header.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- header.html	18 May 2009 09:55:29 -0000	1.1
+++ header.html	31 Jul 2009 13:20:54 -0000	1.2
@@ -1,9 +1,23 @@
 <HTML>
   <HEAD>
-    <TITLE>MyAccount</TITLE>
+    <TITLE><%= $title || 'MyAccount' %></TITLE>
+    <%= $head %>
   </HEAD>
-  <BODY BGCOLOR="#eeeeee">
-    <FONT SIZE=5>MyAccount</FONT>
+  <BODY BGCOLOR="<%= $body_bgcolor || '#eeeeee' %>">
+    <script language="JavaScript"><!--
+      var mywindow = -1;
+      function myopen(filename,windowname,properties) {
+        myclose();
+        mywindow = window.open(filename,windowname,properties);
+      }
+      function myclose() {
+        if ( mywindow != -1 )
+          mywindow.close();
+        mywindow = -1
+      }
+    //--></script>
+    <%= $body_header %>
+    <FONT SIZE=5><%= $title || 'MyAccount' %></FONT>
     <BR><BR>
     <%= include('myaccount_menu') %>
     <TD VALIGN="top">

Index: recharge_results.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/recharge_results.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- recharge_results.html	1 Feb 2009 12:28:45 -0000	1.3
+++ recharge_results.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,8 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Recharge results</FONT><BR><BR>
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your prepaid card: $error</FONT>!;
@@ -17,5 +15,5 @@
 
   $OUT .= 'Thank you.';
 } %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: change_pay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/change_pay.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- change_pay.html	10 Mar 2009 16:14:06 -0000	1.4
+++ change_pay.html	31 Jul 2009 13:20:54 -0000	1.5
@@ -1,21 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Change payment information</FONT><BR><BR>
 <%= if ( $error ) { 
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT><BR><BR>!;
@@ -70,5 +55,5 @@
   )->html;
 
 %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: provision_svc_acct.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/provision_svc_acct.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- provision_svc_acct.html	1 Feb 2009 12:28:45 -0000	1.4
+++ provision_svc_acct.html	31 Jul 2009 13:20:54 -0000	1.5
@@ -1,8 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <%= include('svc_acct') %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: delete_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/delete_svc.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- delete_svc.html	1 Feb 2009 12:28:45 -0000	1.3
+++ delete_svc.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,8 +1,5 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!;
@@ -10,5 +7,5 @@
   $OUT .= "<FONT SIZE=4>$svc removed.</FONT>";
 } %>
 
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: change_ship.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/change_ship.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- change_ship.html	1 Feb 2009 12:28:45 -0000	1.3
+++ change_ship.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,9 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee">
-<FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Edit service address</FONT><BR><BR>
 <%= if ( $error ) { 
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT><BR><BR>!;
@@ -98,5 +95,5 @@
 <INPUT TYPE="submit" NAME="submit" VALUE="<%= $custnum ?  "Apply Changes" : "Add Customer" %>">
 <BR>
 </FORM>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: process_change_password.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_change_password.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- process_change_password.html	1 Feb 2009 12:28:45 -0000	1.2
+++ process_change_password.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Password changed for <%= $value %> <%= $label %>.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: process_order_recharge.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_order_recharge.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- process_order_recharge.html	1 Feb 2009 12:28:45 -0000	1.2
+++ process_order_recharge.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4><%= $svc %> recharged successfully.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: payment_results.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/payment_results.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- payment_results.html	1 Feb 2009 12:28:45 -0000	1.5
+++ payment_results.html	31 Jul 2009 13:20:54 -0000	1.6
@@ -1,13 +1,11 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Payment results</FONT><BR><BR>
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error processing your payment: $error</FONT>!;
 } else {
   $OUT .= 'Your payment was processed successfully.  Thank you.';
 } %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: process_change_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_change_bill.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- process_change_bill.html	1 Feb 2009 12:28:45 -0000	1.3
+++ process_change_bill.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Information updated successfully.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: view_usage_details.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/view_usage_details.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- view_usage_details.html	1 Feb 2009 12:28:45 -0000	1.5
+++ view_usage_details.html	31 Jul 2009 13:20:54 -0000	1.6
@@ -1,8 +1,5 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Service usage details for
 <%= Date::Format::time2str('%b&nbsp;%o&nbsp;%Y', $beginning) %> -
@@ -80,5 +77,4 @@
 </TABLE>
 <BR>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: selfservice.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/selfservice.cgi,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- selfservice.cgi	30 Jul 2009 08:43:45 -0000	1.36
+++ selfservice.cgi	31 Jul 2009 13:20:54 -0000	1.37
@@ -9,16 +9,15 @@
 use HTML::Entities;
 use Date::Format;
 use Number::Format 1.50;
-use FS::SelfService qw( login_info login customer_info edit_info invoice
-                        payment_info process_payment realtime_collect
-                        process_prepay
-                        list_pkgs order_pkg signup_info order_recharge
-                        part_svc_info provision_acct provision_external
-                        unprovision_svc change_pkg domainselector
-                        list_svcs
-                        list_svc_usage list_cdr_usage list_support_usage
-                        myaccount_passwd
-                      );
+use FS::SelfService qw(
+  skin_info login_info login customer_info edit_info invoice
+  payment_info process_payment realtime_collect process_prepay
+  list_pkgs order_pkg signup_info order_recharge
+  part_svc_info provision_acct provision_external
+  unprovision_svc change_pkg domainselector
+  list_svcs list_svc_usage list_cdr_usage list_support_usage
+  myaccount_passwd
+);
 
 $template_dir = '.';
 
@@ -646,6 +645,9 @@
   $fill_in->{'selfurl'} = $cgi->self_url;
   $fill_in->{'cgi'} = \$cgi;
 
+  my $skin_info = skin_info();
+  $fill_in->{$_} = $skin_info->{$_} foreach keys %$skin_info;
+
   my $source = "$template_dir/$name.html";
   #warn "creating template for $source\n";
   my $template = new Text::Template( TYPE       => 'FILE',

Index: login.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/login.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- login.html	29 Nov 2008 21:54:35 -0000	1.5
+++ login.html	31 Jul 2009 13:20:54 -0000	1.6
@@ -1,11 +1,18 @@
-<HTML><HEAD><TITLE>Login</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=5>Login</FONT><BR><BR>
+<HTML>
+  <HEAD>
+    <TITLE>Login</TITLE>
+    <%= $head %>
+  </HEAD>
+  <BODY BGCOLOR="<%= $body_bgcolor || '#e8e8e8' %>">
+  <%= $body_header %>
+
+<FONT SIZE=5>Login</FONT><BR><BR>
 <FONT SIZE="+1" COLOR="#ff0000"><%= $error %></FONT>
 
 <FORM ACTION="<%= $self_url %>" METHOD=POST>
 <INPUT TYPE="hidden" NAME="session" VALUE="login">
 
-<TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
+<TABLE BGCOLOR="<%= $box_bgcolor || '#c0c0c0' %>" BORDER=0 CELLSPACING=2 CELLPADDING=0>
 
 <TR>
   <TH ALIGN="right">Username </TH>
@@ -50,13 +57,15 @@
 
 if ( $phone_login ) {
 
+  $box_bgcolor ||= '#c0c0c0';
+
   $OUT .= qq(
 
     <B>OR</B><BR><BR>
     
     <FORM ACTION="$self_url" METHOD=POST>
     <INPUT TYPE="hidden" NAME="session" VALUE="login">
-    <TABLE BGCOLOR="#c0c0c0" BORDER=0 CELLSPACING=2 CELLPADDING=0>
+    <TABLE BGCOLOR="$box_bgcolor" BORDER=0 CELLSPACING=2 CELLPADDING=0>
     <TR>
       <TH ALIGN="right">Phone number </TH>
       <TD>
@@ -82,4 +91,4 @@
 
 %>
 
-</BODY></HTML>
+<%= $body_footer %>

Index: make_ach_payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- make_ach_payment.html	1 Feb 2009 12:28:45 -0000	1.3
+++ make_ach_payment.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,21 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Make a payment</FONT><BR><BR>
 <FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
@@ -54,5 +39,5 @@
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="<%=$paybatch%>">
 <INPUT TYPE="submit" NAME="process" VALUE="Process payment"> <!-- onClick="this.disabled=true"> -->
 </FORM>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: process_svc_acct.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_svc_acct.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- process_svc_acct.html	1 Feb 2009 12:28:45 -0000	1.4
+++ process_svc_acct.html	31 Jul 2009 13:20:54 -0000	1.5
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4><%= $svc %> setup successfully.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: make_payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/make_payment.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- make_payment.html	25 May 2009 01:49:34 -0000	1.16
+++ make_payment.html	31 Jul 2009 13:20:54 -0000	1.17
@@ -1,21 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee">
-<script language="JavaScript"><!--
-  var mywindow = -1;
-  function myopen(filename,windowname,properties) {
-    myclose();
-    mywindow = window.open(filename,windowname,properties);
-  }
-  function myclose() {
-    if ( mywindow != -1 )
-      mywindow.close();
-    mywindow = -1
-  }
-//--></script>
-<FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Make a payment</FONT><BR><BR>
 <FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
@@ -64,5 +49,5 @@
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="<%=$paybatch%>">
 <INPUT TYPE="submit" NAME="process" VALUE="Process payment"> <!-- onClick="this.disabled=true"> -->
 </FORM>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: change_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/change_bill.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- change_bill.html	1 Feb 2009 12:28:45 -0000	1.3
+++ change_bill.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,9 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee">
-<FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Edit billing address</FONT><BR><BR>
 <%= if ( $error ) { 
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT><BR><BR>!;
@@ -19,5 +16,5 @@
 <INPUT TYPE="submit" NAME="submit" VALUE="<%= $custnum ?  "Apply Changes" : "Add Customer" %>">
 <BR>
 </FORM>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: view_invoice.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/view_invoice.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- view_invoice.html	1 Feb 2009 12:28:45 -0000	1.6
+++ view_invoice.html	31 Jul 2009 13:20:54 -0000	1.7
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <%= $invoice_html %>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: provision.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/provision.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- provision.html	1 Feb 2009 12:28:45 -0000	1.4
+++ provision.html	31 Jul 2009 13:20:54 -0000	1.5
@@ -1,8 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <%= include('provision_list') %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: myaccount_menu.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- myaccount_menu.html	10 Mar 2009 16:14:07 -0000	1.11
+++ myaccount_menu.html	31 Jul 2009 13:20:54 -0000	1.12
@@ -1,6 +1,6 @@
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
 <TABLE BORDER=0><TR>
-<TD VALIGN="top" HEIGHT="100%" BGCOLOR="#dddddd">
+<TD VALIGN="top" HEIGHT="100%" BGCOLOR="<%= $box_bgcolor || '#c0c0c0' %>">
 
 <TABLE CELLSPACING=0 BORDER=0 HEIGHT="100%">
 
@@ -74,7 +74,7 @@
 
   $OUT .= '<TR><TD'; 
   if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
-    $OUT .= ' BGCOLOR="#eeeeee" '.
+    $OUT .= ' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '.
             ' STYLE="border-top: 1px solid black;'.
                    ' border-left: 1px solid black;'.
                    ' border-bottom: 1px solid black"';

Index: process_change_ship.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_change_ship.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- process_change_ship.html	1 Feb 2009 12:28:45 -0000	1.3
+++ process_change_ship.html	31 Jul 2009 13:20:54 -0000	1.4
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Information updated successfully.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: recharge_prepay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/recharge_prepay.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- recharge_prepay.html	1 Feb 2009 12:28:45 -0000	1.2
+++ recharge_prepay.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,8 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <FONT SIZE=4>Recharge with prepaid card</FONT><BR><BR>
 <FORM NAME="OneTrueForm" METHOD="POST" ACTION="<%=$selfurl%>" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%=$session_id%>">
@@ -29,5 +27,5 @@
 <INPUT TYPE="hidden" NAME="paybatch" VALUE="<%=$paybatch%>">
 <INPUT TYPE="submit" NAME="process" VALUE="Recharge"> <!-- onClick="this.disabled=true"> -->
 </FORM>
-</TD></TR></TABLE>
+
 <%= include('footer') %>

Index: process_order_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/process_order_pkg.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- process_order_pkg.html	1 Feb 2009 12:28:45 -0000	1.2
+++ process_order_pkg.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,10 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
 
 <FONT SIZE=4>Package order successful.</FONT>
 
-</TD></TR></TABLE>
 <%= include('footer') %>

Index: customer_order_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/customer_order_pkg.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- customer_order_pkg.html	1 Feb 2009 12:28:45 -0000	1.2
+++ customer_order_pkg.html	31 Jul 2009 13:20:54 -0000	1.3
@@ -1,8 +1,6 @@
-<HTML><HEAD><TITLE>MyAccount</TITLE></HEAD>
-<BODY BGCOLOR="#eeeeee"><FONT SIZE=5>MyAccount</FONT><BR><BR>
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-<TD VALIGN="top">
+<%= include('header') %>
+
 <%= include('order_pkg') %>
-</TD></TR></TABLE>
+
 <%= include('footer') %>



More information about the freeside-commits mailing list