From d6b6f81e383f9d876e67e9704914e887a331012e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 25 May 2009 01:49:34 +0000
Subject: international self-service payments, RT#1592

---
 httemplate/elements/location.html      | 20 +++++++++-----------
 httemplate/elements/select-county.html |  6 ++++--
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'httemplate/elements')

diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 6691bc84e..dbc567d4d 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -23,7 +23,7 @@ Example:
            NAME     = "<%$pre%>address1"
            ID       = "<%$pre%>address1"
            VALUE    = "<% $object->get($pre.'address1') |h %>"
-           SIZE     = 58
+           SIZE     = 54
            onChange = "<% $onchange %>"
            <% $disabled %>
            <% $style %>
@@ -38,7 +38,7 @@ Example:
            NAME     = "<%$pre%>address2"
            ID       = "<%$pre%>address2"
            VALUE    = "<% $object->get($pre.'address2') |h %>"
-           SIZE     = 58
+           SIZE     = 54
            onChange = "<% $onchange %>"
            <% $disabled %>
            <% $style %>
@@ -48,7 +48,7 @@ Example:
 
 <TR>
   <TH ALIGN="right"><%$r%>City</TH>
-  <TD>
+  <TD WIDTH="1">
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>city"
            ID       = "<%$pre%>city"
@@ -57,13 +57,11 @@ Example:
            <% $disabled %>
            <% $style %>
     >
- </TD>
-  <TH ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</TH>
-  <TD>
-    <% include('/elements/select-county.html', %select_hash ) %>
   </TD>
-  <TH ALIGN="right"><%$r%>State</TH>
-  <TD>
+  <TH ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</TH>
+  <TD><% include('/elements/select-county.html', %select_hash ) %></TD>
+  <TH ALIGN="right" WIDTH="1"><%$r%>State</TH>
+  <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
   </TD>
   <TH><%$r%>Zip</TH>
@@ -82,7 +80,7 @@ Example:
 
 <TR>
   <TH ALIGN="right"><%$r%>Country</TH>
-  <TD COLSPAN=5><% include('/elements/select-country.html', %select_hash ) %></TD>
+  <TD COLSPAN=6><% include('/elements/select-country.html', %select_hash ) %></TD>
 </TR>
 
 % if ( !$pre ) { 
@@ -126,7 +124,7 @@ my @counties = counties( $object->get($pre.'state'),
                          $object->get($pre.'country'),
                        );
 my @county_style = ();
-push @county_style, 'visibility:hidden'
+push @county_style, 'display:none' # 'visibility:hidden'
   unless scalar(@counties) > 1;
 
 my $style =
diff --git a/httemplate/elements/select-county.html b/httemplate/elements/select-county.html
index 59f235a23..aa88abe96 100644
--- a/httemplate/elements/select-county.html
+++ b/httemplate/elements/select-county.html
@@ -58,10 +58,12 @@ Example:
 
         if ( countiesArray.length > 1 ) { 
           what.form.<% $pre %>county.style.display = '';
-          countyFormLabel.style.visibility = 'visible';
+          //countyFormLabel.style.visibility = 'visible';
+          countyFormLabel.style.display = '';
         } else {
           what.form.<% $pre %>county.style.display = 'none';
-          countyFormLabel.style.visibility = 'hidden';
+          //countyFormLabel.style.visibility = 'hidden';
+          countyFormLabel.style.display = 'none';
         }
 
         //run the callback
-- 
cgit v1.2.1