From 3e9a428cbc8abd4af6fea8eb828126519b43198b Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 18 May 2015 21:17:44 -0700
Subject: [PATCH] customer view UI
---
httemplate/elements/change_history_common.html | 2 ++
httemplate/elements/freeside.css | 15 +++++++++------
httemplate/elements/quotations.html | 2 ++
httemplate/elements/table-tickets.html | 6 ++++++
httemplate/view/cust_main/appointments.html | 5 ++++-
httemplate/view/cust_main/contacts_new.html | 12 ++++++++----
httemplate/view/cust_main/notes/notes.html | 2 ++
httemplate/view/cust_main/packages/section.html | 2 ++
httemplate/view/cust_main/payment_history.html | 2 ++
9 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/httemplate/elements/change_history_common.html b/httemplate/elements/change_history_common.html
index 7d4bd1054..e228e6555 100644
--- a/httemplate/elements/change_history_common.html
+++ b/httemplate/elements/change_history_common.html
@@ -3,6 +3,7 @@
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">User</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
@@ -14,6 +15,7 @@
<TH CLASS="grid" BGCOLOR="#cccccc">Action</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
</TR>
+</THEAD>
% foreach my $item ( @history ) {
% my $history_other = '';
diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css
index 1e2574f6e..4fd06a0bf 100644
--- a/httemplate/elements/freeside.css
+++ b/httemplate/elements/freeside.css
@@ -240,23 +240,26 @@ div.fstabcontainer {
}
table.grid {
- border: 1px solid #cccccc;
- -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);
+ border: 1px solid #999999;
+ border-radius: 2px;
}
th, td {
vertical-align: top;
}
-th.grid {
+thead th.grid {
padding-left: 3px;
padding-right: 3px;
padding-bottom: 2px;
border: none;
empty-cells: show;
+ font-weight:normal;
+ font-size:90%;
+ valign: bottom;
+ color: #666666;
+ background: #ffffff;
+ border-bottom: 1px solid #666666;
}
td.grid {
diff --git a/httemplate/elements/quotations.html b/httemplate/elements/quotations.html
index 1d80a48ea..2af101652 100644
--- a/httemplate/elements/quotations.html
+++ b/httemplate/elements/quotations.html
@@ -8,6 +8,7 @@
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+ <THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">#</TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
@@ -15,6 +16,7 @@
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Recurring') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"></TH>
</TR>
+ </THEAD>
% foreach my $quotation (@quotations) {
% if ( $bgcolor eq $bgcolor1 ) {
% $bgcolor = $bgcolor2;
diff --git a/httemplate/elements/table-tickets.html b/httemplate/elements/table-tickets.html
index f89f98422..d722c9d2b 100644
--- a/httemplate/elements/table-tickets.html
+++ b/httemplate/elements/table-tickets.html
@@ -5,11 +5,14 @@ View
<A HREF="<% $res_link %>"><% mt('resolved') |h %></A>
<BR>
+% if ( @tickets ) {
+
<& /elements/table-grid.html &>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('#') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Subject') |h %></TH>
@@ -26,6 +29,7 @@ View
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Service') |h %></TH>
% }
</TR>
+</THEAD>
% foreach my $ticket ( @tickets ) {
% my $href = FS::TicketSystem->href_ticket($ticket->{id});
@@ -91,6 +95,8 @@ View
% }
+%}
+
</TABLE>
<%init>
diff --git a/httemplate/view/cust_main/appointments.html b/httemplate/view/cust_main/appointments.html
index 9bec7b9ae..f8c1bb686 100644
--- a/httemplate/view/cust_main/appointments.html
+++ b/httemplate/view/cust_main/appointments.html
@@ -20,17 +20,20 @@
%# <A HREF="<% $res_link %>"><% mt('resolved') |h %></A>
<BR>
+%if ( @tickets ) {
<& /elements/table-grid.html &>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Type') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Status') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Owner') |h %></TH>
</TR>
+</THEAD>
% foreach my $ticket ( @tickets ) {
% my $href = FS::TicketSystem->href_ticket($ticket->{id});
@@ -69,7 +72,7 @@
% }
</TABLE>
-
+%}
<%init>
my $cust_main = shift;
diff --git a/httemplate/view/cust_main/contacts_new.html b/httemplate/view/cust_main/contacts_new.html
index 683841c33..590409df9 100644
--- a/httemplate/view/cust_main/contacts_new.html
+++ b/httemplate/view/cust_main/contacts_new.html
@@ -1,11 +1,10 @@
+%if ( @cust_contacts ) {
<BR>
<FONT CLASS="fsinnerbox-title">Contacts</FONT>
<& /elements/table-grid.html &>
-% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor = $bgcolor2;
-% my $th = '<TH CLASS="grid" ALIGN="left" BGCOLOR="#cccccc">';
+<THEAD>
+% my $th = '<TH CLASS="grid" ALIGN="left">';
<TR>
<%$th%>Type</TH>
<%$th%>Contact</TH>
@@ -16,7 +15,11 @@
% }
<%$th%>Comment</TH>
</TR>
+</THEAD>
+% my $bgcolor1 = '#ffffff';
+% my $bgcolor2 = '#eeeeee';
+% my $bgcolor = $bgcolor2;
% foreach my $cust_contact ( @cust_contacts ) {
% my $contact = $cust_contact->contact;
% my $td = qq(<TD CLASS="grid" BGCOLOR="$bgcolor">);
@@ -59,6 +62,7 @@
% }
% }
</TABLE>
+%}
<%once>
my @phone_type = qsearch({table=>'phone_type', order_by=>'weight'});
diff --git a/httemplate/view/cust_main/notes/notes.html b/httemplate/view/cust_main/notes/notes.html
index fa45a68f2..b4ea87c19 100644
--- a/httemplate/view/cust_main/notes/notes.html
+++ b/httemplate/view/cust_main/notes/notes.html
@@ -89,6 +89,7 @@
style="display:<% $display %>"
>
<& /elements/table-grid.html &>
+ <THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
% if ( $conf->exists('cust_main_note-display_times') ) {
@@ -103,6 +104,7 @@
<TH CLASS="grid" BGCOLOR="#cccccc"> </TH>
% }
</TR>
+ </THEAD>
% $skipheader = (!$conf->exists('note-classes') || $conf->config('note-classes') < 2);
% $last_classnum = $note->classnum;
% }
diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html
index 7a85d6b03..fe9f283c7 100755
--- a/httemplate/view/cust_main/packages/section.html
+++ b/httemplate/view/cust_main/packages/section.html
@@ -1,4 +1,5 @@
% if ( @$packages ) {
+<THEAD>
<TR>
% #my $width = $show_location ? 'WIDTH="25%"' : 'WIDTH="33%"';
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Package') |h %></TH>
@@ -8,6 +9,7 @@
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Services') |h %></TH>
% }
</TR>
+</THEAD>
% #$FS::cust_pkg::DEBUG = 2;
% foreach my $cust_pkg (@$packages) {
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 171c29cb7..458469cb1 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -28,6 +28,7 @@
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
@@ -37,6 +38,7 @@
<TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Refund') |h %></FONT></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Balance') |h %></FONT></TH>
</TR>
+</THEAD>
%#display payment history
--
2.20.1