X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=0d2fa38c3fcc81c72b9706c2f2a1ef52026587f4;hb=645f747ad9e9277e6095a5f1d62bf864df56c90f;hp=b0b30d3b101fd98b2ea72ba372433cace4621dab;hpb=705f7d564546e7211844773f3566a89f0ae87a2c;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index b0b30d3b1..0d2fa38c3 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -3,26 +3,28 @@
Example:
include( '/elements/location.html',
- 'object' => $cust_main, # or $cust_location
- 'prefix' => $pre, #only for cust_main objects
- 'onchange' => $javascript,
- 'disabled' => $disabled,
- 'same_checked' => $same_checked,
- 'geocode' => $geocode, #passed through
- 'no_asterisks' => 0, #set true to disable the red asterisks next
- #to required fields
+ 'object' => $cust_main, # or $cust_location
+ 'prefix' => $pre, #only for cust_main objects
+ 'onchange' => $javascript,
+ '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
)
%doc>
- <%$r%>Address |
+ <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %><%$th%>>
<% $style %>
@@ -31,13 +33,13 @@ Example:
|
- * Unit # |
+ >* >Unit # |
<% $style %>
@@ -46,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>
@@ -113,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'
@@ -125,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 =
@@ -142,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'),
@@ -151,4 +153,6 @@ my %select_hash = (
'style' => \@style,
);
+my $th = $opt{'no_bold'} ? 'TD' : 'TH';
+
%init>