X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=0ff119009ef3e3264244df6e9a915e55f0731620;hb=a2d31d7aeeec3e0d08e7ebe30b191da94f96618e;hp=0b91add5206e6a43df869027cb82612ee6420504;hpb=d66bff648dd4d7969f50f956b5c1dd06b8159b8c;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 0b91add52..0ff119009 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -20,14 +20,14 @@ Example:
% if ( $opt{'alt_format'} ) {
- <<%$th%> ALIGN="right">Location kind<%$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'))
@@ -79,7 +79,7 @@ Example:
>
|
- <<%$th%> ALIGN="right">Unit type and #<%$th%>>
+ <<%$th%> ALIGN="right">Unit type and #<%$th%>>
% my $location_type = scalar($cgi->param('location_type'))
@@ -98,7 +98,7 @@ Example:
'field' => 'location_type',
'id' => 'location_type',
'disabled' => $disabled,
- 'style' => \@style,
+ #'style' => \@style,
'options' => [ keys %location_types ],
'labels' => \%location_types,
'curr_value' => $location_type,
@@ -136,15 +136,9 @@ Example:
<% $style %>
>
-% if ( $object->get($pre.'address2') ) {
-
-% #XXX try to parse first
-% if ( 0 ) {
-% } else { #XXX i don't work so well when the dropdown is changed :/ i probably need to be triggered by "default service address"
- 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 %>
|
@@ -219,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;
@@ -256,7 +252,7 @@ my %select_hash = (
'prefix' => $pre,
'onchange' => $onchange,
'disabled' => $disabled,
- 'style' => \@style,
+ #'style' => \@style,
);
my $th = $opt{'no_bold'} ? 'TD' : 'TH';