From 0fe4d7eed9b8ce0953d699e10986927ca8c4a4d2 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 29 Jun 2011 01:42:49 +0000
Subject: [PATCH] self-service skinning improvements, RT#13199

---
 fs_selfservice/FS-SelfService/cgi/invoices.html  |  2 +-
 fs_selfservice/FS-SelfService/cgi/myaccount.html | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fs_selfservice/FS-SelfService/cgi/invoices.html b/fs_selfservice/FS-SelfService/cgi/invoices.html
index c4eece32a..d155b9343 100644
--- a/fs_selfservice/FS-SelfService/cgi/invoices.html
+++ b/fs_selfservice/FS-SelfService/cgi/invoices.html
@@ -13,7 +13,7 @@
       my $td = qq!<TD BGCOLOR="#$col">!;
       my $a=qq!<A HREF="${url}view_invoice;invnum=!. $invoice->{'invnum'}. '">';
       $OUT .=
-        "<TR>$td${a}Invoice #". $invoice->{'invnum'}. "</A></TD>$td</TD>".
+        "<TR>$td${a}Invoice #". $invoice->{'invnum'}. "</A></TD>$td&nbsp;</TD>".
         "$td$a". $invoice->{'date'}. "</A></TD>$td</TD>".
         '</TR>';
       $col = $col eq $col1 ? $col2 : $col1;
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index b15988387..3830aa1ad 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -59,7 +59,7 @@ Hello <%= $name %>!<BR><BR>
   if ( @support_services ) {
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
             '<TR><TH BGCOLOR="#ff6666" COLSPAN="3">Support Time Remaining</TH>'.
-            '</TR><TR><TH ALIGN="left">#</TH><TH>Package</TH>'.
+            '</TR><TR><TH>Package</TH><TH></TH>'.
             '<TH>Time Remaining</TH></TR>';
     my $col1 = "ffffff";
     my $col2 = "dddddd";
@@ -70,9 +70,10 @@ Hello <%= $name %>!<BR><BR>
       my $a = qq!<A HREF="${url}view_support_details;svcnum=!.
               $support->{'svcnum'}. '">';
       $OUT .=
-        "<TR>$td$a". $support->{'pkgnum'}. "</A></TD>".
-        $td.$a. $support->{'pkg'}. "</A></TD>".
-        $td.$a. $support->{'time'}. "</A></TD>".
+        "<TR>".
+          $td.$a. $support->{'pkg'}. "</A></TD>".
+          $td.'&nbsp;</TD>'.
+          $td.$a. $support->{'time'}. "</A></TD>".
         '</TR>';
       $col = $col eq $col1 ? $col2 : $col1;
     }
@@ -82,6 +83,11 @@ Hello <%= $name %>!<BR><BR>
   }
 %>
 
-<%= include('ticket_summary') if @tickets %> 
+<%= if ( @tickets) {
+      $OUT .= include('ticket_summary');
+    } else {
+      $OUT .= '';
+    }
+%>
 
 <%= include('footer') %>
-- 
2.20.1