From b59972aad5f7f944338bada3063808d42f50c020 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 21 Oct 2022 14:25:39 +0200
Subject: [PATCH] Bug 32030: Rebase UI fix - Fix toolbar

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../vue/components/ERM/AgreementsToolbar.vue  | 12 ++++++----
 .../ERM/EHoldingsLocalPackagesToolbar.vue     | 12 ++++++----
 .../ERM/EHoldingsLocalTitlesToolbar.vue       | 24 ++++++++++++-------
 .../js/vue/components/ERM/LicensesToolbar.vue |  9 ++++---
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue
index cb9abd243a..9332611d3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue
@@ -1,8 +1,12 @@
 <template>
-    <router-link to="/cgi-bin/koha/erm/agreements/add" class="btn btn-default"
-        ><font-awesome-icon icon="plus" />
-        {{ $t("New agreement") }}</router-link
-    >
+    <div id="toolbar" class="btn-toolbar">
+        <router-link
+            to="/cgi-bin/koha/erm/agreements/add"
+            class="btn btn-default"
+            ><font-awesome-icon icon="plus" />
+            {{ $t("New agreement") }}</router-link
+        >
+    </div>
 </template>
 
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue
index 7f06efa80d..f134af75a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue
@@ -1,8 +1,12 @@
 <template>
-    <router-link to="/cgi-bin/koha/erm/eholdings/local/packages/add" class="btn btn-default"
-        ><font-awesome-icon icon="plus" />
-        {{ $t("New package") }}</router-link
-    >
+    <div id="toolbar" class="btn-toolbar">
+        <router-link
+            to="/cgi-bin/koha/erm/eholdings/local/packages/add"
+            class="btn btn-default"
+            ><font-awesome-icon icon="plus" />
+            {{ $t("New package") }}</router-link
+        >
+    </div>
 </template>
 
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue
index b1dec1e7ff..dcb9483074 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue
@@ -1,13 +1,19 @@
 <template>
-    <router-link to="/cgi-bin/koha/erm/eholdings/local/titles/add" class="btn btn-default"
-        ><font-awesome-icon icon="plus" />
-        {{ $t("New title") }}</router-link
-    >
-    &nbsp;
-    <router-link to="/cgi-bin/koha/erm/eholdings/local/titles/import" class="btn btn-default"
-        ><font-awesome-icon icon="plus" />
-        {{ $t("Import from list") }}</router-link
->
+    <div id="toolbar" class="btn-toolbar">
+        <router-link
+            to="/cgi-bin/koha/erm/eholdings/local/titles/add"
+            class="btn btn-default"
+            ><font-awesome-icon icon="plus" />
+            {{ $t("New title") }}</router-link
+        >
+        &nbsp;
+        <router-link
+            to="/cgi-bin/koha/erm/eholdings/local/titles/import"
+            class="btn btn-default"
+            ><font-awesome-icon icon="plus" />
+            {{ $t("Import from list") }}</router-link
+        >
+    </div>
 </template>
 
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue
index 48d79a679c..78785252cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue
@@ -1,7 +1,10 @@
 <template>
-    <router-link to="/cgi-bin/koha/erm/licenses/add" class="btn btn-default"
-        ><font-awesome-icon icon="plus" /> {{ $t("New license") }}</router-link
-    >
+    <div id="toolbar" class="btn-toolbar">
+        <router-link to="/cgi-bin/koha/erm/licenses/add" class="btn btn-default"
+            ><font-awesome-icon icon="plus" />
+            {{ $t("New license") }}</router-link
+        >
+    </div>
 </template>
 
 <script>
-- 
2.39.2