<%= $title || 'MyAccount' %>

From 1958c28884c750ca37979f19bec3e3daf0386731 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 21 Jan 2010 08:38:52 +0000 Subject: more self-service skinning config options, and start taking a stab at reorganizing config sections, RT#6893 --- .../FS-SelfService/cgi/ach_payment_results.html | 3 +- fs_selfservice/FS-SelfService/cgi/change_bill.html | 3 +- .../FS-SelfService/cgi/change_password.html | 4 +- fs_selfservice/FS-SelfService/cgi/change_pay.html | 3 +- fs_selfservice/FS-SelfService/cgi/change_ship.html | 3 +- .../FS-SelfService/cgi/customer_change_pkg.html | 2 +- .../FS-SelfService/cgi/customer_order_pkg.html | 2 +- fs_selfservice/FS-SelfService/cgi/delete_svc.html | 2 +- fs_selfservice/FS-SelfService/cgi/header.html | 43 +++++++++++++++++- fs_selfservice/FS-SelfService/cgi/image.cgi | 20 +++++++++ .../FS-SelfService/cgi/make_ach_payment.html | 3 +- .../FS-SelfService/cgi/make_payment.html | 3 +- .../cgi/make_thirdparty_payment.html | 4 +- fs_selfservice/FS-SelfService/cgi/myaccount.html | 2 +- .../FS-SelfService/cgi/myaccount_menu.html | 52 ++++++++++++++++------ fs_selfservice/FS-SelfService/cgi/order_pkg.html | 2 +- .../FS-SelfService/cgi/payment_results.html | 3 +- .../FS-SelfService/cgi/process_change_bill.html | 4 +- .../cgi/process_change_password.html | 2 +- .../FS-SelfService/cgi/process_change_pay.html | 4 +- .../FS-SelfService/cgi/process_change_pkg.html | 4 +- .../FS-SelfService/cgi/process_change_ship.html | 4 +- .../FS-SelfService/cgi/process_order_pkg.html | 2 +- .../FS-SelfService/cgi/process_order_recharge.html | 2 +- .../FS-SelfService/cgi/process_svc_acct.html | 2 +- .../FS-SelfService/cgi/process_svc_external.html | 2 +- fs_selfservice/FS-SelfService/cgi/provision.html | 2 +- .../FS-SelfService/cgi/provision_svc_acct.html | 2 +- .../FS-SelfService/cgi/recharge_prepay.html | 3 +- .../FS-SelfService/cgi/recharge_results.html | 3 +- fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 5 +++ .../FS-SelfService/cgi/view_cdr_details.html | 12 ++--- .../FS-SelfService/cgi/view_invoice.html | 2 +- fs_selfservice/FS-SelfService/cgi/view_usage.html | 5 +-- .../FS-SelfService/cgi/view_usage_details.html | 12 ++--- 35 files changed, 147 insertions(+), 79 deletions(-) create mode 100755 fs_selfservice/FS-SelfService/cgi/image.cgi (limited to 'fs_selfservice/FS-SelfService') diff --git a/fs_selfservice/FS-SelfService/cgi/ach_payment_results.html b/fs_selfservice/FS-SelfService/cgi/ach_payment_results.html index 987b97efb..9cdb65e36 100644 --- a/fs_selfservice/FS-SelfService/cgi/ach_payment_results.html +++ b/fs_selfservice/FS-SelfService/cgi/ach_payment_results.html @@ -1,7 +1,6 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Payment results') %> -Payment results

