Attachment 171754 Details for Bug 10190 – Bug 10190: Update for bootstrap 5

[patch] Bug 10190: Update for bootstrap 5

Bug-10190-Update-for-bootstrap-5.patch (text/plain), 5.24 KB, created by Martin Renvoize (ashimema) on 2024-09-19 13:21:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-09-19 13:21:56 UTC

Size: 5.24 KB

patch

obsolete

>From 8358e9785177d0c7be4a4549a0a6f9c9ad4154af Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 16 Sep 2024 17:18:21 +0100
>Subject: [PATCH] Bug 10190: Update for bootstrap 5
>
>---
> .../CirculationTriggersFormAdd.vue            | 17 +++++++----------
> .../CirculationTriggersList.vue               | 19 +++++++++++++------
> .../Admin/CirculationTriggers/Main.vue        |  4 ++--
> 3 files changed, 22 insertions(+), 18 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue
>index 998d3dcd8dd..02d87716d59 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue
>@@ -1,7 +1,4 @@
> <template>
>-    <router-link :to="{ name: 'CirculationTriggersList' }" class="close_modal">
>-        <i class="fa fa-fw fa-close"></i>
>-    </router-link>
>     <div v-if="initialized" class="modal-content">
>         <form @submit="addCircRule($event)">
>             <div class="modal-header">
>@@ -11,6 +8,13 @@
>                 <h1 class="modal-title" v-else>
>                     {{ $__("Edit circulation trigger") }}
>                 </h1>
>+                <router-link
>+                    class="btn-close"
>+                    type="button"
>+                    :to="{
>+                        name: 'CirculationTriggersList',
>+                    }"
>+                ></router-link>
>             </div>
>             <div class="modal-body">
>                 <div class="page-section bg-info" v-if="circRules.length">
>@@ -750,13 +754,6 @@ export default {
> </script>
> 
> <style scoped>
>-.close_modal {
>-    position: absolute;
>-    top: 0.5rem;
>-    right: 0.5rem;
>-    font-size: 2rem;
>-}
>-
> form li {
>     display: flex;
>     align-items: center;
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue
>index ac339cfe939..cdc2c5a4f2a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue
>@@ -65,15 +65,17 @@
>             <ul class="nav nav-tabs" role="tablist">
>                 <li
>                     v-for="(number, i) in numberOfTabs"
>+                    class="nav-item"
>                     role="presentation"
>-                    v-bind:class="
>-                        tabSelected === `Notice ${number}` ? 'active' : ''
>-                    "
>                     :key="`noticeTab${i}`"
>                 >
>                     <a
>                         href="#"
>+                        class="nav-link"
>                         role="tab"
>+                        v-bind:class="
>+                            tabSelected === `Notice ${number}` ? 'active' : ''
>+                        "
>                         @click="changeTabContent"
>                         :data-content="`Notice ${number}`"
>                         >{{ $__("Trigger") + " " + number }}</a
>@@ -81,9 +83,14 @@
>                 </li>
>             </ul>
>         </div>
>-        <div class="tab_content">
>+        <div class="tab-content">
>             <template v-for="(number, i) in numberOfTabs">
>                 <div
>+                    class="tab-pane"
>+                    role="tabpanel"
>+                    v-bind:class="
>+                        tabSelected === `Notice ${number}` ? 'show active' : ''
>+                    "
>                     v-if="tabSelected === `Notice ${number}`"
>                     :key="`noticeTabContent${i}`"
>                 >
>@@ -98,7 +105,7 @@
>             </template>
>         </div>
>     </div>
>-    <div v-if="showModal" class="modal_centered">
>+    <div v-if="showModal" class="modal" role="dialog">
>         <div
>             class="modal-dialog modal-dialog-centered modal-lg"
>             role="document"
>@@ -244,7 +251,7 @@ export default {
>     margin-bottom: 0;
> }
> 
>-.modal_centered {
>+.modal {
>     position: fixed;
>     z-index: 9998;
>     display: table;
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue
>index 2010cedbc62..00cdcde95af 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue
>@@ -6,14 +6,14 @@
>         </div>
>         <div class="main container-fluid">
>             <div class="row">
>-                <div class="col-sm-10 col-sm-push-2">
>+                <div class="col-md-10 order-md-2 order-sm-1">
>                     <main>
>                         <Dialog />
>                         <router-view />
>                     </main>
>                 </div>
> 
>-                <div class="col-sm-2 col-sm-pull-10"></div>
>+                <div class="col-md-2 order-sm-2 order-md-1"></div>
>             </div>
>         </div>
>     </div>
>-- 
>2.46.0

Actions: View | Diff | Splinter Review

Attachments on bug 10190: 170357 | 170358 | 170359 | 170360 | 170361 | 170362 | 170363 | 170364 | 170365 | 170366 | 170367 | 170368 | 170369 | 170370 | 170371 | 170372 | 170373 | 170374 | 170375 | 170376 | 170380 | 170449 | 171727 | 171728 | 171729 | 171730 | 171731 | 171732 | 171733 | 171734 | 171735 | 171736 | 171737 | 171738 | 171739 | 171740 | 171741 | 171742 | 171743 | 171744 | 171745 | 171746 | 171747 | 171748 | 171749 | 171750 | 171751 | 171752 | 171753 | 171754 | 171755 | 172588 | 172589 | 172590 | 172591 | 172592 | 172593 | 172594 | 172595 | 172596 | 172597 | 172598 | 172599 | 172600 | 172601 | 172602 | 172603 | 172604 | 172605 | 172606 | 172607 | 172608 | 172609 | 172612 | 172614 | 172617 | 172619 | 172621 | 172622 | 172623 | 172624 | 172625 | 172626 | 172630 | 172631 | 172632 | 172633 | 172634 | 172635 | 172636 | 172637 | 172638 | 172639 | 172640 | 172641 | 172642 | 172643 | 172644 | 172645 | 172646 | 172647 | 172648 | 172649 | 172650 | 172651 | 172652 | 172653 | 172654 | 172655 | 172656 | 172657 | 172658 | 172659 | 172660 | 172661 | 172662 | 172663