[freeside-commits] branch FREESIDE_4_BRANCH updated. 1a312443a6ec8e6e943b6e650246559fb8b8f178
Ivan
ivan at 420.am
Sun Jun 14 14:56:54 PDT 2015
The branch, FREESIDE_4_BRANCH has been updated
via 1a312443a6ec8e6e943b6e650246559fb8b8f178 (commit)
from 99c8aef927feeb4ecf015957bb69c3ed3e7873e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1a312443a6ec8e6e943b6e650246559fb8b8f178
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Jun 14 14:56:53 2015 -0700
UI spring cleaning: customer edit
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index d203e00..f0de6e1 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -107,8 +107,6 @@ function samechanged(what) {
samechanged(document.getElementById('same'));
</SCRIPT>
-<BR>
-
<& cust_main/contacts_new.html, 'cust_main'=>$cust_main, &>
%# billing info
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index d25e887..c3e8922 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -15,7 +15,7 @@
<BR><FONT CLASS="fsinnerbox-title"><% mt('Billing information') |h %></FONT>
- <% &ntable("#cccccc") %>
+ <TABLE CLASS="fsinnerbox">
% my $curuser = $FS::CurrentUser::CurrentUser;
@@ -63,7 +63,7 @@
% #escape $exempt_group for NAME etc.
% my $checked = ($cust_main_exemption || $cgi->param("tax_$exempt_group"));
<TR>
- <TD> <INPUT TYPE="checkbox" NAME="tax_<% $exempt_group %>" ID="tax_<% $exempt_group %>" VALUE="Y" <% $checked ? 'CHECKED' : '' %> onChange="tax_changed(this)"> Tax Exempt (<% $exempt_group %> taxes)</TD>
+ <TD STYLE="white-space:nowrap"> <INPUT TYPE="checkbox" NAME="tax_<% $exempt_group %>" ID="tax_<% $exempt_group %>" VALUE="Y" <% $checked ? 'CHECKED' : '' %> onChange="tax_changed(this)"> Tax Exempt (<% $exempt_group %> taxes)</TD>
<TD> - Exemption number <INPUT TYPE="text" NAME="tax_<% $exempt_group %>_num" ID="tax_<% $exempt_group %>_num" VALUE="<% $cgi->param("tax_$exempt_group".'_num') || ( $cust_main_exemption ? $cust_main_exemption->exempt_number : '' ) |h %>" <% $checked ? '' : 'DISABLED' %>></TD>
</TR>
% }
@@ -108,7 +108,7 @@
% unless ( $conf->exists('cust-email-high-visibility')) {
<TR>
- <TD ALIGN="right" WIDTH="200">
+ <TH ALIGN="right" WIDTH="200">
<% $conf->exists('cust_main-require_invoicing_list_email', $agentnum)
? $r : '' %>Email address(es)
</TD>
@@ -117,7 +117,7 @@
( $cust_main->message_noemail eq 'Y' )
? 'CHECKED'
: ''
- %>> <% emt('Do not send notices') %>
+ %>> <FONT SIZE="-1"><% emt('Do not send notices') %></FONT>
</TD>
</TR>
% }
@@ -128,7 +128,7 @@
% if ( $conf->exists('cust_main-select-prorate_day') ) {
<TR>
- <TD ALIGN="right" WIDTH="200"><% mt('Prorate day (1-28)') |h %> </TD>
+ <TH ALIGN="right" WIDTH="200"><% mt('Prorate day (1-28)') |h %> </TD>
<TD>
<INPUT TYPE="text" NAME="prorate_day" VALUE="<% $cust_main->prorate_day %>" SIZE=3 MAXLENGTH=2>
</TD>
@@ -142,7 +142,7 @@
% ###
<TR>
- <TD ALIGN="right" WIDTH="200"><% mt('Charge card/e-check on this day of the month') |h %> </TD>
+ <TH ALIGN="right" WIDTH="200"><% mt('Charge card/e-check on this day of the month') |h %> </TD>
<TD>
<SELECT NAME="billday">
<% billday_options($cust_main->billday) %>
@@ -166,7 +166,7 @@
% ###
<TR>
- <TD ALIGN="right" WIDTH="200"><% mt('Invoice terms') |h %> </TD>
+ <TH ALIGN="right" WIDTH="200"><% mt('Invoice terms') |h %> </TD>
<TD WIDTH="408">
<& /elements/select-terms.html,
'curr_value' => $cust_main->invoice_terms,
@@ -180,7 +180,7 @@
% ###
<TR>
- <TD ALIGN="right" WIDTH="200"><% mt('Credit limit') |h %> </TD>
+ <TH ALIGN="right" WIDTH="200"><% mt('Credit limit') |h %> </TD>
<TD WIDTH="408">
<SCRIPT TYPE="text/javascript">
function toggle(obj) {
@@ -198,12 +198,14 @@ function toggle(obj) {
VALUE = 1
onClick="toggle(this)"
<% length($cust_main->credit_limit) ? '' : ' CHECKED'%>
- > <% $default_credit_limit
+ > <FONT SIZE="-1" COLOR="#333333">
+ <% $default_credit_limit
? "Default ($money_char". sprintf("%.2f", $default_credit_limit).
")"
: mt('Unlimited')
|h
- %>
+ %>
+ </FONT>
</TD>
</TR>
@@ -250,7 +252,7 @@ function toggle(obj) {
% if ( $show_term || $cust_main->cdr_termination_percentage ) {
<TR>
- <TD ALIGN="right"><% mt('CDR termination settlement') |h %></TD>
+ <TH ALIGN="right"><% mt('CDR termination settlement') |h %></TD>
<TD><INPUT TYPE = "text"
NAME = "cdr_termination_percentage"
SIZE = 6
diff --git a/httemplate/edit/cust_main/contacts_new.html b/httemplate/edit/cust_main/contacts_new.html
index 9ccb45f..1171e7d 100644
--- a/httemplate/edit/cust_main/contacts_new.html
+++ b/httemplate/edit/cust_main/contacts_new.html
@@ -1,12 +1,15 @@
<DIV ID="contacts_div" STYLE="display:<% $display %>">
+<BR>
<FONT CLASS="fsinnerbox-title">Contacts</FONT>
<% include('/edit/elements/edit.html',
- 'embed' => $opt{cust_main},
- 'table' => 'cust_main',
- 'labels' => { 'contactnum' => '', #'Contact',
- #'locationnum' => ' ',
- },
- 'fields' => [
+ 'embed' => $opt{cust_main},
+ 'table' => 'cust_main',
+ 'agent_virt' => 1,
+ 'html_table_class' => 'fsinnerbox',
+ 'labels' => { 'contactnum' => '', #'Contact',
+ #'locationnum' => ' ',
+ },
+ 'fields' => [
{ 'field' => 'contactnum',
'type' => 'contact',
'colspan' => 6,
@@ -17,7 +20,6 @@
'm2_error_callback' => $m2_error_callback,
},
],
- 'agent_virt' => 1,
)
%>
</DIV>
diff --git a/httemplate/edit/cust_main/cust_payby.html b/httemplate/edit/cust_main/cust_payby.html
index cf0ada9..589c6a7 100644
--- a/httemplate/edit/cust_main/cust_payby.html
+++ b/httemplate/edit/cust_main/cust_payby.html
@@ -1,11 +1,13 @@
<% include('/edit/elements/edit.html',
- 'embed' => $opt{cust_main},
- 'tablenum' => 1,
- 'table' => 'cust_main',
- 'labels' => { 'custpaybynum' => '',
- #'locationnum' => ' ',
- },
- 'fields' => [
+ 'embed' => $opt{cust_main},
+ 'tablenum' => 1,
+ 'table' => 'cust_main',
+ 'agent_virt' => 1,
+ 'html_table_class' => 'fsinnerbox',
+ 'labels' => { 'custpaybynum' => '',
+ #'locationnum' => ' ',
+ },
+ 'fields' => [
{ 'field' => 'custpaybynum',
'type' => 'cust_payby',
'colspan' => 6,
@@ -16,7 +18,6 @@
'm2_error_callback' => $m2_error_callback,
},
],
- 'agent_virt' => 1,
)
%>
</DIV>
diff --git a/httemplate/edit/cust_main/first_pkg.html b/httemplate/edit/cust_main/first_pkg.html
index ad118b4..6845b2c 100644
--- a/httemplate/edit/cust_main/first_pkg.html
+++ b/httemplate/edit/cust_main/first_pkg.html
@@ -8,7 +8,7 @@
<BR>
<FONT CLASS="fsinnerbox-title"><% mt('First package') |h %></FONT>
- <% ntable("#cccccc") %>
+ <TABLE BORDER=0 CELLSPACING=0>
<TR>
<TD COLSPAN=2>
diff --git a/httemplate/edit/cust_main/first_pkg/svc_acct.html b/httemplate/edit/cust_main/first_pkg/svc_acct.html
index 717bf50..8308af4 100644
--- a/httemplate/edit/cust_main/first_pkg/svc_acct.html
+++ b/httemplate/edit/cust_main/first_pkg/svc_acct.html
@@ -1,7 +1,7 @@
-<% ntable("#cccccc") %>
+<TABLE CLASS="fsinnerbox">
<TR>
- <TD ALIGN="right"><% mt('Username') |h %></TD>
+ <TH ALIGN="right"><% mt('Username') |h %></TD>
<TD>
<INPUT TYPE = "text"
NAME = "username"
@@ -13,7 +13,7 @@
</TR>
<TR>
- <TD ALIGN="right"><% mt('Domain') |h %></TD>
+ <TH ALIGN="right"><% mt('Domain') |h %></TD>
<TD>
<SELECT NAME="domsvc">
<OPTION>(<% mt('none') |h %>)</OPTION>
@@ -22,7 +22,7 @@
</TR>
<TR>
- <TD ALIGN="right"><% mt('Password') |h %></TD>
+ <TH ALIGN="right"><% mt('Password') |h %></TD>
<TD>
<INPUT TYPE = "text"
NAME = "_password"
@@ -37,7 +37,7 @@
% if ( $opt{'password_verify'} ) {
<TR>
- <TD ALIGN="right"><% mt('Re-enter Password') |h %></TD>
+ <TH ALIGN="right"><% mt('Re-enter Password') |h %></TD>
<TD>
<INPUT TYPE = "text"
NAME = "_password2"
@@ -50,7 +50,7 @@
% if ( $conf->exists('security_phrase') ) {
<TR>
- <TD ALIGN="right"><% mt('Security Phrase') |h %></TD>
+ <TH ALIGN="right"><% mt('Security Phrase') |h %></TD>
<TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $opt{'sec_phrase'} |h %>">
</TD>
</TR>
@@ -62,7 +62,7 @@
<INPUT TYPE="hidden" NAME="popnum" VALUE="">
% } else {
<TR>
- <TD ALIGN="right"><% mt('Access number') |h %></TD>
+ <TH ALIGN="right"><% mt('Access number') |h %></TD>
%# XXX should gain "area code" selection and labels on the dropdowns
<TD><% FS::svc_acct_pop::popselector($opt{'popnum'}) %></TD>
</TR>
diff --git a/httemplate/edit/cust_main/first_pkg/svc_dsl.html b/httemplate/edit/cust_main/first_pkg/svc_dsl.html
index 971f4be..31f4b5c 100644
--- a/httemplate/edit/cust_main/first_pkg/svc_dsl.html
+++ b/httemplate/edit/cust_main/first_pkg/svc_dsl.html
@@ -1,4 +1,4 @@
-<% ntable("#cccccc") %>
+<TABLE CLASS="fsinnerbox">
% if ( $opt{'phonenum'} ) {
@@ -6,12 +6,12 @@
<INPUT TYPE="hidden" NAME="phonenum" VALUE="<% $opt{'phonenum'} %>">
<TR>
- <TD ALIGN="right">Loop Type</TD>
+ <TH ALIGN="right">Loop Type</TD>
<TD BGCOLOR="#eeeeee">Line-share</TD>
</TR>
<TR>
- <TD ALIGN="right">Phone Number</TD>
+ <TH ALIGN="right">Phone Number</TD>
<TD BGCOLOR="#eeeeee"><% $opt{'phonenum'} %></TD>
</TR>
@@ -21,14 +21,14 @@
<INPUT TYPE="hidden" NAME="phonenum" VALUE="">
<TR>
- <TD ALIGN="right">Loop Type</TD>
+ <TH ALIGN="right">Loop Type</TD>
<TD BGCOLOR="#eeeeee">Standalone</TD>
</TR>
% }
<TR>
- <TD ALIGN="right">PPPoE password</TD>
+ <TH ALIGN="right">PPPoE password</TD>
<TD>
<INPUT TYPE = "text"
NAME = "password"
@@ -38,7 +38,7 @@
</TR>
<TR>
- <TD ALIGN="right">ISP Changing?</TD>
+ <TH ALIGN="right">ISP Changing?</TD>
<TD>
<INPUT TYPE = "checkbox"
NAME = "isp_chg"
@@ -49,7 +49,7 @@
</TR>
<TR>
- <TD ALIGN="right">Current or Previous ISP</TD>
+ <TH ALIGN="right">Current or Previous ISP</TD>
<TD>
<INPUT TYPE = "text"
NAME = "isp_prev"
@@ -60,7 +60,7 @@
<INPUT TYPE="hidden" NAME="vendor_qual_id" VALUE="<% $opt{'vendor_qual_id'} %>">
<TR>
- <TD ALIGN="right">Vendor Qualification ID</TD>
+ <TH ALIGN="right">Vendor Qualification ID</TD>
<TD BGCOLOR="#eeeeee"><% $opt{'vendor_qual_id'} %></TD>
</TR>
diff --git a/httemplate/edit/cust_main/first_pkg/svc_phone.html b/httemplate/edit/cust_main/first_pkg/svc_phone.html
index 70e013e..65c6778 100644
--- a/httemplate/edit/cust_main/first_pkg/svc_phone.html
+++ b/httemplate/edit/cust_main/first_pkg/svc_phone.html
@@ -1,8 +1,8 @@
-<% ntable("#cccccc") %>
+<TABLE CLASS="fsinnerbox">
%#XXX this should be hidden or something in most/all cases
<TR>
- <TD ALIGN="right" ID="countrycode_label_td">Country code</TD>
+ <TH ALIGN="right" ID="countrycode_label_td">Country code</TD>
<TD ID="countrycode_td">
<INPUT TYPE = "text"
NAME = "countrycode"
@@ -21,7 +21,7 @@
%# )
%#%>
<TR>
- <TD ALIGN="right" ID="phonenum_label_td">Phone Number</TD>
+ <TH ALIGN="right" ID="phonenum_label_td">Phone Number</TD>
<TD ID="phonenum_td">
<INPUT TYPE = "text"
NAME = "phonenum"
@@ -34,7 +34,7 @@
</TR>
<TR>
- <TD ALIGN="right" ID="sip_password_label_td">SIP password</TD>
+ <TH ALIGN="right" ID="sip_password_label_td">SIP password</TD>
<TD ID="sip_password_td">
<INPUT TYPE = "text"
NAME = "sip_password"
@@ -46,7 +46,7 @@
</TR>
<TR>
- <TD ALIGN="right" ID="pin_label_td">Voicemail PIN</TD>
+ <TH ALIGN="right" ID="pin_label_td">Voicemail PIN</TD>
<TD ID="pin_td">
<INPUT TYPE = "text"
NAME = "pin"
@@ -60,7 +60,7 @@
%#XXX this should be hidden or something in most/all cases
<TR>
- <TD ALIGN="right" ID="phone_name_label_td">Name</TD>
+ <TH ALIGN="right" ID="phone_name_label_td">Name</TD>
<TD ID="phone_name_td">
<INPUT TYPE = "text"
NAME = "phone_name"
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 7b02994..c6d4553 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -7,7 +7,7 @@ Example:
# (preferred, will be pluralized automatically)
'name' => #name for the record
# (deprecated, will be pluralized simplistically)
- 'table' =>
+ 'table' => #database table
#? 'primary_key' => #required when the dbdef doesn't know...???
'labels' => {
@@ -135,6 +135,8 @@ Example:
'form_init' => '', #after html_init, error and the opening <FORM>, but
#before any other form contents
+ 'html_table_class' => '', #HTML <TABLE CLASS=
+
#string or coderef of additional HTML to add before </TABLE>
'html_table_bottom' => '',
@@ -270,7 +272,11 @@ Example:
% }
% my $tablenum = $opt{'tablenum'} || 0;
-<TABLE ID="TableNumber<% $tablenum++ %>" BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0>
+<TABLE ID="TableNumber<% $tablenum++ %>"
+ <% $opt{html_table_class} ? 'CLASS="'. $opt{html_table_class}. '"'
+ : 'BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0'
+ %>
+>
% my $g_row = 0;
% my @g_row_stack = ();
-----------------------------------------------------------------------
Summary of changes:
httemplate/edit/cust_main.cgi | 2 --
httemplate/edit/cust_main/billing.html | 24 +++++++++++---------
httemplate/edit/cust_main/contacts_new.html | 16 +++++++------
httemplate/edit/cust_main/cust_payby.html | 17 +++++++-------
httemplate/edit/cust_main/first_pkg.html | 2 +-
httemplate/edit/cust_main/first_pkg/svc_acct.html | 14 ++++++------
httemplate/edit/cust_main/first_pkg/svc_dsl.html | 16 ++++++-------
httemplate/edit/cust_main/first_pkg/svc_phone.html | 12 +++++-----
httemplate/edit/elements/edit.html | 10 ++++++--
9 files changed, 61 insertions(+), 52 deletions(-)
More information about the freeside-commits
mailing list