From 4e1ab37ff215a8d42b8525de6fe27cb29bde8abf Mon Sep 17 00:00:00 2001
From: Kathy Lussier <klussier@masslnc.org>
Date: Fri, 19 Aug 2016 13:41:14 -0400
Subject: [PATCH] LP#1614807: Holds history should look like other My Account
 screens

The Holds History My Account interface looks entirely different than the Items
Out, Check Out History, and Items On Holds interfaces. This commit adds a new
acct_holds_hist_header CSS class that shares the same styles as the CSS classes
used for the other three interfaces. Inline styles are removed from this table.

Test plan
Pre-patch: Go to the My Account Items Out, Check Out History, Items on Hold,
and Holds History interfaces. While the first three interfaces use a table with
a white background for the headers and a gray background for the body, the Holds
History interface is the opposite.

Post patch: All four interfaces should show a similar style to each other.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 Open-ILS/src/templates/opac/css/style.css.tt2      |  6 ++--
 .../src/templates/opac/myopac/hold_history.tt2     | 32 ++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index dacad7aa3e..7637863264 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -903,7 +903,7 @@ div.result_table_utils_cont {
     /*padding-left:10px;*/
 }
 
-#acct_checked_main_header, #acct_holds_main_header, #acct_checked_hist_header, #acct_list_header, #acct_list_header_anon, #temp_list_holds, #acct_messages_main_header {
+#acct_checked_main_header, #acct_holds_main_header, #acct_checked_hist_header, #acct_holds_hist_header, #acct_list_header, #acct_list_header_anon, #temp_list_holds, #acct_messages_main_header {
     border-collapse: collapse;
 }
 
@@ -914,12 +914,12 @@ div.result_table_utils_cont {
 
 .hold_note_title { font-weight: bold; }
 
-#acct_checked_main_header td, #acct_holds_main_header td, #acct_checked_hist_header td, #acct_list_header td, #acct_list_header_anon td, #temp_list_holds td, #acct_messages_main_header td {
+#acct_checked_main_header td, #acct_holds_main_header td, #acct_checked_hist_header td, #acct_holds_hist_header td, #acct_list_header td, #acct_list_header_anon td, #temp_list_holds td, #acct_messages_main_header td {
     background: [% css_colors.accent_lighter2 %];
     padding: 10px;
 }
 
-#acct_checked_main_header th, #acct_holds_main_header th, #acct_checked_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th {
+#acct_checked_main_header th, #acct_holds_main_header th, #acct_checked_hist_header th, acct_holds_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th {
     text-align: left;
     padding: 0px 10px 0px 10px;
 }
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index 9aae602297..a142bf5a16 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -52,21 +52,20 @@
             <big><strong>[% l('No holds found.') %]</strong></big>
         </div>
         [% ELSE %]
-        <table style='border-collapse:collapse; width: 100%;'
-            title="[% l('History of items on hold') %]">
-            <thead id='acct_holds_main_header'>
+        <table id='acct_holds_hist_header' class='table_no_border_space table_no_cell_pad' title="[% l('History of items on hold') %]">
+            <thead>
                 <tr>
-                    <td><span>[% l('Title') %]</span></td>
-                    <td><span>[% l('Author') %]</span></td>
-                    <td> <span>[% l('Format') %]</span></td>
-                    <td><span>[% l('Pickup Location') %]</span> </td>
-                    <td>[% l('Activate') %]</td>
-                    <td>[% l('Active') %]</td>
-                    <td>[% l('Date Fulfilled') %]</td>
-                    <td><span>[% l('Status') %]</span></td>
+                    <th><span>[% l('Title') %]</span></td>
+                    <th><span>[% l('Author') %]</span></td>
+                    <th> <span>[% l('Format') %]</span></td>
+                    <th><span>[% l('Pickup Location') %]</span> </td>
+                    <th>[% l('Activate') %]</td>
+                    <th>[% l('Active') %]</td>
+                    <th>[% l('Date Fulfilled') %]</td>
+                    <th><span>[% l('Status') %]</span></td>
                 </tr>
             </thead>
-            <tbody>
+            <tbody id='holds_temp_parent'>
                 [% FOR hold IN ctx.holds;
                     attrs = {marc_xml => hold.marc_xml};
                     PROCESS get_marc_attrs args=attrs;
@@ -75,19 +74,19 @@
                 <tr name="acct_holds_temp" class="acct_holds_temp">
 
                     <td>
-                        <div style="margin-top:10px;margin-bottom:10px;">
+                        <div>
                             <a href="[% mkurl(ctx.opac_root _ '/record/' _ hold.hold.bre_id) %]">[% attrs.title | html %]</a>
                         </div>
                     </td>
                     <td>
-                        <div style="margin-top:10px;margin-bottom:10px;">
+                        <div>
                             <a href="[% mkurl(ctx.opac_root _ '/results',
                                 {qtype => author, query => attrs.author.replace('[,\.:;]', '')}
                             ) %]">[% attrs.author | html %]</a>
                         </div>
                     </td>
                     <td>
-                        <div style="width:26px;height:23px;margin-top:6px;margin-bottom:6px;">
+                        <div class='format_icon'>
                             [% IF attrs.format_icon %]
                             <img title="[% attrs.format_label | html %]" alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
                             [% END %]
@@ -116,8 +115,7 @@
                         END %]
                     </td>
                     <td>
-                        <div name="acct_holds_status"
-                            style="margin-top:10px;margin-bottom:10px;">
+                        <div name="acct_holds_status">
                             [% PROCESS get_hold_status hold=hold; %]
                         </div>
                     </td>
-- 
2.11.0