From af964aec5a6a720ca70465ef98ac6e301db578b3 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Tue, 27 Sep 2022 11:27:27 +0200
Subject: [PATCH] Bug 30952: Harmonize tables style

- 2 pixels border below <thead> and above <tfoot>
- No border above or below table cells (in thead, tbody and tfoot)
- No border around tables

Issue #22

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/css/src/_tables.scss     | 17 +++++++++++++----
 .../en/includes/messaging-preference-form.inc   |  4 ++++
 .../prog/en/modules/catalogue/results.tt        |  4 ++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
index 86becf8730..d7cea5bb78 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
@@ -1,7 +1,13 @@
 table {
     border-collapse: collapse;
 
-    border-top: 1px solid $table-border-color;
+    thead {
+        border-bottom: 2px solid $table-border-color;
+    }
+
+    tfoot {
+        border-top: 2px solid $table-border-color;
+    }
 
     .btn-group {
         white-space: nowrap;
@@ -70,14 +76,18 @@ table {
 
     &.dataTable {
         border-collapse: collapse;
-        border: none;
         margin-top: .5em;
         margin-bottom: .5em;
 
+        &.no-footer {
+            border: none;
+        }
+
         tfoot {
             td,
             th {
                 padding: .5em;
+                border-top: none;
             }
         }
 
@@ -85,6 +95,7 @@ table {
             th,
             td {
                 padding: .5em;
+                border-bottom: none;
             }
 
             tr {
@@ -115,8 +126,6 @@ table {
         }
 
         tbody {
-            border-top: 2px solid $table-border-color;
-
             td {
                 padding: .5em;
             }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index 1fe1d67696..accdad7c19 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -4,6 +4,7 @@
 <input type="hidden" name="modify" value="yes" />
 <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
   <table>
+    <thead>
     <tr><th></th>
         <th>Days in advance</th>
         [% IF Koha.Preference('SMSSendDriver') %]<th>SMS</th>[% END %]
@@ -12,6 +13,8 @@
         <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="fa fa-info-circle"></i></th>
         <!-- <th>RSS</th> -->
     </tr>
+    </thead>
+    <tbody>
     [% FOREACH messaging_preference IN messaging_preferences %]
     [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
     [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
@@ -236,4 +239,5 @@
 
     </tr>
     [% END %]
+    </tbody>
   </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 939257ef9c..6f0181ae40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -440,6 +440,7 @@
 
                                 <!-- TABLE RESULTS START -->
                                 <table>
+                                    <thead>
                                     <tr>
                                         [% IF ( AmazonCoverImages  || LocalCoverImages || ( SyndeticsCovers ) || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %]
                                             <th>&nbsp;</th>
@@ -447,8 +448,10 @@
                                         <th colspan="2">Results</th>
                                         <th>Location</th>
                                     </tr>
+                                    </thead>
                                     <!-- Actual Search Results -->
                                     [% SET MaxSearchResultsItemsPerRecordStatusCheck = Koha.Preference('MaxSearchResultsItemsPerRecordStatusCheck') %]
+                                    <tbody>
                                     [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
                                         <tr id="row[% SEARCH_RESULT.biblionumber | html %]">
                                             [% IF ( AmazonCoverImages  || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %]
@@ -681,6 +684,7 @@
                                             </td>
                                         </tr>
                                     [% END # /FOREACH SEARCH_RESULT %]
+                                    </tbody>
                                 </table>
                             </form>
                         </div> <!-- /#bookbag_form -->
-- 
2.39.5