skin up self-service according to config passed from backend, RT#5530
authorivan <ivan>
Fri, 31 Jul 2009 13:20:54 +0000 (13:20 +0000)
committerivan <ivan>
Fri, 31 Jul 2009 13:20:54 +0000 (13:20 +0000)
34 files changed:
FS/FS/ClientAPI/MyAccount.pm
fs_selfservice/FS-SelfService/SelfService.pm
fs_selfservice/FS-SelfService/cgi/ach_payment_results.html
fs_selfservice/FS-SelfService/cgi/change_bill.html
fs_selfservice/FS-SelfService/cgi/change_password.html
fs_selfservice/FS-SelfService/cgi/change_pay.html
fs_selfservice/FS-SelfService/cgi/change_ship.html
fs_selfservice/FS-SelfService/cgi/customer_change_pkg.html
fs_selfservice/FS-SelfService/cgi/customer_order_pkg.html
fs_selfservice/FS-SelfService/cgi/delete_svc.html
fs_selfservice/FS-SelfService/cgi/footer.html
fs_selfservice/FS-SelfService/cgi/header.html
fs_selfservice/FS-SelfService/cgi/login.html
fs_selfservice/FS-SelfService/cgi/logout.html
fs_selfservice/FS-SelfService/cgi/make_ach_payment.html
fs_selfservice/FS-SelfService/cgi/make_payment.html
fs_selfservice/FS-SelfService/cgi/myaccount.html
fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
fs_selfservice/FS-SelfService/cgi/payment_results.html
fs_selfservice/FS-SelfService/cgi/process_change_bill.html
fs_selfservice/FS-SelfService/cgi/process_change_password.html
fs_selfservice/FS-SelfService/cgi/process_change_pay.html
fs_selfservice/FS-SelfService/cgi/process_change_pkg.html
fs_selfservice/FS-SelfService/cgi/process_change_ship.html
fs_selfservice/FS-SelfService/cgi/process_order_pkg.html
fs_selfservice/FS-SelfService/cgi/process_order_recharge.html
fs_selfservice/FS-SelfService/cgi/process_svc_acct.html
fs_selfservice/FS-SelfService/cgi/provision.html
fs_selfservice/FS-SelfService/cgi/provision_svc_acct.html
fs_selfservice/FS-SelfService/cgi/recharge_prepay.html
fs_selfservice/FS-SelfService/cgi/recharge_results.html
fs_selfservice/FS-SelfService/cgi/selfservice.cgi
fs_selfservice/FS-SelfService/cgi/view_invoice.html
fs_selfservice/FS-SelfService/cgi/view_usage_details.html

index 895b11d..9d031be 100644 (file)
@@ -55,6 +55,25 @@ sub _cache {
              } );
 }
 
+sub skin_info {
+  #my $p = shift;
+
+  my $conf = new FS::Conf;
+
+  my %skin = (
+    'head'         => join("\n", $conf->config('selfservice-head') ),
+    'body_header'  => join("\n", $conf->config('selfservice-body_header') ),
+    'body_footer'  => join("\n", $conf->config('selfservice-body_footer') ),
+    'body_bgcolor' => scalar( $conf->config('selfservice-body_bgcolor') ),
+    'box_bgcolor'  => scalar( $conf->config('selfservice-box_bgcolor')  ),
+
+    'company_name'   => scalar($conf->config('company_name')),
+  );
+
+  \%skin;
+
+}
+
 sub login_info {
   my $p = shift;
 
index 322782a..d275fa8 100644 (file)
@@ -60,6 +60,7 @@ $socket .= '.'.$tag if defined $tag && length($tag);
   'unprovision_svc'           => 'MyAccount/unprovision_svc',
   'myaccount_passwd'          => 'MyAccount/myaccount_passwd',
   'signup_info'               => 'Signup/signup_info',
+  'skin_info'                 => 'MyAccount/skin_info',
   'domain_select_hash'        => 'Signup/domain_select_hash',  # expose?
   'new_customer'              => 'Signup/new_customer',
   'capture_payment'           => 'Signup/capture_payment',
index 62419d1..987b97e 100644 (file)
@@ -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 f186c9b..c0977d9 100755 (executable)
@@ -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 dcfce31..9b91d2c 100644 (file)
@@ -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 7283cb8..e7a9969 100644 (file)
@@ -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 28ee94e..f03aeb5 100755 (executable)
@@ -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 @@ function samechanged(what) {
 <INPUT TYPE="submit" NAME="submit" VALUE="<%= $custnum ?  "Apply Changes" : "Add Customer" %>">
 <BR>
 </FORM>
-</TD></TR></TABLE>
+
 <%= include('footer') %>
index 46d3faf..95bdab7 100644 (file)
@@ -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 78cc16c..a20e8ac 100755 (executable)
@@ -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') %>
index 4155d09..e16b01e 100644 (file)
@@ -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 98cc79b..4889b74 100644 (file)
@@ -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 cf8fd2b..630959e 100644 (file)
@@ -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 e5daec8..760f579 100644 (file)
@@ -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 ( $single_domain ) {
 
 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 @@ if ( $phone_login ) {
 
 %>
 
-</BODY></HTML>
+<%= $body_footer %>
index 0e774e9..e2de648 100644 (file)
@@ -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 2394c10..8802a5d 100644 (file)
@@ -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 da6e67e..96a17ba 100644 (file)
@@ -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 c9ca0c5..bcfcf95 100644 (file)
@@ -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 @@ Hello <%= $name %>!<BR><BR>
   }
 %>
 
-</TD></TR></TABLE>
 <%= include('footer') %>
index cc9f255..5cf4fe2 100644 (file)
@@ -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 @@ foreach my $item ( @menu ) {
 
   $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 62419d1..987b97e 100644 (file)
@@ -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 93e05cf..a440284 100644 (file)
@@ -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 bfd2312..ffe0cab 100644 (file)
@@ -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 93e05cf..a440284 100644 (file)
@@ -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 7c0f0a6..c7c69f0 100644 (file)
@@ -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 93e05cf..a440284 100644 (file)
@@ -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 3e4471d..b868937 100755 (executable)
@@ -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 ef0516a..9dfc328 100644 (file)
@@ -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 813521f..39920cb 100644 (file)
@@ -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 5ae7b42..f5b2c2b 100644 (file)
@@ -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 550493b..bffd22f 100644 (file)
@@ -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 3de4c87..6f0aa1f 100644 (file)
@@ -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 6d928e3..af15365 100644 (file)
@@ -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 ed1e6a1..09cfe60 100644 (file)
@@ -9,16 +9,15 @@ use Text::Template;
 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 @@ sub do_template {
   $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 8fa5fb7..8a1c1c7 100644 (file)
@@ -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 6bac748..9f02eba 100644 (file)
@@ -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') %>