[freeside-commits] freeside/httemplate/elements location.html, 1.14, 1.15 tr-select-agent.html, 1.8, 1.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv4432/httemplate/elements

Modified Files:
	location.html tr-select-agent.html 
Log Message:
ui tweaks for prospect edit, RT#7111

Index: tr-select-agent.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-agent.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- tr-select-agent.html	23 Jul 2010 00:11:51 -0000	1.8
+++ tr-select-agent.html	13 Mar 2011 04:04:17 -0000	1.9
@@ -33,7 +33,7 @@
 
   <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 @@
         'viewall_right' => $opt{'viewall_right'},
       );
 
+my $colspan = $opt{'colspan'} ? 'COLSPAN="'.$opt{'colspan'}.'"' : '';
+
 </%init>

Index: location.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/location.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -d -r1.14 -r1.15
--- location.html	13 Mar 2011 03:26:56 -0000	1.14
+++ location.html	13 Mar 2011 04:04:17 -0000	1.15
@@ -140,7 +140,7 @@
 
 %     #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 @@
 <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"