From b6260b4f39cf34b9e0e5b8560ef88c8881ba0766 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sun, 14 Jun 2015 13:59:11 -0700 Subject: [PATCH] UI spring cleaning: customer edit --- httemplate/edit/cust_main.cgi | 4 ++-- httemplate/edit/cust_main/basics.html | 13 +++++++------ httemplate/edit/cust_main/company.html | 2 +- httemplate/edit/cust_main/fax.html | 2 +- httemplate/edit/cust_main/name.html | 8 ++++---- httemplate/edit/cust_main/phones.html | 4 ++-- httemplate/elements/freeside.css | 4 ++-- httemplate/elements/location.html | 12 ++++++------ httemplate/elements/tr-select-agent.html | 4 ++-- httemplate/elements/tr-select-cust_class.html | 2 +- httemplate/elements/tr-select-cust_tag.html | 2 +- httemplate/elements/tr-td-label.html | 7 ++++++- 12 files changed, 35 insertions(+), 29 deletions(-) diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index b6f6b0dea..38bae4fa8 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -40,7 +40,7 @@ % }
-
+ %#; padding-right:2px; vertical-align:top"> <% mt('Billing address') |h %> @@ -58,7 +58,7 @@ - - + @@ -118,7 +118,7 @@ <& /elements/tr-select-agent.html, 'curr_value' => $cust_main->agentnum, - 'label' => "${r}".emt('Agent')."", + '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') ) { - + @@ -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' => "${r}".emt('Advertising source')."" + 'label' => $r. emt('Advertising source'), &> % } @@ -183,7 +184,7 @@ %) { - + @@ -193,7 +194,7 @@ % } elsif ( ! $conf->exists('disable_customer_referrals') ) { - + company ? '' : 'STYLE="display:none"' %>> - + 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; - + 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) = @_;
> -
<% mt($label) %> +
<% mt($label) %>
- + % if ( $conf->exists('cust_main-enable_spouse') ) { - + - - +
+ <% mt('Service address') |h %>
<% mt('Agent') |h %><% mt('Agent') |h %> <% $cust_main->agent->agent |h %>
<% mt('Customer identifier') |h %><% mt('Customer identifier') |h %>
<% mt('Referring customer') |h %><% mt('Referring customer') |h %> <% $cust_main->referral_custnum %>: <% $referring_cust_main->name |h %>
<% mt('Referring customer') |h %><% mt('Referring customer') |h %> <& /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;
<% mt('Company') |h %><% mt('Company') |h %>
<% mt('Fax') |h %><% mt('Fax') |h %>
<% mt('Contact name') |h %><% mt('Contact name') |h %> <& .namepart, 'last', $cust_main->last, 'Last', ',' &> <& .namepart, 'first', $cust_main->first, 'First' &> @@ -21,7 +21,7 @@
<% mt('Spouse\'s name') |h %><% mt('Spouse\'s name') |h %> <& .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') ) {
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 @@
<% mt('Phones') |h %><% mt('Phones') |h %> @@ -10,7 +10,7 @@ VALUE="<% $cust_main->get($phone) %>" SIZE=18 > -
<% mt($phone_label{$phone}) |h %> +
<% mt($phone_label{$phone}) |h %> % } diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index 8e493eb54..ece57a053 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -228,13 +228,13 @@ div.fstabcontainer { .fsinnerbox { /* background-color:#cccccc; */ padding:2px; - border: 1px solid #cccccc; + border: 1px solid #999999; border-radius: 2px; } .fsinnerbox th { font-weight:normal; - font-size:75%; + font-size:80%; valign: bottom; color: #666666; } diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index 357a91db7..a7803c875 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -44,7 +44,7 @@ Example: % if ( $label_prefix eq '_location' ) { - + + + + % } diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html index 321bd6b32..04600fa8d 100644 --- a/httemplate/elements/tr-select-agent.html +++ b/httemplate/elements/tr-select-agent.html @@ -32,7 +32,7 @@ Example: % if ( scalar(@agents) != 1 ) { - + - + - + - + + + -
 
<% $opt{'locationname_label'} || emt('Location ID') %><% $opt{'locationname_label'} || emt('Location ID') %> - >* >Unit #>* >Unit # - <% mt('Latitude') |h %><% mt('Latitude') |h %> <% $style %> > - <% mt('Longitude') |h %> + <% mt('Longitude') |h %> - Census tractCensus tract - <% '(automatic)' %> + <% '(automatic)' %>
<% $opt{'label'} || emt('Agent') %><% $opt{'label'} || emt('Agent') %> > % my $agent = qsearchs('agent', { 'agentnum' => $agentnum }); <% $agent ? $agent->agent : '(all)' |h %> @@ -47,7 +47,7 @@ Example: % } else {
<% $opt{'label'} || emt('Agent') %><% $opt{'label'} || emt('Agent') %> > <& /elements/select-agent.html, 'curr_value' => $agentnum, diff --git a/httemplate/elements/tr-select-cust_class.html b/httemplate/elements/tr-select-cust_class.html index 54a11d79e..7a2321560 100644 --- a/httemplate/elements/tr-select-cust_class.html +++ b/httemplate/elements/tr-select-cust_class.html @@ -5,7 +5,7 @@ % } else {
<% $opt{'label'} || 'Customer class' %><% $opt{'label'} || 'Customer class' %> <% include( '/elements/select-cust_class.html', 'curr_value' => $classnum, diff --git a/httemplate/elements/tr-select-cust_tag.html b/httemplate/elements/tr-select-cust_tag.html index 76b1b715d..b133dcc15 100644 --- a/httemplate/elements/tr-select-cust_tag.html +++ b/httemplate/elements/tr-select-cust_tag.html @@ -1,7 +1,7 @@ % if ( ($curuser->access_right('Edit customer tags') && @part_tag) || $is_report ) {
<% $opt{'label'} || 'Tags' %><% $opt{'label'} || 'Tags' %> <% include( '/elements/select-cust_tag.html', 'curr_value' => \@curr_tagnum, diff --git a/httemplate/elements/tr-td-label.html b/httemplate/elements/tr-td-label.html index c318722dc..78690f1fb 100644 --- a/httemplate/elements/tr-td-label.html +++ b/httemplate/elements/tr-td-label.html @@ -1,6 +1,11 @@ +<%doc> + +Actually
$label