X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=0d2fa38c3fcc81c72b9706c2f2a1ef52026587f4;hb=82970ec1511c7bbb892eb296f3c0358480b77ba6;hp=6691bc84e9fca16c8da82360067950fa443cd82a;hpb=26119738eaf2b519d91c855c23986f873303887f;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 6691bc84e..0d2fa38c3 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -9,6 +9,7 @@ Example:
'disabled' => $disabled,
'same_checked' => $same_checked,
'geocode' => $geocode, #passed through
+ 'censustract' => $censustract, #passed through
'no_asterisks' => 0, #set true to disable the red asterisks next
#to required fields
'address1_label' => 'Address', #label for address
@@ -17,13 +18,13 @@ Example:
%doc>
- <%$r%><% $opt{'address1_label'} || 'Address' %> |
+ <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %><%$th%>>
<% $style %>
@@ -38,7 +39,7 @@ Example:
NAME = "<%$pre%>address2"
ID = "<%$pre%>address2"
VALUE = "<% $object->get($pre.'address2') |h %>"
- SIZE = 58
+ SIZE = 54
onChange = "<% $onchange %>"
<% $disabled %>
<% $style %>
@@ -47,26 +48,15 @@ Example:
|
- <%$r%>City |
-
-
- <% $style %>
- >
- |
- ><%$r%>County |
-
- <% include('/elements/select-county.html', %select_hash ) %>
- |
- <%$r%>State |
-
+ <<%$th%> ALIGN="right"><%$r%>City<%$th%>>
+ | <% include('/elements/city.html', %select_hash) %> |
+ <<%$th%> ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
+ <% include('/elements/select-county.html', %select_hash ) %> |
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%>State<%$th%>>
+
<% include('/elements/select-state.html', %select_hash ) %>
|
- <%$r%>Zip |
+ <<%$th%>><%$r%>Zip<%$th%>>
|
- <%$r%>Country |
- <% include('/elements/select-country.html', %select_hash ) %> |
+ <<%$th%> ALIGN="right"><%$r%>Country<%$th%>>
+ <% include('/elements/select-country.html', %select_hash ) %> |
% if ( !$pre ) {
+% } else {
+% if ( $pre eq 'ship_' && $conf->exists('cust_main-require_censustract') ) {
+ <<%$th%> ALIGN="right">Census tract
(automatic)<%$th%>>
+
+
+ |
+
+% } else {
+
+% }
% }
<%init>
@@ -114,7 +114,7 @@ $object->set($pre.'state', $statedefault )
|| $object->get($pre.'country') ne $countrydefault;
my @style = ();
-push @style, 'background-color: #dddddd"' if $disabled;
+push @style, 'background-color: #dddddd' if $disabled;
my @address2_label_style = ();
push @address2_label_style, 'visibility:hidden'
@@ -126,7 +126,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 =
@@ -143,6 +143,7 @@ my $county_style =
: '';
my %select_hash = (
+ 'city' => $object->get($pre.'city'),
'county' => $object->get($pre.'county'),
'state' => $object->get($pre.'state'),
'country' => $object->get($pre.'country'),
@@ -152,4 +153,6 @@ my %select_hash = (
'style' => \@style,
);
+my $th = $opt{'no_bold'} ? 'TD' : 'TH';
+
%init>