From c68a23b10598c94c16fccf24321a8dbb37138abf Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Tue, 17 Dec 2024 11:06:11 +0200
Subject: [PATCH] Tweak holdings tables for better looks and
 forward-compatibility.

---
 themes/finna2/scss/finna/external-data.scss   | 28 +++++++++++--------
 themes/finna2/scss/finna/reservationlist.scss |  4 +--
 .../Helpers/reservationlist-reserve.phtml     | 22 ++++++++-------
 .../RecordTab/holdings-record-urls.phtml      |  2 +-
 .../templates/RecordTab/holdingsarchive.phtml | 12 ++++----
 .../templates/RecordTab/holdingsils.phtml     |  4 +--
 .../RecordTab/holdingsils/electronic.phtml    |  2 +-
 7 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/themes/finna2/scss/finna/external-data.scss b/themes/finna2/scss/finna/external-data.scss
index 6a774cb30e8..c82c603c1eb 100644
--- a/themes/finna2/scss/finna/external-data.scss
+++ b/themes/finna2/scss/finna/external-data.scss
@@ -2,22 +2,23 @@
     width: 100%;
     border: 1px $gray-lighter solid;
 
-    .fa-chevron-up, .fa-chevron-down {
-        font-size: .80em;
-        vertical-align: middle;
-    }
     &.collapsible {
+        .toggle-collapse {
+            display: flex;
+            align-self: center;
+        }
         .toggle-expand {
             display: none;
         }
         &.collapsed {
-          .toggle-collapse {
-              display: none;
-          }
-          .toggle-expand {
-              display: initial;
-          }
-       }
+            .toggle-collapse {
+                display: none;
+            }
+            .toggle-expand {
+                display: flex;
+                align-self: center;
+            }
+        }
     }
 
     thead {
@@ -38,6 +39,10 @@
         }
         &.external-data-headers {
             padding-left: 5px;
+            .icon-link__icon {
+                font-size: 0.8rem;
+
+            }
         }
         &:nth-child(even):not(.info) {
             background-color: $gray-ultralight;
@@ -49,7 +54,6 @@
             &.tbl-left {
                 float: left;
                 width: 40%;
-                font-size: 1.5m;
                 font-weight: 600;
             }
             &.tbl-right {
diff --git a/themes/finna2/scss/finna/reservationlist.scss b/themes/finna2/scss/finna/reservationlist.scss
index d27aa7ae188..fbf4f347b46 100644
--- a/themes/finna2/scss/finna/reservationlist.scss
+++ b/themes/finna2/scss/finna/reservationlist.scss
@@ -48,6 +48,7 @@
 }
 .reservation-request-table {
   .reservation-request-buttons {
+    padding: 10px 15px;
     display: flex;
     align-items: center;
     justify-content: start;
@@ -67,8 +68,7 @@
     }
   }
   .saved-reservation-lists {
-    padding: 4px;
-    margin: 2px;
+    padding: 10px 15px;
   }
 }
 
diff --git a/themes/finna2/templates/Helpers/reservationlist-reserve.phtml b/themes/finna2/templates/Helpers/reservationlist-reserve.phtml
index d055cc7098e..721ec49a843 100644
--- a/themes/finna2/templates/Helpers/reservationlist-reserve.phtml
+++ b/themes/finna2/templates/Helpers/reservationlist-reserve.phtml
@@ -6,7 +6,7 @@ return;
 <?php
   $user = $this->auth()->getManager()->getUserObject();
 ?>
-<div class="record-holdings-table table reservation-request-table">
+<div class="record-holdings-table reservation-request-table">
   <div class="headers">
     <span class="holdings-title"><?=$this->transEsc('ReservationList::Add To Reservation List')?></span>
   </div>
@@ -31,15 +31,17 @@ return;
     <?php endforeach; ?>
   <?php endforeach; ?>
   <?php if ($listsContainingRecord = $this->reservationList($user)->getListsContainingRecord($this->driver)): ?>
-    <div class="saved-reservation-lists alert-info savedLists loaded">
-      <strong><?=$this->transEsc('Saved in')?>:</strong><br/>
-      <ul>
-        <?php foreach ($listsContainingRecord as $list): ?>
-          <li>
-            <a href="<?= $this->url('reservationlist-displaylist', ['id' => $list->getId()]) ?>"><?= $this->escapeHtml($list->getTitle()); ?></a><br/>
-          </li>
-        <?php endforeach; ?>
-      </ul>
+    <div class="holdings-group saved-reservation-lists">
+      <div class="alert-info savedLists loaded">
+        <strong><?=$this->transEsc('Saved in')?>:</strong><br/>
+        <ul>
+          <?php foreach ($listsContainingRecord as $list): ?>
+            <li>
+              <a href="<?= $this->url('reservationlist-displaylist', ['id' => $list->getId()]) ?>"><?= $this->escapeHtml($list->getTitle()); ?></a><br/>
+            </li>
+          <?php endforeach; ?>
+        </ul>
+      </div>
     </div>
   <?php endif; ?>
 </div>
