X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=48c6159bbf260ce9b78e10e3cd5d4c166dd323c6;hb=b431ece7b4a71aa5771f44393da582692f668817;hp=5304c37d60992073efe03907b4d3b5e1c11d607f;hpb=37314c736907de968d3f61dd5dc93aa61c6ca161;p=freeside.git

diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 5304c37d6..48c6159bb 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -20,13 +20,14 @@ Example:
 % if ( $opt{'alt_format'} ) {
 
 <TR>
-    <<%$th%> ALIGN="right">Locatiopn type</<%$th%>>
+    <<%$th%> ALIGN="right">Location&nbsp;kind</<%$th%>>
     <TD>
     <% 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:
 % } 
 
 <TR>
-  <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %></<%$th%>>
+  <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %></<%$th%>>
   <TD COLSPAN=7>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>address1"
@@ -78,7 +79,7 @@ Example:
       >
 
 <TR>
-    <<%$th%> ALIGN="right">Unit Type and #</<%$th%>>
+    <<%$th%> ALIGN="right">Unit&nbsp;type&nbsp;and&nbsp;#</<%$th%>>
     <TD COLSPAN=7>
 
 %     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:
 %     }
 
     <INPUT TYPE="text" 
-               NAME="location_number"
-               ID="location_number"
-               VALUE="<% scalar($cgi->param('location_number')) || $object->get($pre.'location_number') |h %>"
-               SIZE="5"
+               NAME  = "location_number"
+               ID    = "location_number"
+               VALUE = "<% scalar($cgi->param('location_number')) || $object->get($pre.'location_number') |h %>"
+               SIZE  = "5"
                <% $disabled || ($location_type ? '' : 'DISABLED') %>
                <% $style %>
         >
 
-%   if ( $object->get($pre.'address2') ) {
-
-%     #XXX try to parse first
-%     if ( 0 ) {
-%     } else {
-        Can't parse unit type and number from <B><% $object->get($pre.'address2') |h %></B>
-%    }
-
-% }
+%    #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/'<B>'.encode_entities($object->get($1.'address2')).'<\/B>'/e;
+     <% $alt_err %>
 
     </TD>
 
@@ -152,15 +148,15 @@ Example:
 
 
 <TR>
-  <<%$th%> ALIGN="right"><%$r%>City</<%$th%>>
+  <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %></<%$th%>>
   <TD WIDTH="1"><% include('/elements/city.html', %select_hash) %></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%>>
+  <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
+  <TD WIDTH="1"><% include('/elements/select-county.html', %select_hash ) %></TD>
+  <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %></<%$th%>>
   <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
   </TD>
-  <<%$th%>><%$r%>Zip</<%$th%>>
+  <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('Zip') |h %></<%$th%>>
   <TD>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>zip"
@@ -175,7 +171,7 @@ Example:
 </TR>
 
 <TR>
-  <<%$th%> ALIGN="right"><%$r%>Country</<%$th%>>
+  <<%$th%> ALIGN="right"><%$r%><% mt('Country') |h %></<%$th%>>
   <TD COLSPAN=6><% include('/elements/select-country.html', %select_hash ) %></TD>
 </TR>
 
@@ -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';