<%= if ( $error ) { $OUT .= qq!Error processing your payment: $error!; } else { diff --git a/fs_selfservice/FS-SelfService/cgi/change_bill.html b/fs_selfservice/FS-SelfService/cgi/change_bill.html index c0977d946..7941971ba 100755 --- a/fs_selfservice/FS-SelfService/cgi/change_bill.html +++ b/fs_selfservice/FS-SelfService/cgi/change_bill.html @@ -1,7 +1,6 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Edit billing address') %> -Edit billing address

<%= if ( $error ) { $OUT .= qq!Error: $error

!; } ''; %> diff --git a/fs_selfservice/FS-SelfService/cgi/change_password.html b/fs_selfservice/FS-SelfService/cgi/change_password.html index 9b91d2cad..68b6fd824 100644 --- a/fs_selfservice/FS-SelfService/cgi/change_password.html +++ b/fs_selfservice/FS-SelfService/cgi/change_password.html @@ -1,7 +1,5 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> - -Change password

+<%= include('header', 'Change password') %> <%= if ( $error ) { $OUT .= qq!$error

!; diff --git a/fs_selfservice/FS-SelfService/cgi/change_pay.html b/fs_selfservice/FS-SelfService/cgi/change_pay.html index bbe452786..9633e8920 100644 --- a/fs_selfservice/FS-SelfService/cgi/change_pay.html +++ b/fs_selfservice/FS-SelfService/cgi/change_pay.html @@ -1,7 +1,6 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Change payment information') %> -Change payment information

<%= if ( $error ) { $OUT .= qq!Error: $error

!; } ''; %> diff --git a/fs_selfservice/FS-SelfService/cgi/change_ship.html b/fs_selfservice/FS-SelfService/cgi/change_ship.html index f03aeb5be..59f91767a 100755 --- a/fs_selfservice/FS-SelfService/cgi/change_ship.html +++ b/fs_selfservice/FS-SelfService/cgi/change_ship.html @@ -1,7 +1,6 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Edit service address') %> -Edit service address

<%= if ( $error ) { $OUT .= qq!Error: $error

!; } ''; %> diff --git a/fs_selfservice/FS-SelfService/cgi/customer_change_pkg.html b/fs_selfservice/FS-SelfService/cgi/customer_change_pkg.html index 95bdab76c..37dccaaf2 100644 --- a/fs_selfservice/FS-SelfService/cgi/customer_change_pkg.html +++ b/fs_selfservice/FS-SelfService/cgi/customer_change_pkg.html @@ -1,5 +1,5 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Change package') %> <%= include('change_pkg') %> diff --git a/fs_selfservice/FS-SelfService/cgi/customer_order_pkg.html b/fs_selfservice/FS-SelfService/cgi/customer_order_pkg.html index a20e8acbc..192c29fa4 100755 --- a/fs_selfservice/FS-SelfService/cgi/customer_order_pkg.html +++ b/fs_selfservice/FS-SelfService/cgi/customer_order_pkg.html @@ -1,5 +1,5 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Purchase additional package') %> <%= include('order_pkg') %> diff --git a/fs_selfservice/FS-SelfService/cgi/delete_svc.html b/fs_selfservice/FS-SelfService/cgi/delete_svc.html index e16b01eea..80a14f85c 100644 --- a/fs_selfservice/FS-SelfService/cgi/delete_svc.html +++ b/fs_selfservice/FS-SelfService/cgi/delete_svc.html @@ -1,5 +1,5 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Remove service') %> <%= if ( $error ) { $OUT .= qq!Error: $error!; diff --git a/fs_selfservice/FS-SelfService/cgi/header.html b/fs_selfservice/FS-SelfService/cgi/header.html index 630959e33..692348f44 100644 --- a/fs_selfservice/FS-SelfService/cgi/header.html +++ b/fs_selfservice/FS-SelfService/cgi/header.html @@ -3,6 +3,28 @@ <%= $title || 'MyAccount' %> <%= $head %> + <%= $body_header %> - <%= $title || 'MyAccount' %> -

+ + + + + + + +

+ <%= $INCLUDE_ARGS[0] %> + +

+ <%= include('myaccount_menu') %> + diff --git a/fs_selfservice/FS-SelfService/cgi/image.cgi b/fs_selfservice/FS-SelfService/cgi/image.cgi new file mode 100755 index 000000000..e951dcd1a --- /dev/null +++ b/fs_selfservice/FS-SelfService/cgi/image.cgi @@ -0,0 +1,20 @@ +#!/usr/bin/perl -T +#!/usr/bin/perl -Tw + +use strict; +use CGI; +use FS::SelfService qw( skin_info ); + +my $cgi = new CGI; + +my($query) = $cgi->keywords; +$query =~ /^(\w+)$/ or '' =~ /^()$/; +my $name = $1; + +my $info = skin_info(); + +print $cgi->header( '-type' => 'image/png', #for now + #'-expires' => 'now', + ). + $info->{$name}; + diff --git a/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html b/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html index 8802a5d97..f712c59c4 100644 --- a/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html +++ b/fs_selfservice/FS-SelfService/cgi/make_ach_payment.html @@ -1,7 +1,6 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Make a payment') %> -Make a payment

diff --git a/fs_selfservice/FS-SelfService/cgi/make_payment.html b/fs_selfservice/FS-SelfService/cgi/make_payment.html index 96a17ba4c..bd03b8214 100644 --- a/fs_selfservice/FS-SelfService/cgi/make_payment.html +++ b/fs_selfservice/FS-SelfService/cgi/make_payment.html @@ -1,7 +1,6 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Make a payment') %> -Make a payment

diff --git a/fs_selfservice/FS-SelfService/cgi/make_thirdparty_payment.html b/fs_selfservice/FS-SelfService/cgi/make_thirdparty_payment.html index b2900b1e9..4055ed09e 100755 --- a/fs_selfservice/FS-SelfService/cgi/make_thirdparty_payment.html +++ b/fs_selfservice/FS-SelfService/cgi/make_thirdparty_payment.html @@ -1,5 +1,5 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'Pay now') %> -Pay now

