X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=48c6159bbf260ce9b78e10e3cd5d4c166dd323c6;hb=65d56ae6b77952ffacfbff6dcef09f30e5e94949;hp=39e7041c72be197e6fe7a5f13396d7a52e108268;hpb=33c25a7514cb1f4ba56fc320dc43159c3cfae610;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 39e7041c7..48c6159bb 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -20,13 +20,14 @@ Example:
% if ( $opt{'alt_format'} ) {
- <<%$th%> ALIGN="right">Location type<%$th%>>
+ <<%$th%> ALIGN="right">Location kind<%$th%>>
<% include('/elements/select.html',
'cgi' => $cgi,
'field' => 'location_kind',
+ 'id' => 'location_kind',
'disabled' => $disabled,
- 'style' => $style,
+ #'style' => \@style,
'options' => \@location_kind_options,
'labels' => $location_kind_labels,
'curr_value' => scalar($cgi->param('location_kind'))
@@ -39,7 +40,7 @@ Example:
% }
|
- <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %><%$th%>>
+ <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %><%$th%>>
|
- <<%$th%> ALIGN="right">Unit Type and #<%$th%>>
+ <<%$th%> ALIGN="right">Unit type and #<%$th%>>
% my $location_type = scalar($cgi->param('location_type'))
@@ -95,8 +96,9 @@ Example:
<% include('/elements/select.html',
'cgi' => $cgi,
'field' => 'location_type',
+ 'id' => 'location_type',
'disabled' => $disabled,
- 'style' => $style,
+ #'style' => \@style,
'options' => [ keys %location_types ],
'labels' => \%location_types,
'curr_value' => $location_type,
@@ -126,23 +128,17 @@ Example:
% }
<% $style %>
>
-% if ( $object->get($pre.'address2') ) {
-
-% #XXX try to parse first
-% if ( 0 ) {
-% } else {
- Can't parse unit type and number from <% $object->get($pre.'address2') |h %>
-% }
-
-% }
+% #XXX i don't work so well when the dropdown is changed :/ i probably need to be triggered by "default service address"
+% $alt_err =~ s/(ship_)?address2/''.encode_entities($object->get($1.'address2')).'<\/B>'/e;
+ <% $alt_err %>
|
@@ -152,15 +148,15 @@ Example:
- <<%$th%> ALIGN="right"><%$r%>City<%$th%>>
+ <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %><%$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%>>
+ <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
+ <% include('/elements/select-county.html', %select_hash ) %> |
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %><%$th%>>
<% include('/elements/select-state.html', %select_hash ) %>
|
- <<%$th%>><%$r%>Zip<%$th%>>
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('Zip') |h %><%$th%>>
|
- <<%$th%> ALIGN="right"><%$r%>Country<%$th%>>
+ <<%$th%> ALIGN="right"><%$r%><% mt('Country') |h %><%$th%>>
<% include('/elements/select-country.html', %select_hash ) %> |
@@ -217,6 +213,8 @@ $object->set($pre.'state', $statedefault )
unless $object->get($pre.'state')
|| $object->get($pre.'country') ne $countrydefault;
+my $alt_err = ($opt{'alt_format'} && !$disabled) ? $object->alternize : '';
+
my @style = ();
push @style, 'background-color: #dddddd' if $disabled;
@@ -254,7 +252,7 @@ my %select_hash = (
'prefix' => $pre,
'onchange' => $onchange,
'disabled' => $disabled,
- 'style' => \@style,
+ #'style' => \@style,
);
my $th = $opt{'no_bold'} ? 'TD' : 'TH';