From 18374cab19e5db370e5b332f09e4512b8af058df Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 6 Jul 2023 09:19:11 +0200 Subject: [PATCH] Bug 34214: Make 'icon' configurable for Toolbar options Bug 33417 added a generic 'Toolbar' Vue component but always add a 'plus' icon. We should make it configurable. Test plan: Regenerate the Vue app: `yarn js:build` Go to the ERM module and confirm that the toolbar has the '+' icon. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Alexander Blanchard Signed-off-by: Pedro Amorim Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f317247776735154722cc41d3afec15bfa7ff9e2) Signed-off-by: Martin Renvoize (cherry picked from commit c77bea60725cc03090915a7c9d6383b082239540) Signed-off-by: Matt Blenkinsop --- .../intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue | 1 + .../prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue | 1 + .../prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue | 2 ++ .../intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue | 1 + koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue | 2 +- 5 files changed, 6 insertions(+), 1 deletion(-) 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 4c0ef541a8..20b9b9a82d 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 @@ -153,6 +153,7 @@ export default { toolbar_options: [ { to: "AgreementsFormAdd", + icon: "plus", button_title: this.$__("New agreement"), }, ], diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue index b45f3a64ee..36d9f8dc94 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue @@ -101,6 +101,7 @@ export default { toolbar_options: [ { to: "EHoldingsLocalPackagesFormAdd", + icon: "plus", button_title: this.$__("New package"), }, ], diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue index ffb724746f..75211d3569 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue @@ -93,10 +93,12 @@ export default { toolbar_options: [ { to: "EHoldingsLocalTitlesFormAdd", + icon: "plus", button_title: this.$__("New title"), }, { to: "EHoldingsLocalTitlesFormImport", + icon: "plus", button_title: this.$__("Import from list"), }, ], diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue index cad4be984e..78a2f202bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue @@ -53,6 +53,7 @@ export default { toolbar_options: [ { to: "LicensesFormAdd", + icon: "plus", button_title: this.$__("New license"), }, ], diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue index ea6a79e904..47f740607c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue @@ -5,7 +5,7 @@ :key="index" :to="{ name: option.to }" class="btn btn-default" - > + > {{ option.button_title }} -- 2.39.5