From: ivan <ivan>
Date: Sun, 13 Mar 2011 04:04:17 +0000 (+0000)
Subject: ui tweaks for prospect edit, RT#7111
X-Git-Tag: freeside_2_3_0~511
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d66bff648dd4d7969f50f956b5c1dd06b8159b8c

ui tweaks for prospect edit, RT#7111
---

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 545221a28..975f8fb65 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -279,6 +279,9 @@ Example:
 %
 %     #umm.  for select-agent_types at least
 %     'disabled'      => $f->{'disabled'},
+%
+%     #any?
+%     'colspan'       => $f->{'colspan'},
 %   );
 %
 %   $include_common{$_} = $f->{$_} foreach grep exists($f->{$_}),
diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index eb3e4d6d3..7473cc209 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -11,10 +11,12 @@
        { 'field'       => 'agentnum',
          'type'        => 'select-agent',
          'empty_label' => 'Select agent',
+         'colspan'     => 6,
        },
        { 'field'   => 'company',
-         'type'   => 'text',
+         'type'    => 'text',
          'size'    => 50,
+         'colspan' => 6,
        },
        { 'field'             => 'contactnum',
          'type'              => 'contact',
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index e93553e2a..0b91add52 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -140,7 +140,7 @@ Example:
 
 %     #XXX try to parse first
 %     if ( 0 ) {
-%     } else {
+%     } 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 <B><% $object->get($pre.'address2') |h %></B>
 %    }
 
@@ -156,13 +156,13 @@ Example:
 <TR>
   <<%$th%> ALIGN="right"><%$r%>City</<%$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" 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%>State</<%$th%>>
   <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
   </TD>
-  <<%$th%>><%$r%>Zip</<%$th%>>
+  <<%$th%> ALIGN="right" WIDTH="1"><%$r%>Zip</<%$th%>>
   <TD>
     <INPUT TYPE     = "text"
            NAME     = "<%$pre%>zip"
diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html
index 9f2f76a6c..515a11d48 100644
--- a/httemplate/elements/tr-select-agent.html
+++ b/httemplate/elements/tr-select-agent.html
@@ -33,7 +33,7 @@ Example:
 
   <TR>
     <TD ALIGN="right"><% $opt{'label'} || 'Agent' %></TD>
-    <TD>
+    <TD <% $colspan %>>
       <% include( '/elements/select-agent.html',
                      'curr_value' => $agentnum,
                      'agents'     => \@agents,
@@ -57,4 +57,6 @@ my @agents =
         'viewall_right' => $opt{'viewall_right'},
       );
 
+my $colspan = $opt{'colspan'} ? 'COLSPAN="'.$opt{'colspan'}.'"' : '';
+
 </%init>