- <%= if ( $error ) { $OUT .= qq!$error

!; }else{ diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html index 9b54794bc..0de738515 100644 --- a/fs_selfservice/FS-SelfService/cgi/myaccount.html +++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html @@ -1,5 +1,5 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> +<%= include('header', 'My Account') %> Hello <%= $name %>!

<%= $small_custview %> diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html index 8765323fa..9d330361c 100644 --- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html +++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html @@ -1,11 +1,15 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -

<%= +if ( $menu_top_image ) { + $OUT .= ''; +} + my @menu = ( { title=>' ' }, { title=>'Overview', url=>'myaccount', size=>'+1', }, @@ -85,25 +89,43 @@ push @menu, foreach my $item ( @menu ) { + next if $menu_skipblanks && $item->{'title'} =~ /^\s*$/; + next if $menu_skipheadings && ! $item->{'url'}; + $OUT .= '{'url'} && $action eq $item->{'url'} ) { - $OUT .= ' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '. - ' STYLE="border-top: 1px solid black;'. - ' border-left: 1px solid black;'. - ' border-bottom: 1px solid black"'; + if ( $menu_body_image ) { + if ( exists $item->{'url'} && $action eq $item->{'url'} ) { + $OUT .= #' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '. + ' STYLE="background: url(image.cgi?menu_body_image) 0 bottom; '. + ' color:#3366CC"; '. #XXX config + ' " '; + } else { + $OUT .= ' STYLE="background: url(image.cgi?menu_body_image) 0 bottom" '; + } } else { - $OUT .= ' STYLE="border-right: 1px solid black"'; + if ( exists $item->{'url'} && $action eq $item->{'url'} ) { + $OUT .= ' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '. + ' STYLE="border-top: 1px solid black;'. + ' border-left: 1px solid black;'. + ' border-bottom: 1px solid black"'; + } else { + $OUT .= ' STYLE="border-right: 1px solid black"'; + } } $OUT.='>'; - $OUT .= ' ' x $item->{'indent'} - if exists $item->{'indent'}; + if ( $menu_skipheadings ) { + $OUT .= ' '; + } else { + $OUT .= ' ' x $item->{'indent'} + if exists $item->{'indent'}; + } $OUT .= '' if exists $item->{'url'} && $action ne $item->{'url'}; - $OUT .= '' - if exists $item->{'size'}; + $OUT .= '' + if $menu_fontsize || exists($item->{'size'}); $item->{'title'} =~ s/ / /g; $OUT .= $item->{'title'}; @@ -118,9 +140,13 @@ foreach my $item ( @menu ) { } -%> +if ( $menu_bottom_image ) { + $OUT .= ''; +} else { + $OUT .= ''; +} - +%>

diff --git a/fs_selfservice/FS-SelfService/cgi/view_usage_details.html b/fs_selfservice/FS-SelfService/cgi/view_usage_details.html index 9f02eba79..c4cc177e1 100644 --- a/fs_selfservice/FS-SelfService/cgi/view_usage_details.html +++ b/fs_selfservice/FS-SelfService/cgi/view_usage_details.html @@ -1,10 +1,10 @@ <%= $url = "$selfurl?session=$session_id;action="; ''; %> -<%= include('header') %> - -Service usage details for -<%= Date::Format::time2str('%b %o %Y', $beginning) %> - -<%= Date::Format::time2str('%b %o %Y', $ending) %> -

+<%= include('header', 'Service usage details for '. + Date::Format::time2str('%b %o %Y', $beginning). + ' - '. + Date::Format::time2str('%b %o %Y', $ending) + ) +%> <%= if ( $error ) { $OUT .= qq!$error

!; -- cgit v1.2.1

Account	Time remaining