From 111fdbc152cb1b8ad5f28039a0482f577f41e1df Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Sun, 26 Mar 2023 10:53:25 +0000
Subject: [PATCH] Bug 33066: Fix table style
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Move table rendering outside <ol> to prevent unintended style in _forms.scss from being applied and causing table to not be full width
Remove unecessary table styling

JD: following commit has been squashed. Patch from Pedro is fixing the
FIXME
"""
Bug 33066: Fix style - FIXME

This is not working, see /cgi-bin/koha/erm/eholdings/local/packages/1
The table is not taking width: 100%
I fixed it previously with the display: table in the style block, but
here it's not applied.

There is also the "green tick" (fa-check-square-o) that is not on the
same line https://snipboard.io/jma923.jpg
"""

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Signed-off-by: Agustín Moyano <agustinmoyano@theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8a63e6eeccac73c22223ede70039251ae705bedc)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/js/vue/components/ERM/AgreementsList.vue    |  3 ---
 .../ERM/EHoldingsEBSCOPackageTitlesList.vue          |  3 ---
 .../components/ERM/EHoldingsEBSCOPackagesShow.vue    | 12 +++++-------
 .../ERM/EHoldingsLocalPackageTitlesList.vue          |  6 ------
 .../components/ERM/EHoldingsLocalPackagesShow.vue    | 12 +++++-------
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
index 12b0a5ea26..90e4f1b6c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
@@ -326,9 +326,6 @@ export default {
 </script>
 
 <style scoped>
-#agreement_list {
-    display: table;
-}
 .filters > label[for="by_mine_filter"],
 .filters > input[type="checkbox"],
 .filters > input[type="button"] {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
index a9bc8c68d5..27441804e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
@@ -199,9 +199,6 @@ export default {
 </script>
 
 <style scoped>
-#title_list {
-    display: table;
-}
 #filters {
     margin: 0;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
index a90b0d1523..4b44034672 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
@@ -90,15 +90,13 @@
                         <label
                             >Titles ({{ erm_package.resources_count }})</label
                         >
-                        <div v-if="erm_package.resources_count">
-                            <EHoldingsPackageTitlesList
-                                :package_id="erm_package.package_id.toString()"
-                            />
-                        </div>
                     </li>
-
-                    <li></li>
                 </ol>
+                <div v-if="erm_package.resources_count">
+                    <EHoldingsPackageTitlesList
+                        :package_id="erm_package.package_id.toString()"
+                    />
+                </div>
             </fieldset>
             <fieldset class="action">
                 <router-link
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
index 7374c30675..b94b44ca40 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
@@ -93,9 +93,3 @@ export default {
     name: "EHoldingsLocalPackageTitlesList",
 }
 </script>
-
-<style scoped>
-#title_list {
-    display: table;
-}
-</style>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
index 918205b6f1..5cf5455f56 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
@@ -82,15 +82,13 @@
                                 erm_package.resources_count
                             )
                         }}</label>
-                        <div v-if="erm_package.resources_count">
-                            <EHoldingsPackageTitlesList
-                                :package_id="erm_package.package_id.toString()"
-                            />
-                        </div>
                     </li>
-
-                    <li></li>
                 </ol>
+                <div v-if="erm_package.resources_count">
+                    <EHoldingsPackageTitlesList
+                        :package_id="erm_package.package_id.toString()"
+                    />
+                </div>
             </fieldset>
             <fieldset class="action">
                 <router-link
-- 
2.39.5