have the UI use full country names, and state names outside the US...

[freeside.git] / FS / FS / CGI.pm

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index a4fc42f..f1f2a3d 100644 (file)
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -9,7 +9,7 @@ use URI::URL;
 use FS::UID;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
+@EXPORT_OK = qw(header menubar idiot eidiot popurl rooturl table itable ntable
                 small_custview myexit http_header);
 
 =head1 NAME
@@ -225,6 +225,34 @@ sub popurl {
   $x;
 }
 
+=item rooturl 
+
+=cut
+
+sub rooturl {
+  #this doesn't work so well...
+  #'%%%FREESIDE_URL%%%';
+
+  # better to start with the client-provided URL
+  my $cgi = &FS::UID::cgi;
+  my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+  $url_string =~ s/\?.*//;
+
+  #even though this is kludgy
+  $url_string =~
+    s{
+       (browse|config|docs|edit|graph|misc|search|view)
+       /
+       (process/)?
+       ([\w\-\.]+)
+       $
+     }
+     {}x;
+
+  $url_string;
+
+}
+
 =item table
 
 Returns HTML tag for beginning a table.
@@ -298,7 +326,7 @@ sub small_custview {
   my $html = 'Customer #<B>'. $cust_main->custnum. '</B></A>'.
     ' - <B><FONT COLOR="'. $cust_main->statuscolor. '">'.
     ucfirst($cust_main->status). '</FONT></B>'.
-    ntable('#e8e8e8'). '<TR><TD>'. ntable("#cccccc",2).
+    ntable('#e8e8e8'). '<TR><TD VALIGN="top">'. ntable("#cccccc",2).
     '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
     $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
 
@@ -329,7 +357,7 @@ sub small_custview {
 
     my $pre = $cust_main->ship_last ? 'ship_' : '';
 
-    $html .= '<TD>'. ntable("#cccccc",2).
+    $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
       '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
       $cust_main->get("${pre}last"). ', '.
       $cust_main->get("${pre}first"). '<BR>';