[freeside-commits] freeside/httemplate/misc qual.html,1.3,1.4

[Ivan,,,]

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

Modified Files:
	qual.html 
Log Message:
prospect qualifications default to prospect address if there's one, other UI cleanups RT#7111

Index: qual.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/qual.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- qual.html	7 Dec 2010 20:38:52 -0000	1.3
+++ qual.html	11 Mar 2011 00:45:53 -0000	1.4
@@ -11,7 +11,7 @@
 <% include('/elements/tr-td-label.html',
              'cgi'       => $cgi,
 	     'label'	=> 'Qualify using',
-	     'cell_style' => 'font-weight: bold',
+             #'cell_style' => 'font-weight: bold',
 	     'id' => 'exportnum',
 	  )
 %>
@@ -21,7 +21,7 @@
 	     'field'	=> 'exportnum',
 	     'options'  => \@export_options,
 	     'labels'   => $export_labels,
-	     'curr_value' => $cgi->param('exportnum'),
+             'curr_value' => $exportnum,
 	  )
 %>
 </TD>
@@ -32,7 +32,15 @@
 	     'label'	=> 'Service Telephone Number',
 	     'field'	=> 'phonenum',
 	     'size'	=> '12',
-	     'value'	=> $cgi->param('phonenum'),
+             'value'   => scalar($cgi->param('phonenum')),
+
+             'valign'  => 'middle',
+             'colspan' => 6,
+             'prefix'  => '<TABLE><TR><TD>',
+             'postfix' => '</TD><TD><FONT SIZE="-2">'. join('<BR>',
+                 'Line-share (non dry loops) - always fill in',
+                 'Dry loops - always leave empty',
+               ). '</FONT></TD></TR></TABLE>',
           )
 %>
 
@@ -40,8 +48,8 @@
              'cgi'       => $cgi,
 	     $table => $cust_main_or_prospect_main,
 	     'alt_format' => $conf->exists('qual-alt-address-format') ? 1 : 0,
-	     'is_optional' => 1,
 	     'no_bold' => 1,
+             #required for ikano.. config? 'is_optional' => 1,
           )
 %>
 </TABLE>
@@ -84,5 +92,10 @@
     push @export_options, $export->exportnum;
     $export_labels->{$export->exportnum} = $export->exportname;
 }
+my $exportnum = $cgi->param('error')
+                  ? scalar($cgi->param('exportnum'))
+                  : scalar(@exports) == 1
+                    ? $exports[0]->exportnum
+                    : '';
 
 </%init>