[freeside-commits] branch master updated. 50cc2b95894b151599b458462dcd83edb68980ce
Ivan Kohler
ivan at freeside.biz
Thu Jul 8 09:51:28 PDT 2021
The branch, master has been updated
via 50cc2b95894b151599b458462dcd83edb68980ce (commit)
from 9b8823fca219e54ece55ebddf75d3943c8108a5e (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 50cc2b95894b151599b458462dcd83edb68980ce
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Jul 8 09:51:27 2021 -0700
4.x style
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 78e4427e0..0a0b01e11 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -206,9 +206,8 @@
#recurring frequency
#recurring fee (auto-disable)
- { type => 'columnnext' },
+ { type => 'columnnext', value=>'Taxation', },
- {type=>'justtitle', value=>'Taxation' },
{field=>'setuptax', type=>'checkbox', value=>'Y'},
{field=>'recurtax', type=>'checkbox', value=>'Y'},
{field=>'taxclass', type=>'select-taxclass' },
@@ -243,9 +242,7 @@
)
),
- { type => 'columnnext' },
-
- {type=>'justtitle', value=>'Agent (reseller) types' },
+ { type => 'columnnext', value=>'Agent (reseller) types' },
{ field => 'agent_type',
type => 'select-agent_type',
@@ -857,8 +854,9 @@ my $javascript = <<'END';
supp_pkg_rows[0].style.display = 'none';
var button = document.getElementById('show_supp_pkgs');
button.onclick = show_supp_pkgs_click;
- button.style.backgroundColor = '#cccccc';
- button.style.border = '1px solid #7e0079';
+ //button.style.backgroundColor = '#cccccc';
+ //button.style.border = '1px solid #7e0079';
+ button.style.border = 'thin solid #999999';
button.style.padding = '1px';
}
}
@@ -914,7 +912,7 @@ my $html_bottom = sub {
my $layer_callback = sub {
my $layer = shift;
- my $html = ntable("#cccccc",2);
+ my $html = '<TABLE CLASS="fsinnerbox">';
#$html .= '
# <TR>
diff --git a/httemplate/elements/columnnext.html b/httemplate/elements/columnnext.html
index 4dfe82fd8..da8286e64 100644
--- a/httemplate/elements/columnnext.html
+++ b/httemplate/elements/columnnext.html
@@ -1,4 +1,10 @@
</TABLE>
</TD>
<TD VALIGN="top" STYLE="padding-left:12px">
- <TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0>
+ <FONT CLASS="fsinnerbox-title"><% $opt{value} %></FONT><BR>
+ <TABLE CLASS="fsinnerbox">
+<%init>
+
+my %opt = @_;
+
+</%init>
diff --git a/httemplate/elements/columnstart.html b/httemplate/elements/columnstart.html
index 245c308a7..40f7cad40 100644
--- a/httemplate/elements/columnstart.html
+++ b/httemplate/elements/columnstart.html
@@ -16,7 +16,7 @@ Pass 'aligned' => 1 to have corresponding rows in the columns line up.
<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 id="<%$id%>">
<TR>
<TD VALIGN="top">
- <TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0>
+ <TABLE CLASS="fsinnerbox">
% if ( $aligned ) {
%# Instead of changing all the tr-* elements to sometimes output table
%# cells without wrapping them in a row, we're just going to completely
diff --git a/httemplate/elements/tr-justtitle.html b/httemplate/elements/tr-justtitle.html
index b87f7e128..316ea69a8 100644
--- a/httemplate/elements/tr-justtitle.html
+++ b/httemplate/elements/tr-justtitle.html
@@ -1,7 +1,7 @@
<TR>
- <TH CLASS="background" COLSPAN=<% $opt{colspan} || 2 %> ALIGN="left" <%$id%>>
- <FONT SIZE="+1"><% $opt{value} %></FONT>
- </TH>
+ <TD CLASS="background" COLSPAN=<% $opt{colspan} || 2 %> ALIGN="left" <%$id%>>
+ <FONT CLASS="fsinnerbox-title"><% $opt{value} %></FONT>
+ </TD>
</TR>
<%init>
diff --git a/httemplate/elements/tr-pkg_svc.html b/httemplate/elements/tr-pkg_svc.html
index de3f95a3a..232454576 100644
--- a/httemplate/elements/tr-pkg_svc.html
+++ b/httemplate/elements/tr-pkg_svc.html
@@ -131,8 +131,8 @@ provision_hold_init();
% if ( scalar(@possible_exports) > 0 || scalar(@mapped_exports) > 0 ) {
<TABLE><TR>
- <TH BGCOLOR="#dcdcdc">Export</TH>
- <TH BGCOLOR="#dcdcdc">Vendor Package Id <FONT SIZE="-2">(blank to delete)</FONT></TH>
+ <TH>Export</TH>
+ <TH>Vendor Package Id <FONT SIZE="-2">(blank to delete)</FONT></TH>
</TR>
% foreach my $export ( @mapped_exports ) {
<TR>
@@ -166,14 +166,14 @@ my $cgi = $opt{'cgi'};
my $thead_count = 0;
sub pkg_svc_thead {
$thead_count += 1;
- return "\n\n". ntable('#cccccc', 2).
+ return "\n\n". '<TABLE CLASS="fsinnerbox">'.
'<TR>'.
- '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>'.
- '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'.
- '<TH BGCOLOR="#dcdcdc">Service</TH>'.
- '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Hide<BR>from<BR>Invoices</FONT></TH>'.
- '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Bulk<BR>Charge</FONT></TH>'.
- '<TH BGCOLOR="#dcdcdc" ID="th_provision_hold' . $thead_count . '"><FONT SIZE=-1>Remove Hold After Provisioning</FONT></TH>'.
+ '<TH><FONT SIZE=-1>Quan.</FONT></TH>'.
+ '<TH><FONT SIZE=-1>Primary</FONT></TH>'.
+ '<TH>Service</TH>'.
+ '<TH><FONT SIZE=-1>Hide<BR>from<BR>Invoices</FONT></TH>'.
+ '<TH><FONT SIZE=-1>Bulk<BR>Charge</FONT></TH>'.
+ '<TH ID="th_provision_hold' . $thead_count . '"><FONT SIZE=-1>Remove Hold After Provisioning</FONT></TH>'.
'</TR>'.
qq!<SCRIPT>provision_hold_td.push(document.getElementById('th_provision_hold$thead_count'))</SCRIPT>!;
;
-----------------------------------------------------------------------
Summary of changes:
httemplate/edit/part_pkg.cgi | 14 ++++++--------
httemplate/elements/columnnext.html | 8 +++++++-
httemplate/elements/columnstart.html | 2 +-
httemplate/elements/tr-justtitle.html | 6 +++---
httemplate/elements/tr-pkg_svc.html | 18 +++++++++---------
5 files changed, 26 insertions(+), 22 deletions(-)
More information about the freeside-commits
mailing list