UI spring cleaning: customer edit

5 files changed, 15 insertions, 14 deletions

diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html
index 1c5023de9..2ca6f65a5 100644
--- a/httemplate/edit/cust_main/basics.html
+++ b/httemplate/edit/cust_main/basics.html
@@ -110,7 +110,7 @@
     <INPUT TYPE="hidden" NAME="agentnum"      ID="agentnum" 
       VALUE="<% $agentnum %>">
     <TR>
-      <TD ALIGN="right"><% mt('Agent') |h %></TD>
+      <TH ALIGN="right"><% mt('Agent') |h %></TD>
       <TD CLASS="fsdisabled"><% $cust_main->agent->agent |h %></TD>
     </TR>
 
@@ -118,7 +118,7 @@
 
   <& /elements/tr-select-agent.html, 
                 'curr_value'    => $cust_main->agentnum,
-                'label'         => "<B>${r}".emt('Agent')."</B>",
+                'label'         => $r. emt('Agent'),
                 'empty_label'   => emt('Select agent'),
                 'disable_empty' => ( $cust_main->agentnum ? 1 : 0 ),
                 'viewall_right' => emt('None'), 
@@ -131,7 +131,7 @@
 % if ( $conf->exists('cust_main-edit_agent_custid') ) {
 
     <TR>
-      <TD ALIGN="right"><% mt('Customer identifier') |h %></TD>
+      <TH ALIGN="right"><% mt('Customer identifier') |h %></TD>
       <TD><INPUT TYPE="text" NAME="agent_custid" VALUE="<% $cust_main->agent_custid %>"></TD>
     </TR>
 
@@ -157,6 +157,7 @@
 %#sales person
 <& /elements/tr-select-sales.html,
      'curr_value' => $cust_main->salesnum,
+     'th' => 1,
 &>
 
 %# referral (advertising source)
@@ -169,7 +170,7 @@
 
   <& /elements/tr-select-part_referral.html,
                 'curr_value' => $refnum,
-                'label'      => "<B>${r}".emt('Advertising source')."</B>"
+                'label'      => $r. emt('Advertising source'),
   &>
 % } 
 
@@ -183,7 +184,7 @@
 %) {
 
   <TR>
-    <TD ALIGN="right"><% mt('Referring customer') |h %></TD>
+    <TH ALIGN="right"><% mt('Referring customer') |h %></TD>
     <TD>
       <A HREF="<% popurl(1) %>/cust_main.cgi?<% $cust_main->referral_custnum %>"><% $cust_main->referral_custnum %>: <% $referring_cust_main->name |h %></A>
     </TD>
@@ -193,7 +194,7 @@
 % } elsif ( ! $conf->exists('disable_customer_referrals') ) { 
 
   <TR>
-    <TD ALIGN="right"><% mt('Referring customer') |h %></TD>
+    <TH ALIGN="right"><% mt('Referring customer') |h %></TD>
     <TD>
       <& /elements/search-cust_main.html,
                     'field_name' => 'referral_custnum',
diff --git a/httemplate/edit/cust_main/company.html b/httemplate/edit/cust_main/company.html
index 8a6ed0bbf..50c4f709b 100644
--- a/httemplate/edit/cust_main/company.html
+++ b/httemplate/edit/cust_main/company.html
@@ -1,6 +1,6 @@
 % my $cust_main = shift;
 <TR ID="company_row" <% $cust_main->company ? '' : 'STYLE="display:none"' %>>
-  <TD ALIGN="right"><% mt('Company') |h %></TD>
+  <TH ALIGN="right"><% mt('Company') |h %></TD>
   <TD COLSPAN=6><INPUT TYPE="text" NAME="company" ID="company" SIZE=60
              VALUE="<% $cust_main->company |h %>">
   </TD>
diff --git a/httemplate/edit/cust_main/fax.html b/httemplate/edit/cust_main/fax.html
index 237d4be44..c3e9917f4 100644
--- a/httemplate/edit/cust_main/fax.html
+++ b/httemplate/edit/cust_main/fax.html
@@ -1,5 +1,5 @@
 % my $cust_main = shift;
 <TR>
-  <TD ALIGN="right"><% mt('Fax') |h %></TD>
+  <TH ALIGN="right"><% mt('Fax') |h %></TD>
   <TD><INPUT TYPE="text" NAME="fax" VALUE="<% $cust_main->fax %>" SIZE=18></TD>
 </TR>
diff --git a/httemplate/edit/cust_main/name.html b/httemplate/edit/cust_main/name.html
index 74b2a7b5b..bc55801cf 100644
--- a/httemplate/edit/cust_main/name.html
+++ b/httemplate/edit/cust_main/name.html
@@ -2,12 +2,12 @@
 % my ($field, $value, $label, $extra) = @_;
 <DIV STYLE="display: inline-block">
   <INPUT TYPE="text" NAME="<% $field %>" VALUE="<% $value |h %>" <%$extra%>>
-  <BR><FONT SIZE=-1><% mt($label) %></FONT>
+  <BR><FONT SIZE="-1" COLOR="#333333"><% mt($label) %></FONT>
 </DIV>
 </%def>
 
 <TR>
-  <TD CLASS="required label"><% mt('Contact name') |h %></TD>
+  <TH CLASS="required label" ALIGN="right"><% mt('Contact name') |h %></TD>
   <TD COLSPAN=6 STYLE="vertical-align:top">
         <& .namepart, 'last', $cust_main->last, 'Last', ',' &>
         <& .namepart, 'first', $cust_main->first, 'First' &>
@@ -21,7 +21,7 @@
 </TR>
 % if ( $conf->exists('cust_main-enable_spouse') ) {
 <TR ID="spouse_row">
-  <TD CLASS="label"><% mt('Spouse\'s name') |h %></TD>
+  <TH CLASS="label"><% mt('Spouse\'s name') |h %></TD>
   <TD COLSPAN=6>
         <& .namepart, 'spouse_last', $cust_main->spouse_last, 'Last', ',' &>
         <& .namepart, 'spouse_first', $cust_main->spouse_first, 'First' &>
@@ -31,7 +31,7 @@
 
 % if ( $conf->exists('cust-email-high-visibility') ) {
 <TR>
-  <TD ALIGN="right" CLASS="
+  <TH ALIGN="right" CLASS="
     <% $conf->exists('cust_main-require_invoicing_list_email', $agentnum)
         ? 'required label'
         : 'label' %>">Email address(es)
diff --git a/httemplate/edit/cust_main/phones.html b/httemplate/edit/cust_main/phones.html
index 9b23e0716..fa915f540 100644
--- a/httemplate/edit/cust_main/phones.html
+++ b/httemplate/edit/cust_main/phones.html
@@ -1,5 +1,5 @@
 <TR>
-  <TD VALIGN="top" ALIGN="right"><% mt('Phones') |h %></TD>
+  <TH VALIGN="top" ALIGN="right"><% mt('Phones') |h %></TD>
   <TD COLSPAN=6>
     <TABLE CELLSPACING=0 CELLPADDING=0>
       <TR>
@@ -10,7 +10,7 @@
                  VALUE="<% $cust_main->get($phone) %>"
                  SIZE=18
           >
-          <BR><FONT SIZE=-1><% mt($phone_label{$phone}) |h %></FONT>
+          <BR><FONT SIZE=-1 COLOR="#333333"><% mt($phone_label{$phone}) |h %></FONT>
         </TD>
         <TD>&nbsp;</TD>
 % }