From 080406e219b6c63d02bfda8abea33020c4265db1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 13 Mar 2011 03:26:57 +0000
Subject: [PATCH] qualification address handling changes, RT#7111

---
 httemplate/elements/location.html | 18 ++++++++++--------
 httemplate/misc/qual.html         |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 39e7041c7..e93553e2a 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -20,13 +20,14 @@ Example:
 % if ( $opt{'alt_format'} ) {
 
 <TR>
-    <<%$th%> ALIGN="right">Location type</<%$th%>>
+    <<%$th%> ALIGN="right">Location 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'))
@@ -78,7 +79,7 @@ Example:
       >
 
 <TR>
-    <<%$th%> ALIGN="right">Unit Type and #</<%$th%>>
+    <<%$th%> ALIGN="right">Unit type and #</<%$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,10 +128,10 @@ 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 %>
         >
diff --git a/httemplate/misc/qual.html b/httemplate/misc/qual.html
index 84ba78e9e..ed6ba2d6c 100644
--- a/httemplate/misc/qual.html
+++ b/httemplate/misc/qual.html
@@ -29,7 +29,7 @@
 
 <% include('/elements/tr-input-text.html',
              'cgi'     => $cgi,
-             'label'   => 'Service Telephone Number',
+             'label'   => 'Service phone number',
              'field'   => 'phonenum',
              'size'    => '12',
              'value'   => scalar($cgi->param('phonenum')),
-- 
2.11.0