diff --git a/themes/finna2/templates/RecordTab/holdings-record-urls.phtml b/themes/finna2/templates/RecordTab/holdings-record-urls.phtml
index c4af7ed20df..c85ecaedecf 100644
--- a/themes/finna2/templates/RecordTab/holdings-record-urls.phtml
+++ b/themes/finna2/templates/RecordTab/holdings-record-urls.phtml
@@ -14,7 +14,7 @@
   }
 ?>
 
-<div class="table record-holdings-url-table">
+<div class="record-holdings-url-table">
   <div class="headers">
     <span class="holdings-url-title"><?=$this->transEsc('Links')?></span>
   </div>
diff --git a/themes/finna2/templates/RecordTab/holdingsarchive.phtml b/themes/finna2/templates/RecordTab/holdingsarchive.phtml
index 150c2dd77f5..dc3bfded02d 100644
--- a/themes/finna2/templates/RecordTab/holdingsarchive.phtml
+++ b/themes/finna2/templates/RecordTab/holdingsarchive.phtml
@@ -3,7 +3,7 @@
 <?php if ($this->driver->tryMethod('archiveRequestAllowed')): ?>
   <?php $user = $this->auth()->getManager()->getUserObject(); ?>
   <!-- Display lists where it has been saved: -->
-  <div class="reservation-request-table table record-holdings-url-table">
+  <div class="reservation-request-table record-holdings-url-table">
     <div class="headers">
       <span class="holdings-url-title"><?=$this->transEsc('ReservationList::Reserve to Research Room')?></span>
     </div>
@@ -17,7 +17,7 @@
   </div>
 <?php endif;?>
 <br>
-<?= $this->reservationList($this->auth()->getUserObject())->renderReserveTemplate($driver); ?>  
+<?= $this->reservationList($this->auth()->getUserObject())->renderReserveTemplate($driver); ?>
 
 <?= $this->render('RecordTab/holdings-record-urls'); ?>
 
@@ -57,10 +57,10 @@
 
     <div class="external-data-heading external-data physical-items collapsible <?=$collapsed?>" role="table">
       <div role="row" class="tbl-row external-data-headers">
-        <div role="cell" class="tbl-cell tbl-left">
-          <?=$this->icon('collapse-open', ['class' => 'toggle-expand'])?>
-          <?=$this->icon('collapse-close', ['class' => 'toggle-collapse'])?>
-          <span role="columnheader"><?=$this->escapeHtml($format)?></span>
+        <div role="cell" class="tbl-cell tbl-left icon-link">
+          <?=$this->icon('collapse-open', 'toggle-expand icon-link__icon')?>
+          <?=$this->icon('collapse-close', 'toggle-collapse  icon-link__icon')?>
+          <span role="columnheader" class="icon-link__label"><?=$this->escapeHtml($format)?></span>
           <?php if (!empty($item['imageType'])): ?>
             <div class="format-info"><?=$this->transEsc('holdings_archive_tab_image_type')?>: <?=$this->escapeHtml($item['imageType'])?></div>
           <?php endif;?>
diff --git a/themes/finna2/templates/RecordTab/holdingsils.phtml b/themes/finna2/templates/RecordTab/holdingsils.phtml
index 9b6a9fae0d1..b95297a665e 100644
--- a/themes/finna2/templates/RecordTab/holdingsils.phtml
+++ b/themes/finna2/templates/RecordTab/holdingsils.phtml
@@ -183,7 +183,7 @@
   ?>
 <?php endif; ?>
 
-<div class="table record-holdings-table">
+<div class="record-holdings-table">
   <div class="headers">
     <?php $mergedData = $this->driver->tryMethod('getMergedRecordData'); ?>
     <?php $recordSourceId = $this->driver->getSourceIdentifier(); ?>
@@ -390,7 +390,7 @@
 
 <?php $history = $this->driver->getRealTimeHistory(); ?>
 <?php if (is_array($history) && !empty($history)): ?>
-<table class="table record-holdings-table">
+<table class="record-holdings-table">
   <tr>
     <th class="headers"><span class="holdings-title"><?=$this->transEsc('Most Recent Received Issues')?></span></th>
   </tr>
diff --git a/themes/finna2/templates/RecordTab/holdingsils/electronic.phtml b/themes/finna2/templates/RecordTab/holdingsils/electronic.phtml
index 6313f44e0c0..4736df9f2af 100644
--- a/themes/finna2/templates/RecordTab/holdingsils/electronic.phtml
+++ b/themes/finna2/templates/RecordTab/holdingsils/electronic.phtml
@@ -1,5 +1,5 @@
 <!-- START of: finna - RecordTab/holdingsils/electronic.phtml -->
-<div class="table record-holdings-table electronic-holdings">
+<div class="record-holdings-table electronic-holdings">
   <div class="headers">
     <span class="holdings-title"><?=$this->transEsc('Electronic')?></span>
   </div>