From: Ivan Kohler <ivan@freeside.biz> Date: Sat, 16 May 2015 23:08:31 +0000 (-0700) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=1cde870268b03197da75f089669d60a7ba3c5617;hp=-c Merge branch 'master' of git.freeside.biz:/home/git/freeside --- 1cde870268b03197da75f089669d60a7ba3c5617 diff --combined httemplate/elements/freeside.css index 280427cac,a9d162bab..1919f526f --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@@ -225,30 -225,18 +225,30 @@@ div.fstabcontainer } .fsinnerbox { - background-color:#cccccc; + /* background-color:#cccccc; */ padding:2px; - -moz-box-shadow: 1px 1px 2px #666666; + border: 1px solid #dddddd; + /* -moz-box-shadow: 1px 1px 2px #666666; -webkit-box-shadow: 1px 1px 2px #666666; box-shadow: 1px 1px 2px #666666; filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); + */ +} + +.fsinnerbox th { + font-weight:normal; + font-size:75%; + valign: bottom; + color: #999999; } .fsinnerbox-title { font-size:110%; font-weight:bold; - background-color:#cccccc; + /*border-top: 1px solid #dddddd; + border-left: 1px solid #dddddd; + border-right: 1px solid #dddddd; */ + /* background-color:#cccccc; padding:2px; -moz-border-radius-topleft:8px; -moz-border-radius-topright:8px; @@@ -260,7 -248,6 +260,7 @@@ -webkit-box-shadow: 1px 0px 1px #999999; box-shadow: 1px 0px 1px #999999; filter: progid:DXImageTransform.Microsoft.Shadow(color='#999999', Direction=90, Strength=1); + */ } .background { @@@ -275,6 -262,10 +275,10 @@@ table.grid filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=2); } + th, td { + vertical-align: top; + } + th.grid { padding-left: 3px; padding-right: 3px; diff --combined httemplate/view/cust_main/billing.html index 84241d297,c70c5c355..a16e8a564 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@@ -1,18 -1,4 +1,4 @@@ <FONT CLASS="fsinnerbox-title"><% mt('Billing information') |h %></FONT> - %# If we can't see the unencrypted card, then bill now is an exercise in - %# frustration (without some sort of job queue magic to send it to a secure - %# machine, anyway) - %if ( $FS::CurrentUser::CurrentUser->access_right('Bill customer now') - % && ! $cust_main->is_encrypted($cust_main->payinfo) - % ) { - %# (<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>"><% mt('Bill now') |h %></A>) - <& /elements/bill.html, - custnum => $cust_main->custnum, - label => emt('Bill now'), - url => $p.'view/cust_main.cgi?'.$cust_main->custnum, - &> - % } - % my $yes = emt('yes'); % my $no = emt('no'); @@@ -20,8 -6,8 +6,8 @@@ % if ( $cust_main->complimentary ) { <TR> - <TD ALIGN="right"><% mt('Complimentary') |h %></TD> - <TD BGCOLOR="#ffffff"><% $yes %></TD> + <TH ALIGN="right"><% mt('Complimentary') |h %></TH> + <TD><% $yes %></TD> </TR> % } @@@ -29,14 -15,14 +15,14 @@@ % =~ s/^(\-?)(.*)$/<FONT SIZE=+1>$1<\/FONT>$money_char$2/; <TR> - <TD ALIGN="right"><% mt('Balance due') |h %></TD> - <TD BGCOLOR="#ffffff"><B><% $balance %></B></TD> + <TH ALIGN="right"><% mt('Balance due') |h %></TH> + <TD><B><% $balance %></B></TD> </TR> % if ( $conf->exists('cust_main-select-prorate_day') ) { <TR> - <TD ALIGN="right"><% mt('Prorate day of month') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->prorate_day %> + <TH ALIGN="right"><% mt('Prorate day of month') |h %></TH> + <TD><% $cust_main->prorate_day %> </TD> </TR> % } @@@ -50,16 -36,16 +36,16 @@@ % ) % { <TR> - <TD ALIGN="right"><% mt('Payment day of month') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->billday %> + <TH ALIGN="right"><% mt('Payment day of month') |h %></TH> + <TD><% $cust_main->billday %> </TD> </TR> % } % if ( $cust_main->po_number ) { <TR> - <TD ALIGN="right"><% mt('Purchase Order #') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->po_number %></TD> + <TH ALIGN="right"><% mt('Purchase Order #') |h %></TH> + <TD><% $cust_main->po_number %></TD> </TR> % } @@@ -70,16 -56,16 +56,16 @@@ % ) % { <TR> - <TD ALIGN="right"><% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.emt('all taxes').')' : '' %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->tax ? $yes : $no %></TD> + <TH ALIGN="right"><% mt('Tax exempt') |h %><% @exempt_groups ? ' ('.emt('all taxes').')' : '' %></TH> + <TD><% $cust_main->tax ? $yes : $no %></TD> </TR> % } % foreach my $exempt_group ( @exempt_groups ) { % my $cust_main_exemption = $cust_main->tax_exemption($exempt_group); <TR> - <TD ALIGN="right"><% mt('Tax exempt') |h %> (<% $exempt_group %> taxes)</TD> - <TD BGCOLOR="#ffffff"><% $cust_main_exemption ? $yes : $no %> + <TH ALIGN="right"><% mt('Tax exempt') |h %> (<% $exempt_group %> taxes)</TH> + <TD><% $cust_main_exemption ? $yes : $no %> <% $cust_main_exemption ? $cust_main_exemption->exempt_number : '' |h %> </TD> </TR> @@@ -87,16 -73,16 +73,16 @@@ % if ( $conf->exists('enable_taxproducts') ) { <TR> - <TD ALIGN="right"><% mt('Tax location') |h %></TD> + <TH ALIGN="right"><% mt('Tax location') |h %></TH> % my $tax_location = $conf->exists('tax-ship_address') % ? $cust_main->ship_location % : $cust_main->bill_location; - <TD BGCOLOR="#ffffff"><% $tax_location->geocode('cch') %></TD> + <TD><% $tax_location->geocode('cch') %></TD> </TR> % } <TR> - <TD ALIGN="right"><% mt('Postal mail invoices') |h %></TD> - <TD BGCOLOR="#ffffff"> + <TH ALIGN="right"><% mt('Postal mail invoices') |h %></TH> + <TD> <% ( grep { $_ eq 'POST' } @invoicing_list ) ? $yes. ( $cust_main->invoice_attn ? ', attn: '. $cust_main->invoice_attn @@@ -107,15 -93,15 +93,15 @@@ </TD> </TR> <TR> - <TD ALIGN="right"><% mt('Email invoices') |h %></TD> - <TD BGCOLOR="#ffffff"> + <TH ALIGN="right"><% mt('Email invoices') |h %></TH> + <TD> <% $cust_main->invoice_noemail ? $no : $yes %> </TD> </TR> % unless ( $conf->exists('cust-email-high-visibility')) { <TR> - <TD ALIGN="right"><% mt('Email address(es)') |h %></TD> - <TD BGCOLOR="#ffffff"> + <TH ALIGN="right"><% mt('Email address(es)') |h %></TH> + <TD> <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %> % if ( $cust_main->message_noemail ) { <BR> @@@ -125,8 -111,8 +111,8 @@@ </TR> % } <TR> - <TD ALIGN="right"><% mt('Invoice terms') |h %></TD> - <TD BGCOLOR="#ffffff"> + <TH ALIGN="right"><% mt('Invoice terms') |h %></TH> + <TD> <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms', $cust_main->agentnum) || emt('Payable upon receipt') @@@ -136,8 -122,8 +122,8 @@@ </TD> </TR> <TR> - <TD ALIGN="right"><% mt('Credit limit') |h %></TD> - <TD BGCOLOR="#ffffff"> + <TH ALIGN="right"><% mt('Credit limit') |h %></TH> + <TD> % my $default_credit_limit = $conf->config('default_credit_limit'); <% length($cust_main->credit_limit) ? $money_char. sprintf("%.2f", $cust_main->credit_limit) @@@ -153,51 -139,51 +139,51 @@@ % if ( $conf->exists('voip-cust_cdr_spools') ) { <TR> - <TD ALIGN="right"><% mt('Spool CDRs') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->spool_cdr ? $yes : $no %></TD> + <TH ALIGN="right"><% mt('Spool CDRs') |h %></TH> + <TD><% $cust_main->spool_cdr ? $yes : $no %></TD> </TR> % } % if ( $conf->exists('voip-cust_cdr_squelch') ) { <TR> - <TD ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->squelch_cdr ? $no : $yes %></TD> + <TH ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TH> + <TD><% $cust_main->squelch_cdr ? $no : $yes %></TD> </TR> % } % if ( $conf->exists('voip-cust_accountcode_cdr') ) { <TR> - <TD ALIGN="right"><% mt('Breakdown CDRs by accountcode') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->accountcode_cdr ? $yes : $no %></TD> + <TH ALIGN="right"><% mt('Breakdown CDRs by accountcode') |h %></TH> + <TD><% $cust_main->accountcode_cdr ? $yes : $no %></TD> </TR> % } % if ( $conf->exists('voip-cust_email_csv_cdr') ) { <TR> - <TD ALIGN="right"><% mt('Email CDRs as CSV') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->email_csv_cdr ? $yes : $no %></TD> + <TH ALIGN="right"><% mt('Email CDRs as CSV') |h %></TH> + <TD><% $cust_main->email_csv_cdr ? $yes : $no %></TD> </TR> % } % if ( $show_term || $cust_main->cdr_termination_percentage ) { <TR> - <TD ALIGN="right"><% mt('CDR termination settlement') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->cdr_termination_percentage %><% $cust_main->cdr_termination_percentage =~ /\d/ ? '%' : '' %></TD> + <TH ALIGN="right"><% mt('CDR termination settlement') |h %></TH> + <TD><% $cust_main->cdr_termination_percentage %><% $cust_main->cdr_termination_percentage =~ /\d/ ? '%' : '' %></TD> </TR> % } % if ( $cust_main->currency ) { <TR> - <TD ALIGN="right"><% mt('Invoicing currency') |h %></TD> - <TD BGCOLOR="#ffffff"><% $cust_main->currency. ': '. code2currency($cust_main->currency) %></TD> + <TH ALIGN="right"><% mt('Invoicing currency') |h %></TH> + <TD><% $cust_main->currency. ': '. code2currency($cust_main->currency) %></TD> </TR> % } % if ( $cust_main->locale ) { % my %locale_info = FS::Locales->locale_info($cust_main->locale); <TR> - <TD ALIGN="right"><% mt('Invoicing locale') |h %></TD> - <TD BGCOLOR="#ffffff"><% $locale_info{name} . " (" . $locale_info{country} .")" %></TD> + <TH ALIGN="right"><% mt('Invoicing locale') |h %></TH> + <TD><% $locale_info{name} . " (" . $locale_info{country} .")" %></TD> </TR> % }