Attachment 141698 Details for Bug 30952 – Bug 30952: Harmonize tables style

[patch] Bug 30952: Harmonize tables style

Bug-30952-Harmonize-tables-style.patch (text/plain), 5.18 KB, created by Julian Maurice on 2022-10-12 05:37:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2022-10-12 05:37:01 UTC

Size: 5.18 KB

patch

obsolete

>From d775b72bc52587d5e3802ea32ea633904873023c 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
>---
> .../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>
>         
>     </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>
>+                                    <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>
>                                     
>                                     [% 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> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605