Bug 35402: Update the OPAC and staff interface to Bootstrap 5

This patch updates the OPAC and staff interface to use Bootstrap 5.
Bootstrap CSS assets are now pulled from node_modules and compiled into
staff-global.css and opac.css at build time. This update lays the
foundations of some other chnages, especially the addition of a dark
mode in the future.

Hundreds of templates have been updated, mostly with updates to the grid
markup. Most of the responsive behavior is still the same with the
exception of improved flexibility of headers and footers in both the
OPAC and staff interface.

The other most common change is to add a new "namespace" to data
attributes used by Bootstrap, e.g. "data-bs-target" or "data-bs-toggle".
Modal markup has also been updated everywhere. Other common changes:
dropdown button markup, alert markup (we now use Bootstrap's "alert
alert-warning" and "alert alert-info" instead of our old "dialog alert"
and "dialog info").

Bootstrap 5 now uses CSS variables which we can override in our own
'_variables.scss' (in both the OPAC and staff) to accomplish a lot of
the style overrides which we previously put in staff-global.scss.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

.gitignore

@@ -16,11 +16,15 @@ koha-tmpl/opac-tmpl/bootstrap/css/sco-rtl.css
 
 koha-tmpl/intranet-tmpl/prog/css/maps/
 koha-tmpl/intranet-tmpl/prog/css/calendar.css
+koha-tmpl/intranet-tmpl/prog/css/calendar-rtl.css
 koha-tmpl/intranet-tmpl/prog/css/holds.css
+koha-tmpl/intranet-tmpl/prog/css/holds-rtl.css
 koha-tmpl/intranet-tmpl/prog/css/installer.css
+koha-tmpl/intranet-tmpl/prog/css/installer-rtl.css
 koha-tmpl/intranet-tmpl/prog/css/mainpage.css
+koha-tmpl/intranet-tmpl/prog/css/mainpage-rtl.css
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css
-
+koha-tmpl/intranet-tmpl/prog/css/staff-global-rtl.css
 koha-tmpl/intranet-tmpl/prog/js/vue/dist/
 
 how-to.pl

admin/library_groups.pl

@@ -74,7 +74,7 @@ if ( $op eq 'cud-add' ) {
             )->store();
         };
         if ($@) {
-            push @messages, { type => 'alert', code => 'error_on_insert' };
+            push @messages, { type => 'warning', code => 'error_on_insert' };
         }
         else {
             $template->param( added => $group );

gulpfile.js

@@ -39,27 +39,33 @@ var sassOptions = {
 // CSS processing for development
 function css(css_base) {
     css_base = css_base || CSS_BASE
-    var stream = src(css_base + "/src/**/*.scss")
+    var stream = src(css_base + "/src/**/*.scss", { sourcemaps: true } );
-        .pipe(sourcemaps.init())
-        .pipe(sass(sassOptions).on('error', sass.logError))
-        .pipe(autoprefixer())
-        .pipe(dest(css_base));
 
     if (args.view == "opac") {
         stream = stream
-            .pipe(rtlcss())
+        .pipe(sass(sassOptions).on('error', sass.logError))
-            .pipe(rename({
+        .pipe(autoprefixer())
-                suffix: '-rtl'
+        .pipe(dest(css_base))
-            })) // Append "-rtl" to the filename.
+        .pipe(rtlcss())
-            .pipe(dest(css_base));
+        .pipe(rename({
+            suffix: '-rtl'
+        })) // Append "-rtl" to the filename.
+        .pipe(dest(css_base, { sourcemaps: "./maps" } ));
+    } else {
+        stream = stream
+        .pipe(sass(sassOptions).on('error', sass.logError))
+        .pipe(autoprefixer())
+        .pipe(dest(css_base))
+        .pipe(rtlcss())
+        .pipe(rename({
+            suffix: '-rtl'
+        })) // Append "-rtl" to the filename.
+        .pipe(dest(css_base, { sourcemaps: "/maps" } ));
     }
 
-    stream = stream.pipe(sourcemaps.write('./maps'))
-        .pipe(dest(css_base));
-
     return stream;
-
 }
+
 // CSS processing for production
 function build(css_base) {
     css_base = css_base || CSS_BASE;
@@ -67,16 +73,12 @@ function build(css_base) {
     var stream = src(css_base + "/src/**/*.scss")
         .pipe(sass(sassOptions).on('error', sass.logError))
         .pipe(autoprefixer())
-        .pipe(dest(css_base));
+        .pipe(dest(css_base))
-
+        .pipe(rtlcss())
-    if( args.view == "opac" ){
-        stream = stream.pipe(rtlcss())
         .pipe(rename({
             suffix: '-rtl'
         })) // Append "-rtl" to the filename.
         .pipe(dest(css_base));
-    }
-
     return stream;
 }
 

koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.columnFilter.js

@@ -444,7 +444,7 @@
 
 		function fnCreateDropdown(aData) {
 			var index = i;
-			var r = '<div class="dropdown select_filter form-control"><a class="dropdown-toggle" data-toggle="dropdown" href="#">' + label + '<b class="caret"></b></a><ul class="dropdown-menu" role="menu"><li data-value=""><a>Show All</a></li>', j, iLen = aData.length;
+			var r = '<div class="dropdown select_filter form-control"><a class="dropdown-toggle" data-bs-toggle="dropdown" href="#">' + label + '<b class="caret"></b></a><ul class="dropdown-menu" role="menu"><li data-value=""><a>Show All</a></li>', j, iLen = aData.length;
 
 			for (j = 0; j < iLen; j++) {
 				r += '<li data-value="' + aData[j] + '"><a>' + aData[j] + '</a></li>';

koha-tmpl/intranet-tmpl/prog/css/addbiblio.css

@@ -91,7 +91,6 @@ a.expandfield {
 }
 
 .toptabs {
-    margin-left: -5px;
     margin-top: 0;
 }
 

koha-tmpl/intranet-tmpl/prog/css/itemsearchform.css

@@ -58,7 +58,6 @@ input[type="text"] {
     border-radius: 4px;
     color: #495057;
     display: inline-block;
-    font-size: 1.5rem;
     height: calc( 1.5em + .75rem + 2px );
     line-height: 1.5;
     padding: .375rem .75rem;

koha-tmpl/intranet-tmpl/prog/css/preferences.css

@@ -192,3 +192,8 @@ span.overridden {
 #admin_preferences .ms-drop label span {
     margin-left: 5px;
 }
+
+.category-heading {
+    display: flex;
+    justify-content: space-between;
+}

koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss

@@ -21,10 +21,14 @@ fieldset {
     &.rows {
         clear: left;
         float: left;
-        margin: .9em 0 0;
+        margin: 0;
         padding: 1rem;
         width: 100%;
 
+        & + fieldset.rows {
+            margin-top: .9em;
+        }
+
         fieldset {
             background-color: transparent;
             margin: 1em;
@@ -71,7 +75,6 @@ fieldset {
 
         div {
             &.hint {
-                font-size: 1.25rem;
                 margin: .5rem 0;
                 margin-left: 11rem;
             }
@@ -161,7 +164,7 @@ fieldset {
                 }
 
                 legend {
-                    font-size: 1.55rem;
+                    font-size: 1.2rem;
                     margin: 0 0 0 1em;
                 }
 
@@ -235,15 +238,10 @@ fieldset {
                 text-align: right;
                 width: 10rem;
             }
-
-            &.hint {
-                font-size: 1.25rem;
-            }
         }
 
         table {
             clear: both;
-            font-size: 1.25rem;
             margin: 1em 0 1em 1em;
 
             &.dataTable {

koha-tmpl/intranet-tmpl/prog/css/src/_header.scss

@@ -1,67 +1,24 @@
-a.navbar-toggle {
-    color: #fff;
-}
-
-#header {
-    .navbar-nav > li > a {
-        overflow: hidden;
-        color: #FFFFFF;
-        text-shadow: unset;
-        font-size: 110%;
-
-        &:hover,
-        &:active,
-        &:focus {
-            background-color: transparent;
-            text-decoration: underline 2px;
-        }
-    }
-
-    .dropdown-menu {
-        background-color: rgb(53, 44, 46);
-        font-size: 13px;
-
-        li a {
-            color: #FFFFFF;
-            &:hover,
-            &:focus {
-                background: $background-color-primary none;
-                text-decoration: none;
-            }
-        }
-    }
-
-}
-
 #logo {
-    display: flex;
     align-items: center;
-    padding: .2em .5em;
+    display: flex;
 
     img {
-        height: 80%;
+        height: 20px;
     }
 }
 
-#toplevelmenu {
-    background-color: transparent;
-    box-shadow: none;
-    position: relative;
-    left: 0;
-    top: 0;
-}
-
 #header_search {
     background-color: $background-color-primary;
     border-radius: 0;
     border: 1px solid $background-color-primary;
     display: flex;
-    padding: 0 .8em;
+    flex-direction: column;
+    padding: 0;
 
     ul {
         padding: 0;
         margin: 0;
-        border-radius: 0 16px 16px 0;
+        // border-radius: 0 16px 16px 0;
         display: flex;
         align-items: center;
         color: white;
@@ -97,7 +54,7 @@ a.navbar-toggle {
     }
 
     .form-title {
-        padding: 0 16px 0 0;
+        padding: 0 16px 0 .5rem;
         background-color: $background-color-primary;
         border-radius: 0 16px 16px 0;
         display: flex;
@@ -214,9 +171,9 @@ a.navbar-toggle {
         color: white;
         border: 0;
         text-shadow: unset;
-        border-radius: 0 16px 16px 0;
+        border-radius: 0;
         margin-left: -16px;
-        margin-right: 1em;
+        margin-right: 0;
         padding-left: calc( 16px + .7em );
         padding-right: .9em;
 
@@ -244,8 +201,12 @@ a.navbar-toggle {
         }
     }
 
+    .tab-title {
+        display: inline;
+    }
+
     &.toptabs {
-        margin-top: 0;
+        margin: 0;
 
         .tab-pane {
             padding: 0;
@@ -253,8 +214,11 @@ a.navbar-toggle {
     }
 
     .nav-tabs {
-        > li {
+        border-bottom: 0;
+        justify-content: center;
+        padding: .5rem 0;
 
+        > li {
             > a {
                 background-color: $background-color-primary;
                 border: 2px solid $background-color-primary;
@@ -265,27 +229,27 @@ a.navbar-toggle {
                 margin: 0 .25em;
                 padding: 0 .25em;
 
+                &.active {
+                    border-bottom: 2px solid #FFF;
+                    cursor: default;
+                    padding: 0 .25em;
+
+                    &:focus,
+                    &:hover {
+                        border-bottom-color: #FFF;
+                    }
+                }
+
                 &:hover, &:focus, &:active {
                     background-color: $background-color-primary;
                     border: 2px solid $background-color-primary;
                     border-bottom-color: $background-color-secondary;
-                    border-bottom: 0;
                     padding: 0 .25em;
                     text-decoration: none;
                 }
             }
 
-            &.active {
-                a {
-                    cursor: default;
-                    padding: 0 .25em;
-                    border-bottom: 2px solid #FFF;
 
-                    &:hover,
-                    &:focus {
-                    }
-                }
-            }
         }
     }
 }
@@ -296,22 +260,59 @@ a.navbar-toggle {
     }
 }
 
+#sub-header {
+    display: flex;
+    justify-content: space-between;
+}
+
+#shortcut {
+    display: flex;
+    margin: 0;
+    padding: 0.65em 10px 0.8em 10px;
+
+    .title {
+        font-style: italic;
+        font-weight: normal;
+    }
+}
+
+#header {
+    + #breadcrumbs {
+        margin-top: 1em;
+    }
+
+    > .container-fluid {
+        padding: 0;
+    }
+}
+
+.breadcrumb-item {
+    &.active {
+        a {
+            color: dimgray;
+        }
+    }
+}
+
 #lastborrower-window {
     display: none;
-    margin-right: 1rem;
 
     > * {
         padding: 0 .4em;
     }
 }
 
+#helper {
+    display: inline-block;
+    padding: .2rem .75rem;
+}
+
 #lastborrowerlink {
-    font-size: 13px;
+    padding: 0 .7rem;
-    padding: 0 .7em;
 
     & + .dropdown-toggle {
         margin-left: 0;
-        padding: .01em .7em;
+        padding: 0 .7rem;
 
         &:hover {
             background-color: #FFF;
@@ -319,7 +320,136 @@ a.navbar-toggle {
     }
 }
 
-@media (max-width: 768px) {
+.nav-link-text {
+    display: none;
+
+    &.langlabel {
+        display: none;
+    }
+}
+
+#catalog-search-link {
+    border: 0;
+
+    & > a {
+        padding-right: 7px;
+    }
+}
+
+#catalog-search-dropdown {
+    display: none;
+
+    & > a {
+        border-left: 1px solid darken( $green-text-color, 5% );
+        padding-left: 7px;
+
+        &:hover,
+        &.catalog-search-dropdown-hover {
+            background-color: darken( $background-color-primary, 5% );
+            border-left: 1px solid lighten( $green-text-color, 15% );
+        }
+    }
+}
+
+.langmenu-hidden {
+    display: list-item;
+}
+
+#user-menu {
+    flex-wrap: nowrap;
+}
+
+@media only screen and ( min-width: 576px ) {
+    #header_search {
+        flex-direction: row;
+        padding: 0 .8rem;
+        padding-left: 0;
+
+        .form-title {
+            padding: 0 16px 0 .5rem;
+        }
+
+        .nav-tabs {
+            justify-content: flex-start;
+            padding: 0;
+        }
+
+        .tab-title {
+            display: none;
+        }
+
+        button[type="submit"] {
+            border-radius: 0 16px 16px 0;
+            margin-right: 1em;
+        }
+
+    }
+
+}
+
+@media ( min-width: 767px ) {
+    .nav-link-icon {
+        display: none;
+    }
+
+    .nav-link-text {
+        display: inline;
+    }
+
+    #catalog-search-dropdown {
+        display: list-item;
+    }
+
+    #catalog-search-link {
+        border-right: 1px solid $background-color-primary;
+    }
+}
+
+@media ( max-width: 767px ) {
+    .header-menu-link {
+        display: inline-block;
+    }
+
+    #cartmenulink {
+        background: transparent none;
+        padding-left: 1.5em;
+    }
+
+    #user-menu {
+        .open {
+            .dropdown-menu {
+                background-color: #352C35;
+                position: absolute;
+            }
+        }
+
+        li {
+            float: left;
+
+            li {
+                float: none;
+            }
+        }
+    }
+}
+
+@media ( min-width: 1200px ) {
+    #header_search {
+        .tab-title {
+            display: inline;
+        }
+    }
+}
+
+@media ( min-width: 1250px ) {
+    .nav-link-text {
+        &.langlabel {
+            display: inline;
+        }
+    }
+}
+
+@media ( max-width: 1000px ) {
     #header_search {
         padding-left: 0;
 
@@ -333,7 +463,7 @@ a.navbar-toggle {
     }
 }
 
-@media (max-width: 992px) {
+@media ( max-width: 1200px ) {
     #header_search {
         .residentsearch {
             flex-grow: 1;
@@ -343,10 +473,6 @@ a.navbar-toggle {
             flex-basis: 75%;
         }
 
-        .tab-title {
-            display: none;
-        }
-
         > ul {
             flex-grow: 0;
         }

koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss

@@ -1,79 +1,17 @@
 $font-monospace: "Courier New", Courier, monospace;
 
-$language-footer-min-height: 20px;
+$nav-menu-bullet: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='5' height='5' viewBox='0 0 25 25'%3E%3Cpath fill='%23999' d='M9.66.95h4.56l9.21 11.85-9.21 10.53H9.66l5.08-10.53z'/%3E%3C/svg%3E" );
-$table-border-color: #BCBCBC;
-$table-header-background: #FFF;
-$table-odd-row: #f3f4f4;
-
-$nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='5' height='5' viewBox='0 0 25 25'%3E%3Cpath fill='%23999' d='M9.66.95h4.56l9.21 11.85-9.21 10.53H9.66l5.08-10.53z'/%3E%3C/svg%3E");
 
 @mixin default-button {
-    background: #FFF none;
-    border: 1px solid #555;
-    border-radius: 4px;
-    cursor: pointer;
-    display: inline-block;
-    font-weight: normal;
-    line-height: 1.42857143;
-    margin-bottom: 0;
-    text-align: center;
-    touch-action: manipulation;
-    user-select: none;
-    vertical-align: middle;
     white-space: nowrap;
-
-    &:hover {
-        background-color: #e0e0e0;
-
-        &:active {
-            box-shadow: none;
-        }
-    }
-
-    &:active:hover {
-        background-color: #d4d4d4;
-        border-color: #8c8c8c;
-    }
-}
-
-@mixin primary-button {
-    background: $btn-primary none;
-    border: 1px solid $btn-primary;
-    border-radius: 4px;
-    cursor: pointer;
-    display: inline-block;
-    font-weight: normal;
-    line-height: 1.42857143;
-    margin-bottom: 0;
-    text-align: center;
-    touch-action: manipulation;
-    user-select: none;
-    vertical-align: middle;
-    white-space: nowrap;
-
-    &:hover,
-    &:active,
-    &:focus {
-        background: $btn-primary-hover none;
-        border: 1px solid $btn-primary;
-    }
-
-    &:active,
-    &:focus {
-        box-shadow: inset 0 0 0 1px darken( desaturate( $btn-primary, 15 ), 5 );
-    }
-}
-
-@mixin disabled-button {
-    background: #EEE none;
-    border: 1px solid #C0C0C0;
 }
 
 @mixin card {
     margin-bottom: 1rem;
     padding: 1rem;
-    &:not(.bg-danger):not(.bg-warning):not(.bg-info):not(.bg-success):not(.bg-primary):not(.action) {
+
-        background-color: white;
+    &:not( .bg-danger, .bg-warning, .bg-info, .bg-success, .bg-primary, .action ) {
+        background-color: #FFF;
     }
 }
 

koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss

@@ -132,11 +132,6 @@ table {
                         }
                     }
 
-                    &.sorting::before,
-                    &.sorting::after {
-                        content: unset;
-                    }
-
                     &.sorting_asc {
                         &::after,
                         &::before {
@@ -420,13 +415,23 @@ tbody {
                 }
             }
         }
+
+        &.onissue {
+            &:nth-child( odd ):not( .dtrg-group, .active, .ok ) {
+                td {
+                    &:not( .bg-danger, .bg-warning, .bg-info, .bg-success, .bg-primary ) {
+                        background-color: #F9FAE0;
+                    }
+                }
+            }
+        }
     }
 }
 
 .dataTables_wrapper {
     .dataTables_processing {
         background-color: #F4F8F9;
-        border: 2px solid #538200;
+        border: 2px solid $background-color-primary;
         border-radius: 3px;
         box-shadow: 2px 2px 3px 1px rgba( 0, 0, 0, .2 );
         color: #333;
@@ -437,6 +442,14 @@ tbody {
         text-align: center;
         top: 50%;
         width: auto;
+
+        & > div {
+            &:last-child {
+                & > div {
+                    background: $background-color-secondary;
+                }
+            }
+        }
     }
 
     .dataTables_info {
@@ -574,7 +587,6 @@ tbody {
     font-size: 90%;
 
     &.top {
-        // border-top: 1px solid $table-border-color;
         padding-top: 1em;
     }
 
@@ -805,7 +817,7 @@ div {
                 }
 
                 &.buttons-html5:not( .disabled )::before {
-                    color: #222BAC;
+                    color: $background-color-primary;
                     display: inline-block;
                     font-family: "Font Awesome 6 Free";
                     margin-right: .5em;
@@ -825,7 +837,7 @@ div {
                 }
 
                 &.buttons-print:not( .disabled )::before {
-                    color: #222BAC;
+                    color: $background-color-primary;
                     content: "\f02f";
                     display: inline-block;
                     font-family: "Font Awesome 6 Free";

koha-tmpl/intranet-tmpl/prog/css/src/installer.scss

@@ -1,3 +1,31 @@
+// scss-docs-start import-stack
+// Configuration
+@import "../../../../../node_modules/bootstrap5/scss/functions";
+
+// Include any default variable overrides here
+@import "variables";
+
+// Include remainder of required Bootstrap stylesheets
+@import "../../../../../node_modules/bootstrap5/scss/variables";
+@import "../../../../../node_modules/bootstrap5/scss/mixins";
+
+$enable-dark-mode: false;
+
+@import "../../../../../node_modules/bootstrap5/scss/maps";
+@import "../../../../../node_modules/bootstrap5/scss/utilities";
+@import "../../../../../node_modules/bootstrap5/scss/root";
+@import "../../../../../node_modules/bootstrap5/scss/reboot";
+@import "../../../../../node_modules/bootstrap5/scss/type";
+@import "../../../../../node_modules/bootstrap5/scss/containers";
+@import "../../../../../node_modules/bootstrap5/scss/grid";
+@import "../../../../../node_modules/bootstrap5/scss/forms";
+@import "../../../../../node_modules/bootstrap5/scss/buttons";
+@import "../../../../../node_modules/bootstrap5/scss/transitions";
+@import "../../../../../node_modules/bootstrap5/scss/breadcrumb";
+@import "../../../../../node_modules/bootstrap5/scss/badge";
+@import "../../../../../node_modules/bootstrap5/scss/alert";
+@import "../../../../../node_modules/bootstrap5/scss/helpers";
+@import "../../../../../node_modules/bootstrap5/scss/utilities/api";
 @import "flatpickr";
 
 body {
@@ -12,7 +40,7 @@ h1 {
 }
 
 h2 {
-    background-color: #eee;
+    background-color: #EEE;
     border-radius: 4px;
     font-size: 146.5%;
     font-weight: bold;
@@ -46,7 +74,7 @@ ol {
 }
 
 #logo {
-    background: url(../img/koha-logo.gif) no-repeat top center;
+    background: url("../img/koha-logo.gif") no-repeat top center;
     margin-bottom: .5em;
     margin-top: 0;
 
@@ -58,6 +86,11 @@ ol {
     }
 }
 
+.alert {
+    p {
+        margin-bottom: 0;
+    }
+}
 
 .bg-danger {
     padding: .2em .4em;
@@ -87,7 +120,7 @@ th {
 }
 
 .update_error {
-    color: red;
+    color: #FF0000;
     font-weight: bold;
 }
 
@@ -166,7 +199,7 @@ fieldset {
 
         .hint {
             color: #666;
-            font-size: 96%;
+            font-size: .95rem;
             margin-left: 10.5em;
             margin-right: 4em;
             margin-top: .5em;
@@ -174,15 +207,14 @@ fieldset {
     }
 }
 
-
 label.required,
 span.required {
-    color : #C00;
+    color: #C00;
 }
 
 span.required {
-    font-style : italic;
+    font-style: italic;
-    margin-left : .5em;
+    margin-left: .5em;
 }
 
 .breadcrumbs {
@@ -198,8 +230,8 @@ span.required {
     background-repeat: no-repeat;
     content: "";
     display: inline-block;
-    width: 16px;
     height: 16px;
+    width: 16px;
 }
 
 span.breadcrumbs {
@@ -219,8 +251,8 @@ span.breadcrumbs {
 #steps {
     border: 1px solid #EEE;
     border-radius: 5px;
-    padding: 1em;
     margin: 1em 0;
+    padding: 1em;
 
     ol {
         font-size: 1.2rem;
@@ -229,7 +261,6 @@ span.breadcrumbs {
     }
 }
 
-
 .open {
     color: #888;
 }
@@ -240,7 +271,7 @@ span.breadcrumbs {
 }
 
 .complete {
-    color: green;
+    color: #008000;
 }
 
 .hint {

koha-tmpl/intranet-tmpl/prog/css/src/mainpage.scss

@@ -50,6 +50,10 @@ ul {
                         img {
                             filter: invert( 100% );
                         }
+
+                        .fa-stack-1x {
+                            color: #BCBCBC;
+                        }
                     }
 
                     .fa-fw {

koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc

@@ -20,7 +20,7 @@
         [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %]
       </ul>
     [% ELSE %]
-        <div class="dialog alert">
+        <div class="alert alert-warning">
           <p>You can't create any orders unless you first <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget and a fund</a>.</p>
         </div>
     [% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc

@@ -3,18 +3,16 @@
 <div id="toolbar" class="btn-toolbar">
     [% IF ( booksellerid ) %]
         <div class="btn-group">
-        <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New
+        <a class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fa fa-plus"></i> New</a>
-        <span class="caret"></span>
-        </a>
         <ul class="dropdown-menu">
             [% IF CAN_user_acquisition_order_manage && active %]
-                <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;op=add_form">Basket</a></li>
+                <li><a class="dropdown-item" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&amp;op=add_form">Basket</a></li>
             [% END %]
             [% IF CAN_user_acquisition_contracts_manage && active %]
-                <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
+                <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
             [% END %]
             [% IF ( CAN_user_acquisition_vendors_manage ) %]
-                <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
+                <li><a class="dropdown-item" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
             [% END %]
         </ul>
         </div>

koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc

@@ -181,7 +181,7 @@
         </fieldset>
         [% END %]
 
-        <nav class="navbar navbar-default navbar-fixed-bottom">
+        <nav class="navbar navbar-default fixed-bottom">
             <div class="container-fluid">
                 <fieldset class="action">
                     <input type="submit" class="btn btn-primary" id="search" value="Search" />

koha-tmpl/intranet-tmpl/prog/en/includes/auth-two-factor.inc

@@ -1,6 +1,6 @@
 [% BLOCK registration_form %]
     <div id="registration-form" style="display: none;">
-        <div class="dialog message">
+        <div class="alert alert-info">
             <p>We recommend cloud-based mobile authenticator apps such as Authy, Duo Mobile, and LastPass. They can restore access if you lose your hardware device.</p>
             <p>Can't scan the code?</p>
             <p>To add the entry manually, provide the following details to the application on your phone.</p>
@@ -25,7 +25,7 @@
             </ol>
         </fieldset>
         <fieldset class="action">
-            <input id="register-2FA" type="submit" value="Register with two-factor app" />
+            <input id="register-2FA" class="btn btn-primary" type="submit" value="Register with two-factor app" />
             <a class="cancel" href="/cgi-bin/koha/members/two_factor_auth.pl">Cancel</a>
         </fieldset>
     </div>

koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc

@@ -73,8 +73,8 @@
         [% IF summary.equalterm.size %]
             [% FOREACH term IN summary.equalterm %]
                 <div class="equivalentheading">
-                        <span class="label">=</span>
+                    <span class="label">=</span>
-                        <span class="authorizedheading">[% term.heading | html %]</span>
+                    <span class="authorizedheading">[% term.heading | html %]</span>
                 </div>
             [% END %]
         [% END %]
@@ -114,9 +114,9 @@
         [% ELSE %]
             [% IF summary.notes.size %]
                 <div class="authres_notes">
-                    [% PROCESS notesmodal notes=summary.notes authid=authid %]
+                    <span><a href="#" data-bs-toggle="modal" data-bs-target="#notesModal_[% authid | html %]">Notes</a></span>
-                    <span><a href="#" data-toggle="modal" data-target="#notesModal_[% authid | html %]">Notes</a></span>
                 </div>
+                [% PROCESS notesmodal notes=summary.notes authid=authid %]
             [% END %]
             [% IF ( summary.seefrom.size >= 1 ) %]
             <div class="seefrom">
@@ -161,12 +161,12 @@
 
 [% BLOCK notesmodal %]
 <!-- notes modal -->
-<div style='font-style:normal;' class="modal fade notesModal" id="notesModal_[% authid | html %]" tabindex="-1" role="dialog" aria-labelledby="notesModalLabel">
+<div class="modal notesModal" id="notesModal_[% authid | html %]" tabindex="-1" role="dialog" aria-labelledby="notesModalLabel_[% authid | html %]">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+                <h1 class="modal-title" id="notesModalLabel_[% authid | html %]">Notes</h1>
-                <h4 class="modal-title" id="notesModalLabel">Notes</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <ul>
@@ -176,7 +176,7 @@
                 </ul>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div>
         </div>
     </div>

koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc

@@ -7,7 +7,7 @@
         <label class="control-label">
             Order by
 
-            <select name="orderby" class="form-control">
+            <select name="orderby" class="form-select">
                 [% IF ( orderby == 'HeadingAsc' ) %]
                     <option value="HeadingAsc" selected="selected">Heading A-Z</option>
                 [% ELSE %]
@@ -33,7 +33,7 @@
         <label class="control-label">
             Operator
 
-            <select name="operator" class="form-control">
+            <select name="operator" class="form-select">
                 [% IF ( operator == 'contains' ) %]
                     <option value="contains" selected="selected">contains</option>
                 [% ELSE %]
@@ -58,7 +58,7 @@
     <div>
         <label>
             Authority type
-            <select name="authtypecode" class="form-control">
+            <select name="authtypecode" class="form-select">
                 [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
                 [% FOREACH authority_type IN authority_types %]
                     [% IF authority_type.authtypecode == authtypecode %]

koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc

@@ -3,13 +3,12 @@
     <div id="toolbar" class="btn-toolbar">
         [% IF ( CAN_user_editauthorities ) %]
             <div class="btn-group">
-                <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="fa fa-plus"></i> New authority
-                    <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu">
                     [% FOREACH authority_type IN authority_types %]
-                        <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | uri %]">[% authority_type.authtypetext | html %]</a></li>
+                        <li><a class="dropdown-item" href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | uri %]">[% authority_type.authtypetext | html %]</a></li>
                     [% END %]
                 </ul>
             </div>
@@ -25,31 +24,29 @@
         [% IF ( authid ) %]
             [% IF ( CAN_user_editauthorities ) %]
                 <div class="btn-group">
-                    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                    <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                        <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit <span class="caret"></span>
+                        <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit
                     </button>
                     <ul class="dropdown-menu">
-                        <li><a id="editAuth" href="/cgi-bin/koha/authorities/authorities.pl?authid=[% authid | html %]">Edit record</a></li>
+                        <li><a class="dropdown-item" id="editAuth" href="/cgi-bin/koha/authorities/authorities.pl?authid=[% authid | html %]">Edit record</a></li>
-                        <li><a id="dupAuth" href="/cgi-bin/koha/authorities/authorities.pl?authid=[% authid | html %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
+                        <li><a class="dropdown-item" id="dupAuth" href="/cgi-bin/koha/authorities/authorities.pl?authid=[% authid | html %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
                         [% IF servers.count > 0 %]
-                            <li><a id="z3950_replace" href="#">Replace record via Z39.50/SRU</a></li>
+                            <li><a class="dropdown-item" id="z3950_replace" href="#">Replace record via Z39.50/SRU</a></li>
                         [% END %]
                         [% UNLESS ( count ) %]
-                            <li><a href="#" id="delAuth">Delete record</a></li>
+                            <li><a class="dropdown-item" href="#" id="delAuth">Delete record</a></li>
                         [% END %]
                     </ul>
                 </div>
             [% END %]
 
             <div class="btn-group">
-                <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save
+                <a class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" href="#"><i class="fa fa-download"></i> Save</a>
-                <span class="caret"></span>
-                </a>
                 <ul class="dropdown-menu">
-                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid | uri %]">MADS (XML)</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/authorities/export.pl?format=mads&amp;op=export&amp;authid=[% authid | uri %]">MADS (XML)</a></li>
-                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid | uri %]">MARCXML</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/authorities/export.pl?format=marcxml&amp;op=export&amp;authid=[% authid | uri %]">MARCXML</a></li>
-                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid | uri %]">MARC (non-Unicode/MARC-8)</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/authorities/export.pl?format=marc8&amp;op=export&amp;authid=[% authid | uri %]">MARC (non-Unicode/MARC-8)</a></li>
-                    <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid | uri %]">MARC (Unicode/UTF-8)</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/authorities/export.pl?format=utf8&amp;op=export&amp;authid=[% authid | uri %]">MARC (Unicode/UTF-8)</a></li>
                 </ul>
             </div>
         [% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/authority-detail-modal.inc

@@ -1,16 +1,16 @@
 <!-- Authority details modal -->
 <div class="modal" id="authorityDetail" tabindex="-1" role="dialog" aria-labelledby="authorityDetailLabel">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h1 class="modal-title" id="authorityDetailLabel"></h1>
-                <h4 class="modal-title" id="authorityDetailLabel"></h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" />
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div>
         </div>
     </div>

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_deletion.inc

@@ -2,15 +2,15 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF report.total_records == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 All records have been deleted successfully!
             </div>
         [% ELSIF report.total_success == 0 %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 No record has been deleted. An error occurred.
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 [% report.total_success | html %] / [% report.total_records | html %] records have been deleted successfully but some errors occurred.
             </div>
         [% END %]
@@ -19,7 +19,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc

@@ -3,11 +3,11 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF report.total_records == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 All records have successfully been modified! <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 <span>[% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.</span>
                 [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
                 <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>
@@ -18,7 +18,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_deletion.inc

@@ -2,15 +2,15 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF report.total_records == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 All records have been deleted successfully!
             </div>
         [% ELSIF report.total_success == 0 %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 No record has been deleted. An error occurred.
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 [% report.total_success | html %] / [% report.total_records | html %] records have been deleted successfully but some errors occurred.
             </div>
         [% END %]
@@ -19,7 +19,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc

@@ -3,7 +3,7 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF report.total_records == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 <span>All records have successfully been modified!</span>
                 <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>
                 [% IF lists.count %]
@@ -18,7 +18,7 @@
                 [% END %]
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 <span>[% report.total_success | html %] / [% report.total_records | html %] records have successfully been modified. Some errors occurred.</span>
                 [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
                 <a href="/cgi-bin/koha/tools/batch_record_modification.pl" title="New batch record modification">New batch record modification</a>
@@ -29,7 +29,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc

@@ -3,11 +3,11 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF report.total_holds == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 All holds have successfully been cancelled!
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 <span>[% report.total_success | html %] / [% report.total_holds | html %] holds have successfully been modified. Some errors occurred.</span>
                 [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
             </div>
@@ -18,7 +18,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN report_messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc

@@ -2,7 +2,7 @@
 [% BLOCK report %]
     [% SET report = job.report %]
     [% IF report %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF report.deleted_itemnumbers.size %]
                 <p>[% report.deleted_itemnumbers.size | html %] item(s) deleted.</p>
                 [% IF report.deleted_biblionumbers.size %]
@@ -14,13 +14,13 @@
         </div>
 
         [% IF report.not_deleted_itemnumbers.size %]
-            <div class="dialog error">
+            <div class="alert alert-warning">
                 [% report.not_deleted_itemnumbers.size | html %] item(s) could not be deleted: [% FOREACH not_deleted_itemnumber IN report.not_deleted_itemnumbers %][% not_deleted_itemnumber | html %] [% END %]
             </div>
         [% END %]
 
         [% IF job.status == 'cancelled' %]
-            <div class="dialog error">
+            <div class="alert alert-warning">
                 <span>The job has been cancelled before it finished.</span>
                 <a href="/cgi-bin/koha/tools/batchMod.pl" title="New batch item modification">New batch item modification</a>
             </div>
@@ -30,7 +30,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_modification.inc

@@ -4,7 +4,7 @@
 [% BLOCK report %]
     [% SET report = job.report %]
     [% IF report %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF report.modified_itemnumbers.size %]
                 <span>[% report.modified_itemnumbers.size | html %] item(s) modified (with [% report.modified_fields | html %] field(s) modified).</span>
             [% ELSE %]
@@ -19,7 +19,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/create_eholdings_from_biblios.inc

@@ -2,15 +2,15 @@
     [% SET report = job.report %]
     [% IF report && job.status != 'started' && job.status != 'new' %]
         [% IF report.total_records == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 All eHolding titles have been created successfully!
             </div>
         [% ELSIF report.total_success == 0 %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 No eHolding titles have been created. An error occurred.
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 [% report.total_success | html %] / [% report.total_records | html %] eHolding titles have been created successfully but some errors occurred.
             </div>
         [% END %]
@@ -19,7 +19,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/erm_sushi_harvester.inc

@@ -4,7 +4,7 @@
 [% BLOCK report %]
     [% SET report = job.report %]
     [% IF report %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF job.status == 'finished' %]
                 <table id="finishedtable">
                     <tr>
@@ -76,7 +76,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/import_from_kbart_file.inc

@@ -4,7 +4,7 @@
 [% BLOCK report %]
     [% SET report = job.report %]
     [% IF report %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF job.status == 'finished' %]
                 <table id="finishedtable">
                     <tr>
@@ -46,7 +46,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_commit_batch.inc

@@ -4,7 +4,7 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF job.status == 'finished' %]
-            <div class="dialog message">Completed import of records</div>
+            <div class="alert alert-info">Completed import of records</div>
         [% END %]
         <table>
             <tr>

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/marc_import_revert_batch.inc

@@ -4,7 +4,7 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF job.status == 'finished' %]
-            <div class="dialog message">Success: Import reverted</div>
+            <div class="alert alert-info">Success: Import reverted</div>
         [% END %]
         <table>
             <tr>

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/pseudonymize_statistic.inc

@@ -1,22 +1,22 @@
 [% USE KohaSpan %]
 [% BLOCK report %]
     [% IF job.status == 'finished' %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             Statistic has been pseudonymized.
         </div>
     [% ELSIF job.status == 'cancelled' %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             Pseudonymization has been cancelled.
         </div>
     [% ELSE %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             Pseudonymization is pending.
         </div>
     [% END %]
 [% END %]
 
 [% BLOCK detail %]
-    <div class="dialog message">
+    <div class="alert alert-info">
         Pseudonymization.
     </div>
 [% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/stage_marc_for_import.inc

@@ -4,7 +4,7 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF job.status == 'finished' %]
-            <div class="dialog message">Completed staging records</div>
+            <div class="alert alert-info">Completed staging records</div>
         [% END %]
 
         <h2>MARC staging results</h2>

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc

@@ -4,11 +4,11 @@
 [% BLOCK report %]
     [% IF job.status == 'finished' %]
         [% IF report %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 [% report.record_ids.size | html %] records have successfully been reindexed.
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                Job data could not be read, see the logs for details
             </div>
         [% END %]
@@ -19,7 +19,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN job.messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_holds_queue_for_biblios.inc

@@ -3,11 +3,11 @@
     [% SET report = job.report %]
     [% IF report %]
         [% IF report.total_biblios == report.total_success %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 Holds queue successfully updated.
             </div>
         [% ELSE %]
-            <div class="dialog message">
+            <div class="alert alert-info">
                 <span>Holds queue for [% report.total_success | html %] / [% report.total_biblios | html %] has been successfully updated. Some errors occurred.</span>
                 [% IF job.status == 'cancelled' %]<span>The job has been cancelled before it finished.</span>[% END %]
             </div>
@@ -18,7 +18,7 @@
 
 [% BLOCK detail %]
     [% FOR m IN report_messages %]
-        <div class="dialog message">
+        <div class="alert alert-info">
             [% IF m.type == 'success' %]
                 <i class="fa fa-check success"></i>
             [% ELSIF m.type == 'warning' %]

koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc

@@ -1,34 +1,34 @@
 [% IF blocking_error %]
     [% SWITCH blocking_error %]
     [% CASE 'unknown_patron' %]
-        <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
+        <div class="alert alert-info">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
     [% CASE 'cannot_see_patron_infos' %]This account cannot view requested patron information.
     [% CASE 'unknown_biblio' %]
-        <div class="dialog message">Bibliographic record not found.</div>
+        <div class="alert alert-info">Bibliographic record not found.</div>
     [% CASE 'unknown_item' %]
-        <div class="dialog message">Item not found.</div>
+        <div class="alert alert-info">Item not found.</div>
     [% CASE 'unknown_subscription' %]
-        <div class="dialog message">Subscription not found.</div>
+        <div class="alert alert-info">Subscription not found.</div>
     [% CASE 'unknown_basket' %]
-        <div class="dialog message">Basket not found.</div>
+        <div class="alert alert-info">Basket not found.</div>
     [% CASE 'unknown_vendor' %]
-        <div class="dialog message">Vendor not found.</div>
+        <div class="alert alert-info">Vendor not found.</div>
     [% CASE 'unknown_ill_request' %]
-        <div class="dialog message">ILL request not found.</div>
+        <div class="alert alert-info">ILL request not found.</div>
     [% CASE 'order_cannot_be_edited' %]
-        <div class="dialog message">This order cannot be edited, the basket is closed or the order was already received.</div>
+        <div class="alert alert-info">This order cannot be edited, the basket is closed or the order was already received.</div>
     [% CASE 'wrong_csrf_token' %]
-        <div class="dialog alert">The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.</div>
+        <div class="alert alert-info">The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.</div>
     [% CASE 'budget_is_locked' %]
-        <div class="dialog message">The budget is locked, fund creation is not possible.</div>
+        <div class="alert alert-info">The budget is locked, fund creation is not possible.</div>
     [% CASE 'missing_es_modules' %]
-        <div class="dialog message">Necessary Elasticsearch packages are not installed on your server. Please contact your server admin if you wish to configure Elasticsearch.</div>
+        <div class="alert alert-info">Necessary Elasticsearch packages are not installed on your server. Please contact your server admin if you wish to configure Elasticsearch.</div>
     [% CASE 'insufficient_permission' %]
-        <div class="dialog message">You do not have sufficient permission to continue.</div>
+        <div class="alert alert-info">You do not have sufficient permission to continue.</div>
     [% CASE 'duplicate_tagfield' %]
-        <div class="dialog message">MARC field not added to MARC bibliographic framework. MARC tag already exists in framework.</div>
+        <div class="alert alert-info">MARC field not added to MARC bibliographic framework. MARC tag already exists in framework.</div>
     [% CASE %]
-        <div class="dialog alert">[% blocking_error | html %]</div>
+        <div class="alert alert-warning">[% blocking_error | html %]</div>
     [% END %]
 
     [% INCLUDE 'intranet-bottom.inc' %]

koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc

@@ -3,7 +3,7 @@
         <p><strong>Currency = [% currency | html %]</strong></p>
     [% END %]
 [% ELSE %]
-    <div class="dialog alert">
+    <div class="alert alert-warning">
         <h3>No active currency is defined</h3>
         [% IF CAN_user_acquisition_currencies_manage %]
             <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>

koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc

@@ -24,7 +24,7 @@
                 <div class="form-extra-content">
                     <label for="filter_budgetbranch">Library</label>
 
-                    <select name="filter_budgetbranch" id="filter_budgetbranch" class="form-control">
+                    <select name="filter_budgetbranch" id="filter_budgetbranch" class="form-select">
                         <option value="">All libraries</option>
                         [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
                             [% IF branchloo.selected %]

koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc

@@ -1,57 +1,57 @@
 <div id="toolbar" class="btn-toolbar">
     [% IF ( budget_period_id ) %]
         <div class="btn-group">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
+            <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-plus"></i> New</button>
                 <ul class="dropdown-menu">
-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form">New budget</a></li>
                     [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %]
                         <li class="disabled">
-                            <a data-toggle="tooltip" data-placement="left" title="The budget is locked" href="#">New fund for [% budget_period_description | html %]</a>
+                            <a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="The budget is locked" href="#">New fund for [% budget_period_description | html %]</a>
                         </li>
                     [% ELSE %]
                         <li>
-                            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">New fund for [% budget_period_description | html %]</a>
+                            <a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">New fund for [% budget_period_description | html %]</a>
                         </li>
                     [% END %]
                 </ul>
         </div>
 
         <div class="btn-group">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit <span class="caret"></span></button>
+            <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</button>
                 <ul class="dropdown-menu">
-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&amp;budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li>
-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&amp;budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li>
                 </ul>
         </div>
 
         <div class="btn-group">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Planning <span class="caret"></span></button>
+            <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Planning</button>
                 <ul class="dropdown-menu">
                     [% IF ( CAN_user_acquisition_planning_manage ) %]
                     <li>
                     [% ELSE %]
                     <li class="disabled">
                     [% END %]
-                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=MONTHS">Plan by months</a></li>
+                        <a class="dropdown-item" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=MONTHS">Plan by months</a></li>
                     [% IF ( CAN_user_acquisition_planning_manage ) %]
                     <li>
                     [% ELSE %]
                     <li class="disabled">
                     [% END %]
-                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=BRANCHES">Plan by libraries</a></li>
+                        <a class="dropdown-item" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=BRANCHES">Plan by libraries</a></li>
                     [% IF ( CAN_user_acquisition_planning_manage ) %]
                     <li>
                     [% ELSE %]
                     <li class="disabled">
                     [% END %]
-                    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=ITEMTYPES">Plan by item types</a></li>
+                        <a class="dropdown-item" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=ITEMTYPES">Plan by item types</a></li>
                     [% FOREACH auth_cats_loo IN auth_cats_loop %]
                         [% IF ( CAN_user_acquisition_planning_manage ) %]
                         <li>
                         [% ELSE %]
                         <li class="disabled">
                         [% END %]
-                        <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=[% auth_cats_loo | uri %]">Plan by [% auth_cats_loo | html %]</a>
+                            <a class="dropdown-item" href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&amp;authcat=[% auth_cats_loo | uri %]">Plan by [% auth_cats_loo | html %]</a>
                         </li>
                     [% END %]
                 </ul>

koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc

@@ -9,27 +9,27 @@
 
 [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription || Koha.Preference('CatalogConcerns') ) %]
     <div class="btn-group">
-    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
+    <button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-plus"></i> New</button>
         <ul class="dropdown-menu">
             [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-             <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
+             <li><a class="dropdown-item" id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New record</a></li>
             [% END %]
 
             [% IF ( CAN_user_editcatalogue_edit_items ) %]
-             <li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]#additema">New item</a></li>
+             <li><a class="dropdown-item" id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]#additema">New item</a></li>
             [% END %]
             [% IF ( CAN_user_serials_create_subscription ) %]
-             <li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber | html %]">New subscription</a></li>
+             <li><a class="dropdown-item" id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber | html %]">New subscription</a></li>
             [% END %]
 
             [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %]
-                <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;analyze=1">Analyze items</a></li>
+                <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&amp;analyze=1">Analyze items</a></li>
             [% END %]
             [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %]
-                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | uri %]">New child record</a></li>
+                <li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | uri %]">New child record</a></li>
             [% END %]
             [% IF Koha.Preference('CatalogConcerns') %]
-                <li><a id="newconcern" role="button" href="#" data-toggle="modal" data-target="#addConcernModal">New catalog concern</a></li>
+                <li><a class="dropdown-item" id="newconcern" role="button" href="#" data-bs-toggle="modal" data-bs-target="#addConcernModal">New catalog concern</a></li>
             [% END %]
     </ul>
     </div>
@@ -37,13 +37,13 @@
 
 [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
     <div class="btn-group">
-    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit <span class="caret"></span></button>
+    <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</button>
         <ul class="dropdown-menu">
             [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
                 [% IF biblio.can_be_edited(logged_in_user) %]
-                    <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li>
+                    <li><a class="dropdown-item" id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a id="editbiblio" href="#" data-toggle="tooltip" data-placement="left" title="This record is locked">Edit record</a></li>
+                    <li><a class="dropdown-item disabled" aria-disabled="true" id="editbiblio" href="#" data-bs-toggle="tooltip" data-bs-placement="left" title="This record is locked">Edit record</a></li>
                 [% END %]
             [% END %]
 
@@ -54,13 +54,13 @@
                         <input type="hidden" name="recordtype" value="biblio" />
                         <input type="hidden" name="op" value="cud-list" />
                         <input type="hidden" name="bib_list" value="[% biblionumber | html %]" />
-                        <button type="submit" class="btn btn-default" id="modifybiblio">Modify record using template</button>
+                        <button type="submit" class="dropdown-item" id="modifybiblio">Modify record using template</button>
                     </form>
                 </li>
             [% END %]
 
             [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
-            <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]">Edit items</a></li>
+                <li><a class="dropdown-item" id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]">Edit items</a></li>
             [% END %]
 
             [% IF ( CAN_user_tools_items_batchmod ) %]
@@ -71,11 +71,13 @@
                             <input type="hidden" name="op" value="cud-show" />
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="src" value="CATALOGUING" />
-                            <button id="batchedit" type="submit" class="btn btn-default" id="modifybiblio">Edit items in a batch</button>
+                            <button id="batchedit" type="submit" class="dropdown-item" id="modifybiblio">Edit items in a batch</button>
                         </form>
                     </li>
                 [% ELSE %]
-                    <li class="disabled"><a id="batchedit-disabled" href="#" data-toggle="tooltip" data-placement="left" title="This record has no items">Edit items in batch</a></li>
+                    <li>
+                        <a class="dropdown-item disabled" aria-disabled="true" id="batchedit-disabled" href="#" data-bs-toggle="tooltip" data-bs-placement="left" title="This record has no items">Edit items in batch</a>
+                    </li>
                 [% END %]
             [% END %]
 
@@ -88,29 +90,53 @@
                             <input type="hidden" name="del" value="1" />
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="src" value="CATALOGUING" />
-                            <button id="batchdelete" type="submit" class="btn btn-default" id="modifybiblio">Delete items in a batch</button>
+                            <button id="batchdelete" type="submit" class="dropdown-item" id="modifybiblio">Delete items in a batch</button>
                         </form>
                     </li>
                 [% ELSE %]
-                    <li class="disabled"><a id="batchdelete-disabled" href="#" data-toggle="tooltip" data-placement="left" title="This record has no items">Delete items in a batch</a></li>
+                    <li>
+                        <a class="dropdown-item disabled" aria-disabled="true" id="batchdelete-disabled" href="#" data-bs-toggle="tooltip" data-bs-placement="left" title="This record has no items">Delete items in a batch</a>
+                    </li>
                 [% END %]
             [% END %]
 
-            [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | uri %]">Attach item</a></li>[% END %]
+            [% IF ( CAN_user_editcatalogue_edit_items ) %]
+                <li>
+                    <a class="dropdown-item" href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | uri %]">Attach item</a>
+                </li>
+            [% END %]
 
-            [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber | uri %]">Link to host record</a>[% END %][% END %]
+            [% IF ( EasyAnalyticalRecords ) %]
-            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&amp;filetype=image">Upload image</a>[% END %][% END %]
+                [% IF ( CAN_user_editcatalogue_edit_items ) %]
+                    <li>
+                        <a class="dropdown-item" href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber | uri %]">Link to host record</a>
+                    </li>
+                [% END %]
+            [% END %]
+            [% IF ( LocalCoverImages || OPACLocalCoverImages) %]
+                [% IF ( CAN_user_tools_upload_local_cover_images ) %]
+                    <li>
+                        <a class="dropdown-item" href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&amp;filetype=image">Upload image</a>
+                    </li>
+                [% END %]
+            [% END %]
 
             [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-                <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
+                <li>
-                <li><a href="#" id="z3950copy">Replace record via Z39.50/SRU</a></li>
+                    <a class="dropdown-item" id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]&amp;op=duplicate">Edit as new (duplicate)</a>
+                </li>
+                <li><a class="dropdown-item" href="#" id="z3950copy">Replace record via Z39.50/SRU</a></li>
             [% END %]
 
             [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
                 [% IF ( count ) %]
-                    <li class="disabled"><a id="deletebiblio" data-toggle="tooltip" data-placement="left" title="[% count | html %] item(s) are attached to this record. You must delete all items before deleting this record." href="#">Delete record</a></li>
+                    <li>
+                        <a class="dropdown-item disabled" aria-disabled="true" id="deletebiblio" data-bs-toggle="tooltip" data-bs-placement="left" title="[% count | html %] item(s) are attached to this record. You must delete all items before deleting this record." href="#">Delete record</a>
+                    </li>
                 [% ELSIF ( biblio.subscriptions.count ) %]
-                    <li class="disabled"><a id="deletebiblio" data-toggle="tooltip" data-placement="left" title="[% biblio.subscriptions.count | html %] subscription(s) are attached to this record. You must delete all subscriptions before deleting this record." href="#">Delete record</a></li>
+                    <li>
+                        <a class="dropdown-item disabled" aria-disabled="true" id="deletebiblio" data-bs-toggle="tooltip" data-bs-placement="left" title="[% biblio.subscriptions.count | html %] subscription(s) are attached to this record. You must delete all subscriptions before deleting this record." href="#">Delete record</a>
+                    </li>
                 [% ELSE %]
                     <li>
                         <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="post">
@@ -119,7 +145,7 @@
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="searchid" value="[% searchid | html %]" />
                         </form>
-                        <a id="deletebiblio" data-order-manage="[% CAN_user_acquisition_order_manage | html %]" href="#">Delete record</a>
+                        <a class="dropdown-item" id="deletebiblio" data-order-manage="[% CAN_user_acquisition_order_manage | html %]" href="#">Delete record</a>
                     </li>
                 [% END %]
             [% END %]
@@ -133,10 +159,12 @@
                             <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
                             <input type="hidden" name="searchid" value="[% searchid | html %]" />
                         </form>
-                        <a href="#" id="deleteallitems">Delete all items</a>
+                        <a class="dropdown-item" href="#" id="deleteallitems">Delete all items</a>
                     </li>
                 [% ELSE %]
-                    <li class="disabled"><a href="#" id="deleteallitems-disabled" data-toggle="tooltip" data-placement="left" title="This record has no items">Delete all items</a></li>
+                    <li>
+                        <a class="dropdown-item disabled" aria-disabled="true" href="#" id="deleteallitems-disabled" data-bs-toggle="tooltip" data-bs-placement="left" title="This record has no items">Delete all items</a>
+                    </li>
                 [% END %]
             [% END %]
 
@@ -145,50 +173,50 @@
 [% END %]
 
     <div class="btn-group">
-    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button>
+    <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-download"></i> Save</button>
     <ul class="dropdown-menu">
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | uri %]">BIBTEX</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&amp;op=export&amp;bib=[% biblionumber | uri %]">BIBTEX</a></li>
-        <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
+        <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#exportModal_">Dublin Core</a></li>
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&amp;op=export&amp;bib=[% biblionumber | uri %]">MARCXML</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&amp;op=export&amp;bib=[% biblionumber | uri %]">MARCXML</a></li>
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (non-Unicode/MARC-8)</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=marc8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (non-Unicode/MARC-8)</a></li>
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8)</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=utf8&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8)</a></li>
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8, Standard)</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&amp;op=export&amp;bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8, Standard)</a></li>
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&amp;op=export&amp;bib=[% biblionumber | uri %]">MODS (XML)</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=mods&amp;op=export&amp;bib=[% biblionumber | uri %]">MODS (XML)</a></li>
-        <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&amp;op=export&amp;bib=[% biblionumber | uri %]">RIS</a></li>
+        <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/export.pl?format=ris&amp;op=export&amp;bib=[% biblionumber | uri %]">RIS</a></li>
     </ul>
     </div>
 
     [% IF (Koha.Preference("intranetbookbag")) %]
         [% IF ( incart ) %]
             <div class="btn-group">
-                <a id="cart[% biblionumber | html %]" class="btn btn-default addtocart incart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>
+                <a id="cart[% biblionumber | html %]" class="btn btn-default addtocart incart" href="#" role="button"><i class="fa fa-shopping-cart"></i> Add to cart</a>
             </div>
             <div class="btn-group">
-                <a id="cartR[% biblionumber | html %]" class="btn btn-default cartRemove incart" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
+                <a id="cartR[% biblionumber | html %]" class="btn btn-default cartRemove incart" href="#" role="button"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
             </div>
         [% ELSE %]
             <div class="btn-group">
-                <a id="cart[% biblionumber | html %]" class="btn btn-default addtocart" href="#"><i class="fa fa-shopping-cart"></i> Add to cart</a>
+                <a id="cart[% biblionumber | html %]" class="btn btn-default addtocart" href="#" role="button"><i class="fa fa-shopping-cart"></i> Add to cart</a>
             </div>
             <div class="btn-group">
-                <a id="cartR[% biblionumber | html %]" class="btn btn-default cartRemove" href="#"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
+                <a id="cartR[% biblionumber | html %]" class="btn btn-default cartRemove" href="#" role="button"><i class="fa fa-shopping-cart"></i> Remove from cart</a>
             </div>
         [% END %]
     [% END %]
 
     [% IF Koha.Preference('virtualshelves') %]
         <div class="btn-group">
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <i class="fa fa-list"></i> Add to list <span class="caret"></span>
+                <i class="fa fa-list"></i> Add to list
             </button>
             <ul class="dropdown-menu">
                 [% IF add_to_some_private_shelves.count %]
-                    <li class="dropdown-header">Your lists</li>
+                    <li><h6 class="dropdown-header">Your lists</h6></li>
                     [% SET number_of_private_shelves = 0 %]
                     [% FOREACH s IN add_to_some_private_shelves %]
                         [% IF shelfnumber != s.shelfnumber %]
                             <li>
-                                <a href="#" class="addtolist" data-shelfnumber="[% s.shelfnumber | html %]">[% s.shelfname | html %]</a>
+                                <a class="dropdown-item addtolist" href="#" data-shelfnumber="[% s.shelfnumber | html %]">[% s.shelfname | html %]</a>
                             </li>
                             [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
                             [% IF number_of_private_shelves == 10 %][% LAST %][% END %]
@@ -196,66 +224,66 @@
                     [% END %]
                 [% END %]
                 [% IF add_to_some_public_shelves.count %]
-                    <li class="dropdown-header">Public lists</li>
+                    <li><h6 class="dropdown-header">Public lists</h6></li>
                     [% SET number_of_public_shelves = 0 %]
                     [% FOREACH s IN add_to_some_public_shelves %]
                         [% IF shelfnumber != s.shelfnumber %]
                             <li>
-                                <a href="#" data-shelfnumber="[% s.shelfnumber | html %]" class="addtolist">[% s.shelfname | html %]</a>
+                                <a class="dropdown-item addtolist" href="#" data-shelfnumber="[% s.shelfnumber | html %]">[% s.shelfname | html %]</a>
                             </li>
                             [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
                             [% IF number_of_public_shelves == 10 %][% LAST %][% END %]
                         [% END %]
                     [% END %]
                 [% END %]
-                <li role="separator" class="divider"></li>
+                <li><hr class="dropdown-divider"></li>
                 [% IF ( add_to_some_private_shelves and add_to_some_private_shelves.count > 10 ) or ( add_to_some_public_shelves and add_to_some_public_shelves.count > 10 ) %]
                     <li>
-                        <a href="#" class="addtolist morelists">More lists</a>
+                        <a href="#" class="addtolist morelists dropdown-item">More lists</a>
                     </li>
                 [% END %]
                 <li>
-                    <a href="#" class="addtolist newlist">New list</a>
+                    <a href="#" class="addtolist newlist dropdown-item">New list</a>
                 </li>
             </ul>
         </div>
     [% END # /IF virtualshelves %]
 
-    <div class="btn-group"><a id="printbiblio" class="btn btn-default"><i class="fa fa-print"></i> Print</a></div>
+    <div class="btn-group"><a id="printbiblio" class="btn btn-default" role="button"><i class="fa fa-print"></i> Print</a></div>
 
 [% IF ( CAN_user_reserveforothers ) %]
     [% SET items = biblio.items %]
     [% IF Context.Scalar(Context.Scalar(items, "filter_by_for_hold"), "count") %]
         [% IF ( holdfor ) %]
             <div class="btn-group">
-                <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="fa-solid fa-bookmark"></i>
                     Place hold
-                    <span class="caret"></span>
+
                 </button>
                 <ul class="dropdown-menu">
-                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li>
-                    <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&amp;findborrower=[% holdfor_patron.cardnumber | uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></li>
                 </ul>
             </div>
         [% ELSE %]
-            <div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]"><i class="fa-solid fa-bookmark"></i> Place hold</a></div>
+            <div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]" role="button"><i class="fa-solid fa-bookmark"></i> Place hold</a></div>
         [% END %]
     [% END %]
 [% END %]
 
 [% IF ( CAN_user_circulate_manage_bookings && biblio.items.filter_by_bookable.count ) %]
-<div class="btn-group"><button id="placbooking" class="btn btn-default" data-toggle="modal" data-target="#placeBookingModal" data-biblionumber="[% biblionumber | html %]"><i class="fa fa-calendar"></i> Place booking</button></div>
+<div class="btn-group"><button id="placbooking" class="btn btn-default" data-bs-toggle="modal" data-bs-target="#placeBookingModal" data-biblionumber="[% biblionumber | html %]"><i class="fa fa-calendar"></i> Place booking</button></div>
 [% END %]
 
 [% IF Koha.Preference('ArticleRequests') %]
-    <div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]"><i class="fa-solid fa-file-lines"></i> Request article</a></div>
+    <div class="btn-group"><a id="placehold" class="btn btn-default" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]" role="button"><i class="fa-solid fa-file-lines"></i> Request article</a></div>
 [% END %]
 
 [% IF ( CAN_user_acquisition_order_manage ) %]
     [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
         <div class="btn-group">
-            <a class="btn btn-default" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% biblionumber | uri %]"><i class="fa fa-shopping-basket"></i> Add order</a>
+            <a class="btn btn-default" href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% searchtoorder_vendorid | uri %]&amp;basketno=[% searchtoorder_basketno | uri %]&amp;biblionumber=[% biblionumber | uri %]" role="button"><i class="fa fa-shopping-basket"></i> Add order</a>
         </div>
     [% END %]
 [% END %]
@@ -269,33 +297,33 @@
     <!--Modal for Dublin Core-->
     <div class="modal" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true">
         <div class="modal-dialog">
-        <div class="modal-content">
+            <div class="modal-content">
-        <div class="modal-header">
+                <div class="modal-header">
-            <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <h1 class="modal-title" id="exportLabelexportModal_">Exporting to Dublin Core...</h1>
-            <h3 id="exportLabelexportModal_">Exporting to Dublin Core...</h3>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </div>
+                </div>
-        <form method="get" action="/cgi-bin/koha/catalogue/export.pl">
+                <form method="get" action="/cgi-bin/koha/catalogue/export.pl">
-        <div class="modal-body">
+                    <div class="modal-body">
-            <fieldset>
+                        <fieldset>
-                <input id="input-simple" type="radio" name="format" value="rdfdc">
+                            <input id="input-simple" type="radio" name="format" value="rdfdc">
-                <label for="input-simple">Simple DC-RDF</label>
+                            <label for="input-simple">Simple DC-RDF</label>
-                <br>
+                            <br>
-                <input id="input-oai" type="radio" name="format" value="oaidc" checked>
+                            <input id="input-oai" type="radio" name="format" value="oaidc" checked>
-                <label for="input-oai">OAI-DC</label>
+                            <label for="input-oai">OAI-DC</label>
-                <br>
+                            <br>
-                <input id="input-srw" type="radio" name="format" value="srwdc">
+                            <input id="input-srw" type="radio" name="format" value="srwdc">
-                <label for="input-srw">SRW-DC</label>
+                            <label for="input-srw">SRW-DC</label>
-                <br>
+                            <br>
-            </fieldset>
+                        </fieldset>
-        </div>
+                    </div>
-        <div class="modal-footer">
+                    <div class="modal-footer">
-            <button type="submit" class="btn btn-default">Export</button>
+                        <button type="submit" class="btn btn-primary">Export</button>
-            <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                        <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
-        </div>
+                    </div>
-        <input type="hidden" name="op" value="export" />
+                    <input type="hidden" name="op" value="export" />
-        <input type="hidden" name="bib" value="[% biblionumber | html %]" />
+                    <input type="hidden" name="bib" value="[% biblionumber | html %]" />
-        </form>
+                </form>
-        </div>
+            </div>
         </div>
     </div>
 

koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc

@@ -35,6 +35,6 @@
   "[% item.datelastborrowed | $KohaDates %]",
   "[% IF item.checkout %][% item.checkout.date_due | $KohaDates %][% END %]",
   "[% FILTER escape_quotes ~%]
-    <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu pull-right"> [% IF user.can_edit_items_from( item.homebranch ) %]<li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]">Edit item</a></li>[% END %] <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div>
+    <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit </button> <ul class="dropdown-menu dropdown-menu-end"> [% IF user.can_edit_items_from( item.homebranch ) %]<li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]">Edit item</a></li>[% END %] <li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div>
   [%~ END %]"
 ]

koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc

@@ -610,22 +610,22 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
         var max_page = Math.ceil( data.total_fetched / data.page_size ) - 1;
 
         if ( cur_page != 0 ) {
-            pages.push( '<li><a class="search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '"><span aria-hidden="true">&laquo;</span> ' + _("Previous") + '</a></li>' );
+            pages.push( '<li class="page-item"><a class="page-link search-nav" href="#" data-offset="' + (data.offset - data.page_size) + '"><span aria-hidden="true">&laquo;</span> ' + _("Previous") + '</a></li>' );
         }
 
         for ( var page = Math.max( 0, cur_page - 9 ); page <= Math.min( max_page, cur_page + 9 ); page++ ) {
             if ( page == cur_page ) {
-                pages.push( ' <li class="active"><a href="#">' + ( page + 1 ) + '</a></li>' );
+                pages.push( ' <li class="page-item active" aria-current="page"><span class="page-link">' + ( page + 1 ) + '</span></li>' );
             } else {
-                pages.push( ' <li><a class="search-nav" href="#" data-offset="' + ( page * data.page_size ) + '">' + ( page + 1 ) + '</a></li>' );
+                pages.push( ' <li class="page-item"><a class="page-link search-nav" href="#" data-offset="' + ( page * data.page_size ) + '">' + ( page + 1 ) + '</a></li>' );
             }
         }
 
         if ( cur_page < max_page ) {
-            pages.push( ' <li><a class="search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' <span aria-hidden="true">&raquo;</span></a></li>' );
+            pages.push( ' <li class="page-item"><a class="page-link search-nav" href="#" data-offset="' + (data.offset + data.page_size) + '">' + _("Next") + ' <span aria-hidden="true">&raquo;</span></a></li>' );
         }
 
-        $( '#search-top-pages, #search-bottom-pages' ).find( 'nav' ).html( pages.length > 1 ? ( '<ul class="pagination pagination-sm">' + pages.join( '' ) + '</ul>' ) : '' );
+        $( '#search-top-pages, #search-bottom-pages' ).find( 'nav' ).html( pages.length > 1 ? ( '<ul class="pagination">' + pages.join( '' ) + '</ul>' ) : '' );
 
         var $overlay = $('#search-overlay');
         $overlay.find('span').text(_("Loading"));
@@ -1096,7 +1096,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
         } );
         saveableBackends.sort();
         $.each( saveableBackends, function( undef, backend ) {
-            $( '#save-dropdown' ).append( '<li><a href="#" data-backend="' + backend[1] + '">' + backend[0] + '</a></li>' );
+            $( '#save-dropdown' ).append( '<li><a class="dropdown-item" href="#" data-backend="' + backend[1] + '">' + backend[0] + '</a></li>' );
         } );
 
         // Click bindings
@@ -1326,13 +1326,16 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
             },
         });
 
+        var popDefaults = $.fn.popover.Constructor.Default;
+
         // Whitelist table elements to ensure popover displays all the info
-        $.fn.popover.Constructor.DEFAULTS.whiteList.table = [];
+        $.fn.popover.Constructor.Default.allowList.tr = [];
-        $.fn.popover.Constructor.DEFAULTS.whiteList.tr = [];
+        $.fn.popover.Constructor.Default.allowList.table = [];
-        $.fn.popover.Constructor.DEFAULTS.whiteList.td = [];
+        $.fn.popover.Constructor.Default.allowList.td = [];
-        $.fn.popover.Constructor.DEFAULTS.whiteList.div = [];
+        $.fn.popover.Constructor.Default.allowList.th = [];
-        $.fn.popover.Constructor.DEFAULTS.whiteList.tbody = [];
+        $.fn.popover.Constructor.Default.allowList.div = [];
-        $.fn.popover.Constructor.DEFAULTS.whiteList.thead = [];
+        $.fn.popover.Constructor.Default.allowList.tbody = [];
+        $.fn.popover.Constructor.Default.allowList.thead = [];
         // https://getbootstrap.com/docs/3.4/javascript/#popovers
 
         $('#show-shortcuts').popover({

koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc

@@ -1,9 +1,9 @@
 <div class="modal" id="chartModal" tabindex="-1" role="dialog" aria-labelledby="chartModalLabel">
-    <div class="modal-dialog modal-wide" role="document">
+    <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h1 class="modal-title" id="chartModalLabel">Chart settings</h1>
-                <h4 class="modal-title" id="chartModalLabel">Chart settings</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body" id="makechart">
                 [% supposed_x = header_row.shift.cell %]
@@ -103,7 +103,7 @@
             </div>
             <div class="modal-footer">
                 <button id="draw-chart" class="btn btn-default">Draw</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div>
         </div>
     </div>

koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc

@@ -12,11 +12,7 @@
     [% END %]
 
     <div class="patroninfo [% patron_type_class | html %]">
-        [% IF ( patronimages ) %]
+        <h5>
-            <h5 class="text-center">
-        [% ELSE %]
-            <h5>
-        [% END %]
             [% IF ( patron_is_staff ) %]
                 <i class="fa-solid fa-shield fa-fw" title="Staff patron"></i>
             [% END %]
@@ -35,8 +31,8 @@
             <input type="hidden" id="hiddenborrowercard" value="[% patron.cardnumber | html %]">
         [% END %]
 
-        [% IF ( patronimages ) %]
+        <div class="patroninfo-container">
-            <div>
+            [% IF ( patronimages ) %]
                 <div class="patronimage-container">
                     [% IF ( patron.image ) %]
                         <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
@@ -58,106 +54,107 @@
                         [% END %]
                     [% END # /IF patron.image %]
                 </div> <!-- /.patronimage-container -->
-            </div>
+            [% END # /IF patronimages %]
-        [% END # /IF patronimages %]
+            <div>
-
+                <ul class="patronbriefinfo">
-        <ul class="patronbriefinfo">
+                    [% IF patron.pronouns %]
-            [% IF patron.pronouns %]
+                        <li class="patronpronouns">([% patron.pronouns | html %])</li>
-                <li class="patronpronouns">([% patron.pronouns | html %])</li>
-            [% END %]
-
-            [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
-
-                [% PROCESS 'display-address-style' %]
-
-                [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]
-                    <li class="patronphone">
-                        [% IF ( patron.phone ) %]
-                            <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a>
-                        [% ELSE %]
-                            [% IF ( patron.mobile ) %]
-                                <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a>
-                            [% ELSE %]
-                                [% IF ( patron.phonepro ) %]
-                                    <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a>
-                                [% END %]
-                            [% END %]
-                        [% END %]
-                    </li>
-                [% END # /IF phones %]
-                [% IF ( patron.email ) %]
-                    <li class="email">
-                        <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a>
-                    </li>
-                [% ELSE %]
-                    [% IF ( patron.emailpro ) %]
-                        <li class="email">
-                            <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a>
-                        </li>
                     [% END %]
-                [% END # /IF emails %]
-                [% IF ( patron.dateofbirth ) %]
-                    <li class="patrondateofbirth">
-                        <span>Born:</span>
-                        [% INCLUDE 'patron-age.inc' %]
-                    </li>
-                [% END %]
 
-                [% UNLESS ( patron.address or patron.address2 ) %]
+                    [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
-                    <li><span class="empty" id="noaddressstored">No address stored.</span></li>
-                [% END %]
-                [% UNLESS ( patron.city ) %]
-                    <li><span class="empty" id="nocitystored">No city stored.</span></li>
-                [% END %]
-                [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
-                    <li> <span class="empty">No phone stored.</span></li>
-                [% END %]
-                [% UNLESS ( patron.email or patron.emailpro) %]
-                    <li> <span class="empty">No email stored.</span></li>
-                [% END %]
-                [% UNLESS ( patron.dateofbirth ) %]
-                    <li> <span class="empty">No date of birth stored.</span></li>
-                [% END %]
 
-            [% END # /IF HidePersonalPatronDetailOnCirculation %]
+                        [% PROCESS 'display-address-style' %]
 
-            [% IF Koha.Preference('ExtendedPatronAttributes') %]
+                        [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]
-                [% FOREACH extendedattribute IN patron.extended_attributes %]
+                            <li class="patronphone">
-                    [% IF ( extendedattribute.type.display_checkout ) %] [%# FIXME We should filter in the line above %]
+                                [% IF ( patron.phone ) %]
-                        [% IF ( extendedattribute.attribute.defined  ) %]
+                                    <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a>
-                            <li class="patronattribute">
-                                <span class="patronattributelabel">[% extendedattribute.type.description | html %]</span>:
-                                [% IF extendedattribute.type.is_date %]
-                                    [% extendedattribute.description | $KohaDates %]
                                 [% ELSE %]
-                                    [% extendedattribute.description | html %]
+                                    [% IF ( patron.mobile ) %]
+                                        <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a>
+                                    [% ELSE %]
+                                        [% IF ( patron.phonepro ) %]
+                                            <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a>
+                                        [% END %]
+                                    [% END %]
                                 [% END %]
-                            </li> <!-- /.patronattribute -->
+                            </li>
+                [% END # /IF phones %]
+                        [% IF ( patron.email ) %]
+                            <li class="email">
+                                <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a>
+                            </li>
+                        [% ELSE %]
+                            [% IF ( patron.emailpro ) %]
+                                <li class="email">
+                                    <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a>
+                                </li>
+                            [% END %]
+                        [% END # /IF emails %]
+                        [% IF ( patron.dateofbirth ) %]
+                            <li class="patrondateofbirth">
+                                <span>Born:</span>
+                                [% INCLUDE 'patron-age.inc' %]
+                            </li>
                         [% END %]
-                    [% END # /IF display_checkout %]
-                [% END # /FOREACH extendedattribute %]
-            [% END # /IF ExtendedPatronAttributes %]
 
-            <li class="patroncategory">
+                        [% UNLESS ( patron.address or patron.address2 ) %]
-                Category: <span class="patroncategory_description">[% patron.category.description | html %]</span> <span class="patroncategory_code">([% patron.categorycode | html %])</span>
+                            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
-            </li>
+                        [% END %]
-            <li class="patronlibrary">
+                        [% UNLESS ( patron.city ) %]
-                Home library: [% Branches.GetName( patron.branchcode ) | html %]
+                            <li><span class="empty" id="nocitystored">No city stored.</span></li>
-            </li>
+                        [% END %]
-            <li class="patronborrowernumber">
+                        [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
-                Borrowernumber: [% patron.borrowernumber | html %]
+                            <li> <span class="empty">No phone stored.</span></li>
-            </li>
+                        [% END %]
-            <li>
+                        [% UNLESS ( patron.email or patron.emailpro) %]
-                <span class="patronupdatedon">Updated on [% patron.updated_on | $KohaDates with_hours => 1 %]</span>
+                            <li> <span class="empty">No email stored.</span></li>
-            </li>
+                        [% END %]
-            [% IF patron.account_locked %]
+                        [% UNLESS ( patron.dateofbirth ) %]
-                [% IF patron.login_attempts < 0 %]
+                            <li> <span class="empty">No date of birth stored.</span></li>
-                    <li class="blocker account_admin_locked">Account has been administratively locked</li>
+                        [% END %]
-                [% ELSE %]
+
-                    <li class="blocker account_locked">Account has been locked</li>
+                    [% END # /IF HidePersonalPatronDetailOnCirculation %]
-                [% END %]
+
-            [% END %]
+                    [% IF Koha.Preference('ExtendedPatronAttributes') %]
-        </ul> <!-- /.patronbriefinfo -->
+                        [% FOREACH extendedattribute IN patron.extended_attributes %]
+                            [% IF ( extendedattribute.type.display_checkout ) %] [%# FIXME We should filter in the line above %]
+                                [% IF ( extendedattribute.attribute.defined  ) %]
+                                    <li class="patronattribute">
+                                        <span class="patronattributelabel">[% extendedattribute.type.description | html %]</span>:
+                                        [% IF extendedattribute.type.is_date %]
+                                            [% extendedattribute.description | $KohaDates %]
+                                        [% ELSE %]
+                                            [% extendedattribute.description | html %]
+                                        [% END %]
+                                    </li> <!-- /.patronattribute -->
+                                [% END %]
+                            [% END # /IF display_checkout %]
+                        [% END # /FOREACH extendedattribute %]
+                    [% END # /IF ExtendedPatronAttributes %]
+
+                    <li class="patroncategory">
+                        Category: <span class="patroncategory_description">[% patron.category.description | html %]</span> <span class="patroncategory_code">([% patron.categorycode | html %])</span>
+                    </li>
+                    <li class="patronlibrary">
+                        Home library: [% Branches.GetName( patron.branchcode ) | html %]
+                    </li>
+                    <li class="patronborrowernumber">
+                        Borrowernumber: [% patron.borrowernumber | html %]
+                    </li>
+                    <li>
+                        <span class="patronupdatedon">Updated on [% patron.updated_on | $KohaDates with_hours => 1 %]</span>
+                    </li>
+                    [% IF patron.account_locked %]
+                        [% IF patron.login_attempts < 0 %]
+                            <li class="blocker account_admin_locked">Account has been administratively locked</li>
+                        [% ELSE %]
+                            <li class="blocker account_locked">Account has been locked</li>
+                        [% END %]
+                    [% END %]
+                </ul> <!-- /.patronbriefinfo -->
+            </div>
+        </div>
     </div> <!-- /.patronifo -->
 
     <div id="menu">
@@ -262,11 +259,11 @@
     [% IF patronimages && CAN_user_tools_batch_upload_patron_images %]
         <!-- Modal -->
         <div class="modal" id="patronImageEdit" tabindex="-1" role="dialog" aria-labelledby="patronImageEditLabel">
-            <div class="modal-dialog" role="document">
+            <div class="modal-dialog modal-lg">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <h1 class="modal-title" id="patronImageEditLabel">Patron photo</h1>
-                        <h4 class="modal-title" id="patronImageEditLabel">Patron photo</h4>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div> <!-- /.modal-header -->
                     <div class="modal-body">
                         [% IF ( patron.cardnumber ) %]
@@ -340,7 +337,7 @@
                                     <input name="op" type="hidden" value="cud-Upload" />
                                 </form> <!-- /#camera-upload -->
                             </div> <!-- /#capture-patron-image -->
-                            <div class="dialog message" style="display:none" id="camera-error">
+                            <div class="alert alert-info" style="display:none" id="camera-error">
                                 <div>
                                     <span class="fa-stack fa-lg">
                                         <i class="fa fa-camera fa-stack-1x"></i>
@@ -359,7 +356,7 @@
                         [% END # /IF patron.cardnumber %]
                     </div> <!-- /.modal-body -->
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                     </div>
                 </div> <!-- /.modal-content -->
             </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc

@@ -1,7 +1,10 @@
+<!-- circ-nav.inc -->
 [% USE Koha %]
 [% USE Branches %]
 <div id="navmenu">
     <div id="navmenulist">
+        <div class="row">
+        <div class="col-sm-6 col-md-12">
         <h5>Circulation</h5>
         <ul>
             <li>
@@ -63,7 +66,10 @@
                 <a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a>
             </li>
         </ul>
+        </div>
 
+
+        <div class="col-sm-6 col-md-12">
         [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
         <h5>Recalls</h5>
         <ul>
@@ -122,5 +128,8 @@
              </li>
         </ul>
         [% END %]
+        </div>
+    </div>
     </div>
 </div>
+<!-- /circ-nav.inc -->

koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc

@@ -72,38 +72,38 @@
                 [% UNLESS destination == 'holds' %]
                     <td class="actions">
                         <div class="btn-group dropup">
-                            <a class="btn btn-default btn-xs dropdown-toggle" id="clubactions[% c.id | html %]" role="button" data-toggle="dropdown" href="#">
+                            <a class="btn btn-default btn-xs dropdown-toggle" id="clubactions[% c.id | html %]" role="button" data-bs-toggle="dropdown" href="#">
-                                Actions <b class="caret"></b>
+                                Actions
                             </a>
-                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]">
+                            <ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="clubactions[% c.id | html %]">
                                 [% IF ( c.club_enrollments.count ) %]
                                     <li>
-                                        <a href="club-enrollments.pl?id=[% c.id | uri %]">
+                                        <a class="dropdown-item" href="club-enrollments.pl?id=[% c.id | uri %]">
                                             <i class="fa fa-list-ul"></i> Enrollments
                                         </a>
                                     </li>
                                 [% ELSE %]
                                     <li class="disabled">
-                                        <a href="#" data-toggle="tooltip" data-placement="left" title="There are no enrollments for this club yet">
+                                        <a class="dropdown-item" href="#" data-bs-toggle="tooltip" data-bs-placement="left" title="There are no enrollments for this club yet">
                                             <i class="fa fa-list-ul"></i> Enrollments
                                         </a>
                                     </li>
                                 [% END %]
                                 [% IF CAN_user_clubs_edit_clubs %]
                                     <li>
-                                        <a href="clubs-add-modify.pl?id=[% c.id | uri %]">
+                                        <a class="dropdown-item" href="clubs-add-modify.pl?id=[% c.id | uri %]">
                                             <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit
                                         </a>
                                     </li>
                                     <li>
-                                        <a href="#" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]">
+                                        <a class="dropdown-item" href="#" class="delete_club" data-id="[% c.id | html %]" data-name="[% c.name | html %]">
                                             <i class="fa fa-trash-can"></i> Delete
                                         </a>
                                     </li>
                                 [% END %]
                                 [% IF ( c.club_enrollments.count ) %]
                                     <li>
-                                        <a href="#" class="club_hold_search" data-id="[% c.id | html %]">
+                                        <a class="dropdown-item" href="#" class="club_hold_search" data-id="[% c.id | html %]">
                                             <i class="fa fa-search"></i> Search to hold
                                         </a>
                                     </li>

koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc

@@ -20,8 +20,6 @@
 [% ELSE %]
     [% Asset.css("lib/jquery/jquery-ui-1.13.2.min.css") | $raw %]
 [% END %]
-[% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %]
-[% Asset.css("lib/bootstrap/bootstrap-theme.min.css") | $raw %]
 [% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
 [% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
 [% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]

koha-tmpl/intranet-tmpl/prog/en/includes/header.inc

@@ -7,252 +7,261 @@
 [% IF Koha.Preference( 'CookieConsent' ) %]
     [% USE JSConsents %]
 [% END %]
-<nav class="navbar">
+<nav class="navbar navbar-expand navbar-dark bg-dark">
-    <div class="navbar-header">
+    <div class="container-fluid">
-        <a href="#" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#header" aria-expanded="false" aria-controls="header">
-            <i class="fa fa-bars"></i> Menu
-        </a>
         <a id="logo" class="navbar-brand" href="/cgi-bin/koha/mainpage.pl"><img src="[% interface | html %]/[% theme | html %]/img/picto-koha.svg" alt="Koha"></a>
-    </div>
 
-    <div id="header" class="navbar-collapse collapse">
+        <div class="collapse navbar-collapse" id="header">
-        <ul id="toplevelmenu" class="nav navbar-nav">
+            <ul id="toplevelmenu" class="navbar-nav me-auto">
-            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
+                [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-            [% IF CAN_user_borrowers_edit_borrowers || CAN_user_borrowers_list_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
+                    <li class="nav-item"><a class="nav-link" href="/cgi-bin/koha/circ/circulation-home.pl"><span class="nav-link-icon"><i class="fa fa-fw fa-exchange" title="Circulation"></i></span> <span class="nav-link-text">Circulation</span></a></li>
-            <li id="catalog-search-link">
+                [% END %]
-                <a href="/cgi-bin/koha/catalogue/search.pl">Search</a>
+                [% IF CAN_user_borrowers_edit_borrowers || CAN_user_borrowers_list_borrowers %]
-            </li>
+                    <li class="nav-item"><a class="nav-link" href="/cgi-bin/koha/members/members-home.pl"><span class="nav-link-icon"><i class="fa fa-fw fa-id-card" title="Patrons"></i></span> <span class="nav-link-text">Patrons</span></a></li>
-            <li class="dropdown" id="catalog-search-dropdown">
+                [% END %]
-                <a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown"><b class="caret"></b></a>
+                <li class="nav-item" id="catalog-search-link">
-                <ul class="dropdown-menu dropdown-menu-right">
+                    <a class="nav-link" href="/cgi-bin/koha/catalogue/search.pl"><span class="nav-link-icon"><i class="fa fa-fw fa-search" title="Search"></i></span> <span class="nav-link-text">Search</span></a>
-                    [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></li>
+                </li>
-                    <li><a href="/cgi-bin/koha/catalogue/itemsearch.pl">Item search</a></li>[% END %]
+                [% IF ( CAN_user_catalogue ) %]
-                </ul>
+                    <li class="nav-item dropdown" id="catalog-search-dropdown">
-            </li>
+                        <a href="/cgi-bin/koha/catalogue/search.pl" class="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false"></a>
-            [% Koha.Preference('IntranetNav') | $raw %]
+                        <ul class="dropdown-menu dropdown-menu-dark dropdown-menu-end">
-            <li class="dropdown">
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a></li>
-                <a href="/cgi-bin/koha/mainpage.pl" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/catalogue/itemsearch.pl">Item search</a></li>
-                <ul class="dropdown-menu dropdown-menu-right">
+                        </ul>
-                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
+                    </li>
-                    [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || can_see_cataloguing_module ) %]
+                [% END %]
-                        <li><a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a></li>
+                [% Koha.Preference('IntranetNav') | $raw %]
-                    [% END %]
+                <li class="nav-item dropdown">
-                    [% IF ( CAN_user_acquisition ) %]
+                    <a href="/cgi-bin/koha/mainpage.pl" class="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false"><span class="nav-link-icon"><i class="fa fa-fw fa-bars" title="More"></i></span> <span class="nav-link-text">More</span></a>
-                        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
+                    <ul class="dropdown-menu dropdown-menu-dark dropdown-menu-end">
-                    [% END %]
+                        <li><a class="dropdown-item" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
-                    <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+                        [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || can_see_cataloguing_module  ) %]
-                    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a></li>
-                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a></li>
-                    [% END %]
-                    [% IF ( CAN_user_serials ) %]
-                        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
-                    [% END %]
-                    [% IF Koha.Preference('ERMModule') && CAN_user_erm %]
-                        <li><a href="/cgi-bin/koha/erm/erm.pl">E-resource management</a></li>
-                    [% END %]
-                    [% IF ( Koha.Preference('UseCourseReserves') ) %]
-                        <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
-                    [% END %]
-                    [% IF Koha.Preference('PreservationModule') && CAN_user_preservation %]
-                        <li><a href="/cgi-bin/koha/preservation/home.pl">Preservation</a></li>
-                    [% END %]
-                    [% IF ( CAN_user_reports ) %]
-                        <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
-                    [% END %]
-                    [% IF ( CAN_user_suggestions_suggestions_create || CAN_user_suggestions_suggestions_manage || CAN_user_suggestions_suggestions_delete ) %]
-                        <li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>
-                    [% END %]
-                    [% IF ( CAN_user_tools || CAN_user_clubs ) %]
-                        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
-                    [% END %]
-                    [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %]
-                        <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li>
-                    [% END %]
-                    [% IF ( CAN_user_parameters ) %]
-                        <li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
-                    [% END %]
-                    <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
-                </ul>
-            </li>
-        </ul>
-
-        <ul class="nav navbar-nav">
-            [% IF ( Koha.Preference('intranetbookbag') ) %]
-            <li>
-                <a href="#" id="cartmenulink"><i class="fa fa-shopping-cart"></i><span id="basketcount"></span></a>
-            </li>
-            [% END %]
-        </ul>
-
-        <ul id="user-menu" class="nav navbar-nav navbar-right">
-            [% IF ( loggedinusername ) %]
-            <li class="dropdown" id="logged-in-dropdown">
-                <a href="#" id="logged-in-menu" role="button" class="dropdown-toggle" data-toggle="dropdown">
-                    <span id="logged-in-info-brief">
-                        <i class="fa fa-user"></i>
-                    </span>
-                    <span id="logged-in-info-full">
-                        [% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %]
-                        <span class="loggedinusername [% is_superlibrarian | html %]">[% logged_in_user.userid | html %]</span>
-                        <span class="loggedincategorycode content_hidden">[% logged_in_user.categorycode | html %]</span>
-                        [% IF ( StaffLoginRestrictLibraryByIP ) %]
-                            <brand>
-                                [% Branches.GetLoggedInBranchname | html %]
-                            </brand>
-                        [% ELSE %]
-                            <strong>
-                                <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span>
-                                <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
-                            </strong>
                         [% END %]
-                        [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
+                        [% IF ( CAN_user_acquisition ) %]
-                            <span class="separator">|</span>
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
-                            <strong>
+                        [% END %]
-                                [% IF ( Desks.GetLoggedInDeskName == '' ) %]
+                        <li><a class="dropdown-item" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-                                   <span class="logged-in-desk-name">NO DESK SET</span>
+                        [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a></li>
+                        [% END %]
+                        [% IF ( CAN_user_serials ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+                        [% END %]
+                        [% IF Koha.Preference('ERMModule') && CAN_user_erm %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/erm/erm.pl">E-resource management</a></li>
+                        [% END %]
+                        [% IF ( Koha.Preference('UseCourseReserves') ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
+                        [% END %]
+                        [% IF Koha.Preference('PreservationModule') && CAN_user_preservation %]
+                            <li><a href="/cgi-bin/koha/preservation/home.pl">Preservation</a></li>
+                        [% END %]
+                        [% IF ( CAN_user_reports ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
+                        [% END %]
+                        [% IF ( CAN_user_suggestions_suggestions_manage ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>
+                        [% END %]
+                        [% IF ( CAN_user_tools || CAN_user_clubs ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
+                        [% END %]
+                        [% IF ( Koha.Preference('EnablePointOfSale') && Koha.Preference('UseCashRegisters') && CAN_user_cash_management_takepayment ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li>
+                        [% END %]
+                        [% IF ( CAN_user_parameters ) %]
+                            <li><a class="dropdown-item" href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
+                        [% END %]
+                        <li><a class="dropdown-item" href="/cgi-bin/koha/about.pl">About Koha</a></li>
+                    </ul>
+                </li>
+                [% IF ( Koha.Preference('intranetbookbag') ) %]
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" id="cartmenulink"><i class="fa fa-shopping-cart" title="Cart"></i><span id="basketcount"></span></a>
+                    </li>
+                [% END %]
+            </ul>
+
+
+            <ul id="user-menu" class="nav navbar-nav">
+                [% IF ( loggedinusername ) %]
+                    <li class="nav-item dropdown" id="logged-in-dropdown">
+                        <a id="logged-in-menu" href="/cgi-bin/koha/mainpage.pl" class="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <span id="logged-in-info-brief">
+                                <i class="fa fa-user"></i>
+                            </span>
+                            <span id="logged-in-info-full">
+                                [% SET is_superlibrarian = CAN_user_superlibrarian ? 'is_superlibrarian' : '' %]
+                                <span class="loggedinusername [% is_superlibrarian | html %]">[% logged_in_user.userid | html %]</span>
+                                 <span class="loggedincategorycode content_hidden">[% logged_in_user.categorycode | html %]</span>
+                                [% IF ( StaffLoginRestrictLibraryByIP ) %]
+                                    <brand>
+                                        [% Branches.GetLoggedInBranchname | html %]
+                                    </brand>
                                 [% ELSE %]
-                                    <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
+                                    <strong>
-                                    <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
+                                        <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span>
+                                        <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
+                                    </strong>
                                 [% END %]
-                            </strong>
+                                [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
-                        [% END %]
+                                    <span class="separator">|</span>
-                        [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
+                                    <strong>
-                            <span class="separator">|</span>
+                                        [% IF ( Desks.GetLoggedInDeskName == '' ) %]
-                            <strong>
+                                        <span class="logged-in-desk-name">NO DESK SET</span>
-                                <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span>
+                                        [% ELSE %]
-                                <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span>
+                                            <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
-                            </strong>
+                                            <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
-                        [% END %]
-                    </span>
-                    <b class="caret"></b>
-                </a>
-                <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="logged-in-menu">
-
-                    <li class="loggedin-menu-label">
-                        Logged in as:<br />
-                        <span class="loggedinusername">[% logged_in_user.userid | html %]</span>
-                    </li>
-                    <li class="loggedin-menu-label">
-                        [% IF ( StaffLoginRestrictLibraryByIP ) %]
-                            <brand>
-                                [% Branches.GetLoggedInBranchname | html %]
-                            </brand>
-                        [% ELSE %]
-                            Location: <br />
-                            <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span>
-                            <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
-                        [% END %]
-                    </li>
-
-                    [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
-                    <li class="loggedin-menu-label">
-                        Desk: <br />
-                        [% IF ( Desks.GetLoggedInDeskName == '' ) %]
-                           <span class="logged-in-desk-name">NO DESK SET</span>
-                        [% ELSE %]
-                            <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
-                            <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
-                        [% END %]
-                    </li>
-                    [% END %]
-
-                    [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
-                        <li class="loggedin-menu-label">
-                            Register: <br />
-                            <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span>
-                            <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span>
-                        </li>
-                    [% END %]
-
-                    [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary || Koha.Preference('UseCirculationDesks') || Koha.Preference('UseCashRegisters') ) %]
-                        <li role="separator" class="loggedin-menu-label divider"></li>
-                        <li>
-                            <div id="set_library_controls">
-                                <div>
-                                    <a class="btn btn-link" href="/cgi-bin/koha/circ/set-library.pl">
-                                        [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary ) %]
-                                            [% IF ( Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') ) %]
-                                                [% t("Set library, desk, and register") | html %]
-                                            [% ELSIF ( Koha.Preference('UseCirculationDesks') ) %]
-                                                [% t("Set library and desk") | html %]
-                                            [% ELSIF ( Koha.Preference('UseCashRegisters') ) %]
-                                                [% t("Set library and cash register") | html %]
-                                            [% ELSE %]
-                                                [% t("Set library") | html %]
-                                            [% END %]
-                                        [% ELSIF ( Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') ) %]
-                                            [% t("Set desk and cash register") | html %]
-                                        [% ELSIF ( Koha.Preference('UseCashRegisters') ) %]
-                                            [% t("Set cash register") | html %]
-                                        [% ELSIF ( Koha.Preference('UseCirculationDesks') ) %]
-                                            [% t("Set desk") | html %]
                                         [% END %]
-                                    </a>
+                                    </strong>
-                                </div>
-                                [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary || Koha.Preference('UseCirculationDesks') || Koha.Preference('UseCashRegisters') ) %]
-                                    <div>
-                                        <a id="branch_select_cog" class="btn btn-link" href="#"><i class="fa fa-cog" aria-label="Toggle panel for login settings"></i></a>
-                                    </div>
                                 [% END %]
-                            </div>
+                                [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
-                        </li>
+                                    <span class="separator">|</span>
+                                    <strong>
+                                        <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span>
+                                        <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span>
+                                    </strong>
+                                [% END %]
+                            </span>
+                            <b class="caret"></b>
+                        </a>
 
-                        <li id="setlibrary_panel" style="display:none"></li>
+                        <ul class="dropdown-menu dropdown-menu-dark dropdown-menu-end" role="menu" aria-labelledby="logged-in-menu">
-                        <li>
+                            <li class="loggedin-menu-label">
-                    [% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
+                                Logged in as:<br />
-                        <li role="separator" class="loggedin-menu-label divider"></li>
+                                <span class="loggedinusername">[% logged_in_user.userid | html %]</span>
-                        <li>
+                            </li>
-                            <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a>
+                            <li class="loggedin-menu-label">
-                        </li>
+                                [% IF ( StaffLoginRestrictLibraryByIP ) %]
-                    [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                                    <brand>
-                        <li role="separator" class="loggedin-menu-label divider"></li>
+                                        [% Branches.GetLoggedInBranchname | html %]
-                        <li>
+                                    </brand>
-                            <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
+                                [% ELSE %]
-                        </li>
+                                    Location: <br />
-                    [% ELSIF Koha.Preference('UseCashRegisters') %]
+                                    <span class="logged-in-branch-name">[% Branches.GetLoggedInBranchname | html %]</span>
-                        <li role="separator" class="loggedin-menu-label divider"></li>
+                                    <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
-                        <li>
+                                [% END %]
-                            <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a>
+                            </li>
-                        </li>
-                    [% END %]
-                    [% IF EnableSearchHistory %]
-                        <li>
-                            <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
-                        </li>
-                    [% END %]
 
-                    [% IF loggedinusernumber %]
+                            [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
-                        <li class ="toplinks-myaccount">
+                                <li class="loggedin-menu-label">
-                            <a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber | html %]">My account</a>
+                                    Desk: <br />
-                        </li>
+                                    [% IF ( Desks.GetLoggedInDeskName == '' ) %]
-                        <li class="toplinks-mycheckouts">
+                                        <span class="logged-in-desk-name">NO DESK SET</span>
-                            <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber | html %]">My checkouts</a>
+                                    [% ELSE %]
-                        </li>
+                                        <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
-                        <li class="toplinks-mylists">
+                                        <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
-                            <a class="toplinks" href="/cgi-bin/koha/virtualshelves/shelves.pl">My lists</a>
+                                    [% END %]
-                        </li>
+                                </li>
-                    [% END %]
+                            [% END %]
-                    [% IF Koha.Preference( 'CookieConsent' ) %]
+
-                        <li class="toplinks-myconsents">
+                            [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
-                            <a id="viewCookieConsents" href="#" class="toplinks">My consents</a>
+                                <li class="loggedin-menu-label">
-                        </li>
+                                    Register: <br />
-                    [% END %]
+                                    <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span>
-                    <li>
+                                    <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span>
-                        <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
+                                </li>
+                            [% END %]
+
+                            [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary || Koha.Preference('UseCirculationDesks') || Koha.Preference('UseCashRegisters') ) %]
+                                <li><hr class="dropdown-divider"></li>
+                                <li>
+                                    <div id="set_library_controls">
+                                        <div>
+                                            <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">
+                                                [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary ) %]
+                                                    [% IF ( Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') ) %]
+                                                        [% t("Set library, desk, and register") | html %]
+                                                    [% ELSIF ( Koha.Preference('UseCirculationDesks') ) %]
+                                                        [% t("Set library and desk") | html %]
+                                                    [% ELSIF ( Koha.Preference('UseCashRegisters') ) %]
+                                                        [% t("Set library and cash register") | html %]
+                                                    [% ELSE %]
+                                                        [% t("Set library") | html %]
+                                                    [% END %]
+                                                [% ELSIF ( Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') ) %]
+                                                    [% t("Set desk and cash register") | html %]
+                                                [% ELSIF ( Koha.Preference('UseCashRegisters') ) %]
+                                                    [% t("Set cash register") | html %]
+                                                [% ELSIF ( Koha.Preference('UseCirculationDesks') ) %]
+                                                    [% t("Set desk") | html %]
+                                                [% END %]
+                                            </a>
+                                        </div>
+                                        [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary || Koha.Preference('UseCirculationDesks') || Koha.Preference('UseCashRegisters') ) %]
+                                            <div>
+                                                <a id="branch_select_cog" class="dropdown-item" href="#"><i class="fa fa-cog" aria-label="Toggle panel for login settings"></i></a>
+                                            </div>
+                                        [% END %]
+                                    </div>
+                                </li>
+
+                                <li id="setlibrary_panel" style="display:none"></li>
+                                <li>
+                                <li>
+                                    [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
+                                        <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a>
+                                    [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                                        <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
+                                    [% ELSIF Koha.Preference('UseCashRegisters') %]
+                                        <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a>
+                                    [% ELSE %]
+                                        <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
+                                    [% END %]
+                                </li>
+                            [% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
+                                <li><hr class="dropdown-divider"></li>
+                                <li>
+                                    <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a>
+                                </li>
+                            [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                                <li><hr class="dropdown-divider"></li>
+                                <li>
+                                    <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
+                                </li>
+                            [% ELSIF Koha.Preference('UseCashRegisters') %]
+                                <li><hr class="dropdown-divider"></li>
+                                <li>
+                                    <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a>
+                                </li>
+                            [% END %]
+                            [% IF EnableSearchHistory %]
+                                <li>
+                                    <a class="dropdown-item" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
+                                </li>
+                            [% END %]
+
+                            [% IF loggedinusernumber %]
+                                <li class="nav-item toplinks-myaccount">
+                                    <a class="dropdown-item" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber | html %]">My account</a>
+                                </li>
+                                <li class="nav-item toplinks-mycheckouts">
+                                    <a class="dropdown-item" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber | html %]">My checkouts</a>
+                                </li>
+                            [% END %]
+
+                            [% IF Koha.Preference( 'CookieConsent' ) && JSConsents.all('staffConsent').size %]
+                                <li class="nav-item toplinks-myconsents">
+                                    <a id="viewCookieConsents" href="#" class="toplinks dropdown-item">My consents</a>
+                                </li>
+                            [% END %]
+                            <li class="nav-item">
+                                <a id="logout" class="toplinks dropdown-item" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
+                            </li>
+                        </ul>
                     </li>
-                </ul>
+                    [% INCLUDE 'langmenu-staff-top.inc' %]
-            </li>
-            [% INCLUDE 'langmenu-staff-top.inc' %]
 
-            [% ELSE %]
+                [% ELSE %]
-            <li class="loggedout">
+                    <li class="nav-item loggedout">
-                <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
+                        <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
-            </li>
+                    </li>
-            [% END %]
+                [% END %]
-        </ul>
+            </ul>
+        </div>
     </div>
 
-
     [% IF ( Koha.Preference('intranetbookbag') ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
 
 </nav>

koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc

@@ -388,21 +388,26 @@
 [% END %]
 
 [% BLOCK tab_item %]
+    <li class="nav-item" role="presentation">
     [% IF ( bt_active ) %]
-        <li role="presentation" class="active">
-    [% ELSE %]
-        <li role="presentation">
-    [% END %]
         [% IF (linktab) %]
-            <a href="?tab=[% tabname | url %]" id="[% tabname | uri %]-tab">
+            <a class="nav-link active" href="?tab=[% tabname | url %]" id="[% tabname | uri %]-tab">
         [% ELSE %]
-            <a href="#[% tabname | uri %]_panel" id="[% tabname | uri %]-tab" data-tabname="[% tabname | uri %]" aria-controls="[% tabname | uri %]_panel" role="tab" data-toggle="tab">
+            <a class="nav-link active" href="#[% tabname | uri %]_panel" id="[% tabname | uri %]-tab" data-tabname="[% tabname | uri %]" aria-controls="[% tabname | uri %]_panel" role="tab" data-bs-toggle="tab" data-bs-target="#[% tabname | uri %]_panel">
         [% END %]
+    [% ELSE %]
+        [% IF (linktab) %]
+            <a class="nav-link" href="?tab=[% tabname | url %]" id="[% tabname | uri %]-tab">
+        [% ELSE %]
+            <a class="nav-link" href="#[% tabname | uri %]_panel" id="[% tabname | uri %]-tab" data-tabname="[% tabname | uri %]" aria-controls="[% tabname | uri %]_panel" role="tab" data-bs-toggle="tab" data-bs-target="#[% tabname | uri %]_panel">
+        [% END %]
+    [% END %]
             [% content | $raw %]
         </a>
     </li>
 [% END %]
 
+
 [% BLOCK tab_panels %]
     <div class="tab-content">
         [% content | $raw %]
@@ -411,9 +416,9 @@
 
 [% BLOCK tab_panel %]
     [% IF ( bt_active ) %]
-        <div role="tabpanel" class="tab-pane active" id="[% tabname | html %]_panel">
+        <div class="tab-pane show active" id="[% tabname | html %]_panel" role="tabpanel" aria-labelledby="[% tabname | html %]" tabindex="0">
     [% ELSE %]
-        <div role="tabpanel" class="tab-pane" id="[% tabname | html %]_panel">
+        <div class="tab-pane" id="[% tabname | html %]_panel" role="tabpanel" aria-labelledby="[% tabname | html %]" tabindex="0">
     [% END %]
         [% content| $raw %]
     </div>
@@ -452,8 +457,8 @@
 
 [% # Used to build breadcrumb navigation nav %]
 [% BLOCK breadcrumbs %]
-    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
+    <nav id="breadcrumbs" aria-label="Breadcrumb">
-        <ol>
+        <ol class="breadcrumb">
             [%# Include the Home link every time %]
             [% WRAPPER breadcrumb_item %]
                 <a href="/cgi-bin/koha/mainpage.pl" title="Home">Home</a>
@@ -466,13 +471,13 @@
 [%# Used to build individual breadcrumb items in the breadcrumb nav %]
 [% BLOCK breadcrumb_item %]
     [% IF ( bc_active ) %]
-        <li>
+        <li class="breadcrumb-item active" aria-current="page">
-            <a href="#" aria-current="page">
+            <a href="#">
                 [% content | $raw %]
             </a>
         </li>
     [% ELSE %]
-        <li>
+        <li class="breadcrumb-item">
             [% content | $raw %]
         </li>
     [% END %]
@@ -504,7 +509,7 @@
 [% BLOCK accordion_heading %]
     <div class="panel-heading" role="tab" id="[% panel_id | $raw %]_heading">
         <h2 class="panel-title">
-            <a id="[% panel_id | $raw %]Toggle" href="#[% panel_id | $raw %]_panel" class="collapsed" role="button" data-toggle="collapse" data-parent="#[% panelgroup_id | $raw %]_group" aria-expanded="false" aria-controls="[% panel_id | $raw %]_panel">
+            <a id="[% panel_id | $raw %]Toggle" href="#[% panel_id | $raw %]_panel" class="collapsed" role="button" data-bs-toggle="collapse" data-parent="#[% panelgroup_id | $raw %]_group" aria-expanded="false" aria-controls="[% panel_id | $raw %]_panel">
                 [% content | $raw %]
             </a>
         </h2>

koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc

@@ -755,7 +755,7 @@
                     if ( can_edit_items_from.includes(row.home_library_id) || !can_edit_items_from.length ){
                         [% IF Koha.Preference('LocalCoverImages') OR Koha.Preference('OPACLocalCoverImages') %]
                             nodes += '<div class="btn-group">';
-                            nodes += ' <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=%s&itemnumber=%s#edititem"><i class="fa-solid fa-pencil"></i> %s</a><a class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>'.format(row.biblio_id, row.item_id, _("Edit"));
+                            nodes += ' <a class="btn btn-default btn-xs" href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=%s&itemnumber=%s#edititem"><i class="fa-solid fa-pencil"></i> %s</a><a class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown"><span class="caret"></span></a>'.format(row.biblio_id, row.item_id, _("Edit"));
                             nodes += ' <ul class="dropdown-menu pull-right">';
                             nodes += '  <li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?itemnumber=%s&amp;filetype=image"><i class="fa fa-upload"></i> %s</a></li>'.format(row.item_id, _("Upload image"));
                             nodes += ' </ul>';

koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal.inc

@@ -1,11 +1,11 @@
 [% PROCESS 'html_helpers.inc' %]
 <div id="ill-batch-details" style="display:none"></div>
-<div id="ill-batch-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="ill-batch-modal-label" aria-hidden="true">
+<div id="ill-batch-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="ill-batch-modal-label" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+                <h1 class="modal-title" id="ill-batch-modal-label"></h1>
-                <h3 id="ill-batch-modal-label"></h3>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <div id="batch-form">
@@ -89,7 +89,7 @@
             </div>
             <div class="modal-footer">
                 <div id="lhs">
-                    <button class="btn btn-default" data-dismiss="modal" aria-hidden="false">Cancel</button>
+                    <button class="btn btn-default" data-bs-dismiss="modal" aria-hidden="false">Cancel</button>
                 </div>
                 <div id="rhs">
                     <button id="button_create_batch" class="btn btn-default" aria-hidden="true" disabled>Continue</button>

koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc

@@ -4,12 +4,12 @@
         [% IF backends_available %]
           [% IF backends.size > 1 %]
             <div class="dropdown btn-group">
-                <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                <button class="btn btn-default dropdown-toggle" type="button" id="ill-backend-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                    <i class="fa fa-plus"></i> New ILL request <span class="caret"></span>
+                    <i class="fa fa-plus"></i> New ILL request
                 </button>
                 <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown">
                     [% FOREACH backend IN backends %]
-                        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
+                        <li><a class="dropdown-item" href="/cgi-bin/koha/ill/ill-requests.pl?method=create&amp;backend=[% backend | uri %]">[% backend | html %]</a></li>
                     [% END %]
                 </ul>
             </div>
@@ -35,12 +35,12 @@
         [% IF have_batch.size > 0 && metadata_enrichment_services %]
         <div id="ill-batch">
             <div class="dropdown btn-group">
-                <button class="btn btn-default dropdown-toggle" type="button" id="ill-batch-backend-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                <button class="btn btn-default dropdown-toggle" type="button" id="ill-batch-backend-dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                    <i class="fa fa-plus"></i> New ILL requests batch <span class="caret"></span>
+                    <i class="fa fa-plus"></i> New ILL requests batch
                 </button>
                 <ul class="dropdown-menu" aria-labelledby="ill-batch-backend-dropdown">
                     [% FOREACH backend IN have_batch %]
-                        <li><a href="#" role="button" onclick="window.openBatchModal(null, '[% backend | html %]')">[% backend | html %]</a></li>
+                        <li><a class="dropdown-item" href="#" role="button" onclick="window.openBatchModal(null, '[% backend | html %]')">[% backend | html %]</a></li>
                     [% END %]
                 </ul>
             </div>

koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc

@@ -2,7 +2,6 @@
 [% USE Asset %]
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
-[% Asset.css("lib/bootstrap/bootstrap.min.css") | $raw %]
 [% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
 [% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
 [% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]

koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc

@@ -3,7 +3,7 @@
         [% Asset.js("lib/jquery/jquery-3.6.0.min.js") | $raw %]
         [% Asset.js("lib/jquery/jquery-migrate-3.3.2.min.js") | $raw %]
         [% Asset.js("lib/jquery/jquery-ui-1.13.2.min.js") | $raw %]
-        [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
+        [% Asset.js("lib/bootstrap/bootstrap.bundle.min.js") | $raw %]
         [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
         <!-- installer-intranet-bottom.inc -->
         <script>

koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc

@@ -11,149 +11,164 @@
         </div>
 [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %]
     [% UNLESS ( one_language_enabled ) %]
-        <div id="changelanguage" class="navbar navbar-default navbar-fixed-bottom">
+        <div id="changelanguage" class="navbar navbar-expand navbar-light bg-light">
             <div class="container-fluid">
-        <ul id="i18nMenu" class="nav navbar-nav">
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-        [% FOREACH languages_loo IN languages_loop %]
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse">
+                    <ul id="i18nMenu" class="navbar-nav me-auto">
+                        [% FOREACH languages_loo IN languages_loop %]
+                            [% IF ( languages_loo.group_enabled ) %]
+                                [% IF ( languages_loo.plural ) %]
+                                    <li class="nav-item dropup">
+                                        <a class="nav-link dropdown-toggle" id="show[% languages_loo.rfc4646_subtag | html %]" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                            [% IF ( languages_loo.native_description ) %]
+                                                [% languages_loo.native_description | html %]
+                                            [% ELSE %]
+                                                [% languages_loo.rfc4646_subtag | html %]
+                                            [% END %]
+                                            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
+                                                [% IF ( sublanguages_loo.enabled ) %]
+                                                    [% IF ( sublanguages_loo.sublanguage_current ) %]
+                                                        <span class="sublanguage-selected">([% sublanguages_loo.rfc4646_subtag | html %])</span>
+                                                    [% END %]
+                                                [% END %]
+                                            [% END %]
+                                        </a>
+                                        <ul id="sub[% languages_loo.rfc4646_subtag | html %]" class="dropdown-menu dropdown-menu-left">
+                                            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
+                                                [% IF ( sublanguages_loo.enabled ) %]
+                                                    [% IF ( sublanguages_loo.sublanguage_current ) %]
+                                                        <li>
+                                                            <a class="nav-link currentlanguage" href="#">
+                                                                [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])
+                                                            </a>
+                                                        </li>
+                                                    [% ELSE %]
+                                                        <li>
+                                                            <a class="dropdown-item" href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]">
+                                                                [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])
+                                                            </a>
+                                                        </li>
+                                                    [% END %]
+                                                [% END %]
+                                            [% END %]
+                                        </ul>
+                                    </li>
+                                [% ELSE %]
+                                    [% IF ( languages_loo.group_enabled ) %]
+                                        [% IF ( languages_loo.current ) %]
+                                            <li class="nav-item">
+                                                <a class="nav-link active currentlanguage" aria-current="page" href="#">
+                                                    [% IF ( languages_loo.native_description ) %]
+                                                        [% languages_loo.native_description | html %]
+                                                    [% ELSE %]
+                                                        [% languages_loo.rfc4646_subtag | html %]
+                                                    [% END %]
+                                                </a>
+                                            </li>
+                                        [% ELSE %]
+                                            <li class="nav-item">
+                                                <a class="nav-link" href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">
+                                                    [% IF ( languages_loo.native_description ) %]
+                                                        [% languages_loo.native_description | html %]
+                                                    [% ELSE %]
+                                                        [% languages_loo.rfc4646_subtag | html %]
+                                                    [% END %]
+                                                </a>
+                                            </li>
+                                        [% END # /IF ( languages_loo.current ) %]
+                                    [% END # /IF ( languages_loo.group_enabled ) %]
+                                [% END # /IF ( languages_loo.plural ) %]
+                            [% END # /IF ( languages_loo.group_enabled ) %]
+                        [% END # /FOREACH languages_loo %]
+                    </ul> <!-- /#i18nMenu -->
+                </div> <!-- /.navbar-collapse -->
+            </div> <!-- /.container-fluid -->
+        </div> <!-- /#changelanguage -->
+    [% END # /UNLESS ( one_language_enabled ) %]
+[% END # /IF ( ( languages_loop )... %]
 
-            [% IF ( languages_loo.group_enabled ) %]
+<span id="audio-alert"></span>
-            [% IF ( languages_loo.plural ) %]
-                <li class="dropdown"><a class="dropdown-toggle dropup" data-toggle="dropdown" id="show[% languages_loo.rfc4646_subtag | html %]" href="#">
-                    [% IF ( languages_loo.native_description ) %]
-                        [% languages_loo.native_description | html %]
-                    [% ELSE %]
-                        [% languages_loo.rfc4646_subtag | html %]
-                    [% END %]
-                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
-                        [% IF ( sublanguages_loo.enabled ) %]
-                            [% IF ( sublanguages_loo.sublanguage_current ) %]
-                                <span class="sublanguage-selected">([% sublanguages_loo.rfc4646_subtag | html %])</span>
-                            [% END %]
-                        [% END %]
-                    [% END %]
-                <span class="caret"></span></a>
-            <ul id="sub[% languages_loo.rfc4646_subtag | html %]" class="dropdown-menu dropdown-menu-left">
-            [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
-        [% IF ( sublanguages_loo.enabled ) %]
-                [% IF ( sublanguages_loo.sublanguage_current ) %]
-                    <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li>
-                [% ELSE %]
-                <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li>
-        [% END %]
-                [% END %]
 
-            [% END %]
+<!-- Cookie consent -->
-            </ul></li>
+[% IF Koha.Preference( 'CookieConsent' ) %]
-
+    <!-- Cookie consent bar -->
-            [% ELSE %]
+    <div id="cookieConsentBar" aria-hidden="true">
-            [% IF ( languages_loo.group_enabled ) %]
+        [% IF ( CookieConsentBar && CookieConsentBar.content && CookieConsentBar.content.count >0 ) %]
-                [% IF ( languages_loo.current ) %]
+            <div id="cookieConsentBar_content">
-                    <li class="navbar-text">
+                [%- FOREACH item IN CookieConsentBar.content -%]
-                        [% IF ( languages_loo.native_description ) %]
+                    [%- item.content | $raw -%]
-                            <span class="currentlanguage">[% languages_loo.native_description | html %]</span>
+                [%- END -%]
-                        [% ELSE %]
-                            <span class="currentlanguage">[% languages_loo.rfc4646_subtag | html %]</span>
-                        [% END %]
-                    </li>
-                [% ELSE %]
-                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">
-                        [% IF ( languages_loo.native_description ) %]
-                            [% languages_loo.native_description | html %]
-                        [% ELSE %]
-                            [% languages_loo.rfc4646_subtag | html %]
-                        [% END %]
-                    </a></li>
-                [% END %]
-        [% END %]
-            [% END %]
-            [% END %]
-
-        [% END %]
-        </ul>
-        </div>
-        </div>
-    [% END %]
-[% END %]
-    <span id="audio-alert"></span>
-    [% IF ( footerjs ) %]
-        [% INCLUDE js_includes.inc %]
-        [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
-    [% END %]
-[% KohaPlugins.get_plugins_intranet_js | $raw %]
-
-    <!-- Cookie consent -->
-    [% IF Koha.Preference( 'CookieConsent' ) %]
-        <!-- Cookie consent bar -->
-        <div id="cookieConsentBar" aria-hidden="true">
-            [% IF ( CookieConsentBar && CookieConsentBar.content && CookieConsentBar.content.count >0 ) %]
-                <div id="cookieConsentBar_content">
-                    [%- FOREACH item IN CookieConsentBar.content -%]
-                        [%- item.content | $raw -%]
-                    [%- END -%]
-                </div>
-            [% END %]
-            <div class="consentButtons">
-                [% IF ( JSConsents.all('staffConsent').size ) %]
-                    <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
-                [% END %]
-                <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
-                <button type="button" class="btn btn-default" id="consentMoreInfo">More information</button>
             </div>
-        </div> <!-- /#cookieConsentBar -->
+        [% END %]
-        <!-- Cookie consent modal -->
+        <div class="consentButtons">
-        <div id="cookieConsentModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="cookieConsentModalLabel" aria-hidden="true">
+            [% IF ( JSConsents.all('staffConsent').size ) %]
-            <div class="modal-dialog">
+                <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
-                <div class="modal-content">
+            [% END %]
-                    <div class="modal-header">
+            <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
-                        <h2 class="modal-title" id="cookieConsentModalLabel">Cookies policy</h2>
+            <button type="button" class="btn btn-default" id="consentMoreInfo">More information</button>
-                    </div>
+        </div>
-                    <div class="modal-body">
+    </div> <!-- /#cookieConsentBar -->
-                        [% IF ( CookieConsentPopup && CookieConsentPopup.content && CookieConsentPopup.content.count >0 ) %]
+
-                            <div id="cookieConsentPopupText">
+    <!-- Cookie consent modal -->
-                                [%- FOREACH item IN CookieConsentPopup.content -%]
+    <div id="cookieConsentModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="cookieConsentModalLabel" aria-hidden="true">
-                                    [%- item.content | $raw -%]
+        <div class="modal-dialog modal-lg">
-                                [%- END -%]
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h1 class="modal-title" id="cookieConsentModalLabel">Cookies policy</h1>
+                </div>
+                <div class="modal-body">
+                    [% IF ( CookieConsentPopup && CookieConsentPopup.content && CookieConsentPopup.content.count >0 ) %]
+                        <div id="cookieConsentPopupText">
+                            [%- FOREACH item IN CookieConsentPopup.content -%]
+                                [%- item.content | $raw -%]
+                            [%- END -%]
+                        </div>
+                    [% END %]
+                    <div id="consentCookieList">
+                        [% consents = JSConsents.all('staffConsent') %]
+                        [% FOREACH consent IN consents %]
+                            <div class="consentModalItem">
+                                <div class="consentItemCheckbox">
+                                    <input class="consentCheckbox" type="checkbox" name="consentCheckbox" value="[% consent.id | html %]" aria-label="Consent to cookie">
+                                </div>
+                                <div class="consentItemMeta">
+                                    <div class="consentItemName">[% consent.name | html %]</div>
+                                    <div class="consentItemDescription">[% consent.description | html %]</div>
+                                </div>
                             </div>
                         [% END %]
-                        <div id="consentCookieList">
-                            [% consents = JSConsents.all('staffConsent') %]
-                            [% FOREACH consent IN consents %]
-                                <div class="consentModalItem">
-                                    <div class="consentItemCheckbox">
-                                        <input class="consentCheckbox" type="checkbox" name="consentCheckbox" value="[% consent.id | html %]" aria-label="Consent to cookie">
-                                    </div>
-                                    <div class="consentItemMeta">
-                                        <div class="consentItemName">[% consent.name | html %]</div>
-                                        <div class="consentItemDescription">[% consent.description | html %]</div>
-                                    </div>
-                                </div>
-                            [% END %]
-                        </div>
                     </div>
-                    <div class="modal-footer">
+                </div>
-                        <div class="consentButtons">
+                <div class="modal-footer">
-                            <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
+                    <div id="consentButtons">
-                            [% IF ( JSConsents.all('staffConsent').size ) %]
+                        <button type="button" class="btn btn-primary consentAcceptEssential">Accept essential cookies</button>
-                                <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
+                        [% IF ( JSConsents.all('staffConsent').size ) %]
-                                <button type="button" class="btn btn-success" id="consentAcceptSelected">Accept selected non-essential cookies</button>
+                            <button type="button" class="btn btn-primary consentAcceptAll">Accept all cookies</button>
-                            [% END %]
+                            <button type="button" class="btn btn-success" id="consentAcceptSelected">Accept selected non-essential cookies</button>
-                            <a type="button" href="#" class="btn btn-secondary consentCloseModal">Cancel</a>
+                        [% END %]
-                        </div>
+                        <a type="button" href="#" class="btn btn-secondary consentCloseModal">Cancel</a>
                     </div>
-                </div> <!-- /.modal-content -->
+                </div>
-            </div> <!-- /.modal-dialog -->
+            </div> <!-- /.modal-content -->
-        </div>  <!-- /#cookieConsentModal  -->
+        </div> <!-- /.modal-dialog -->
-    [% END %]
+    </div>  <!-- /#cookieConsentModal  -->
-    <!-- CookieConsentedJS code that may run -->
+[% END %]
-    [% IF Koha.Preference( 'CookieConsent' ) && JSConsents.all('staffConsent').size %]
+<!-- CookieConsentedJS code that may run -->
-        [% consents = JSConsents.all('staffConsent') %]
+[% IF Koha.Preference( 'CookieConsent' ) && JSConsents.all('staffConsent').size %]
-        [% FOREACH consent IN consents %]
+    [% consents = JSConsents.all('staffConsent') %]
-            <div class="consentCode" style="display:none" aria-hidden="true" data-consent-id="[% consent.id | html %]" data-consent-code="[% consent.code | html %]" data-consent-match-pattern="[% consent.matchPattern | html %]" data-consent-cookie-domain="[% consent.cookieDomain | html %]" data-consent-cookie-path="[% consent.cookiePath | html %]" data-requires-consent="[% consent.staffConsent ? 'true' : 'false' | html %]"></div>
+    [% FOREACH consent IN consents %]
-        [% END %]
+        <div class="consentCode" style="display:none" aria-hidden="true" data-consent-id="[% consent.id | html %]" data-consent-code="[% consent.code | html %]" data-consent-match-pattern="[% consent.matchPattern | html %]" data-consent-cookie-domain="[% consent.cookieDomain | html %]" data-consent-cookie-path="[% consent.cookiePath | html %]" data-requires-consent="[% consent.staffConsent ? 'true' : 'false' | html %]"></div>
-    [% END %]
-    [% IF Koha.Preference( 'CookieConsent' ) %]
-        [% Asset.js("js/cookieconsent.js") | $raw %]
     [% END %]
+[% END %]
+
+[% IF ( footerjs ) %]
+    [% INCLUDE js_includes.inc %]
+    [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
+[% END %]
+[% KohaPlugins.get_plugins_intranet_js | $raw %]
 
 </body>
 </html>

koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc

@@ -22,7 +22,7 @@
 [% Asset.js("lib/shortcut/shortcut.js") | $raw %]
 [% Asset.js("lib/js-cookie/js.cookie-2.2.1.min.js") | $raw %]
 [% Asset.js("lib/jquery/plugins/jquery.highlight-5.js") | $raw %]
-[% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
+[% Asset.js("lib/bootstrap/bootstrap.bundle.min.js") | $raw %]
 [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
 <!-- koha core js -->
 [% Asset.js("js/staff-global.js") | $raw %]
@@ -91,4 +91,8 @@
     });
     </script>
 [% END %]
+
+[% IF Koha.Preference( 'CookieConsent' ) %]
+    [% Asset.js("js/cookieconsent.js") | $raw %]
+[% END %]
 <!-- / js_includes.inc -->

koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc

@@ -1,21 +1,21 @@
 <div id="toolbar" class="btn-toolbar">
     <div class="btn-group">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
+        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-plus"></i> New</button>
         <ul class="dropdown-menu">
-            <li><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">Label template</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">Label template</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">Printer profile</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">Printer profile</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-edit-range.pl">Barcode range</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-range.pl">Barcode range</a></li>
         </ul>
     </div>
     <div class="btn-group">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Manage <span class="caret"></span></button>
+        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Manage</button>
         <ul class="dropdown-menu">
-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a></li>
-            <li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a></li>
         </ul>
     </div>
 </div>

koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc

@@ -1,31 +1,39 @@
 
 [% IF ( ( ! one_language_enabled ) && ( languages_loop ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'top') ) %]
-<li class="dropdown">
+    <li class="nav-item dropdown">
-    <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="fa fa-flag"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
+        <a href="#" title="Switch languages" class="nav-link dropdown-toggle" id="langmenu" data-bs-toggle="dropdown" role="button"><i class="fa fa-fw fa-flag" aria-hidden="true"></i> <span class="langlabel nav-link-text">Languages</span> </a>
-    <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-left">
+        <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu dropdown-menu-dark dropdown-menu-end">
-    [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
+        [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
-        [% IF ( languages_loo.group_enabled ) %]
+            [% IF ( languages_loo.group_enabled ) %]
-            [% IF ( languages_loo.plural ) %]
+                [% IF ( languages_loo.plural ) %]
-                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
+                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
-                    [% IF ( sublanguages_loo.enabled ) %]
+                        [% IF ( sublanguages_loo.enabled ) %]
-                        [% IF ( sublanguages_loo.sublanguage_current ) %]
+                            [% IF ( sublanguages_loo.sublanguage_current ) %]
-                            <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a></li>
+                                <li role="presentation" class="nav-item">
+                                    <a href="#" tabindex="-1" class="nav-link menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]&nbsp;<i class="fa fa-check"></i></a>
+                                </li>
+                            [% ELSE %]
+                                <li role="presentation" class="nav-item">
+                                    <a class="nav-link" href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a>
+                                </li>
+                            [% END %]
+                        [% END # / IF sublanguages_loo.enabled %]
+                    [% END # / FOREACH sublanguages_loo %]
+                [% ELSE %]
+                    [% IF ( languages_loo.group_enabled ) %]
+                        [% IF ( languages_loo.current ) %]
+                            <li role="presentation" class="nav-item">
+                                <a class="nav-link menu-inactive" href="#" tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a>
+                            </li>
                         [% ELSE %]
-                            <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li>
+                            <li role="presentation" class="nav-item">
+                                <a class="nav-link" href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a>
+                            </li>
                         [% END %]
-                    [% END # / IF sublanguages_loo.enabled %]
+                    [% END # / IF languages_loo.current %]
-                [% END # / FOREACH sublanguages_loo %]
+                [% END # / IF ( languages_loo.plural ) %]
-            [% ELSE %]
+            [% END # / IF ( languages_loo.group_enabled ) %]
-                [% IF ( languages_loo.group_enabled ) %]
+        [% END # / FOREACH languages_loo IN languages_loop %]
-                    [% IF ( languages_loo.current ) %]
+        </ul> <!-- /# .dropdown-menu -->
-                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]&nbsp;<i class="fa fa-check"></i></a></li>
+    </li> <!-- / .dropdown -->
-                    [% ELSE %]
-                        <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"  tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li>
-                    [% END %]
-                [% END # / IF languages_loo.current %]
-            [% END # / IF ( languages_loo.plural ) %]
-        [% END # / IF ( languages_loo.group_enabled ) %]
-    [% END # / FOREACH languages_loo IN languages_loop %]
-    </ul> <!-- /# .dropdown-menu -->
-</li> <!-- / .dropdown -->
 [% END # / IF opaclanguagedisplay %]

koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc

@@ -4,13 +4,12 @@
 <div id="lastborrower-window">
     <div class="btn-group">
         <a class="btn btn-link navbar-btn lastborrower" id="lastborrowerlink" href="#" title=""><i class="fa fa-arrow-right"></i> Last patron</a>
-        <button type="button" data-toggle="dropdown" class="btn btn-link navbar-btn dropdown-toggle" aria-haspopup="true" aria-expanded="false">
+        <button type="button" class="btn btn-link navbar-btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
-            <span class="caret"></span>
+            <span class="visually-hidden">Toggle dropdown</span>
-            <span class="sr-only">Toggle dropdown</span>
         </button>
-        <ul id="lastBorrowerList" class="dropdown-menu dropdown-menu-right">
+        <ul id="lastBorrowerList" class="dropdown-menu dropdown-menu-end">
-            <li role="separator" class="divider"></li>
+            <li><hr class="dropdown-divider"></li>
-            <li><a id="lastborrower-remove" class="lastborrower" href="#">Clear list</a></li>
+            <li><a id="lastborrower-remove" class="lastborrower dropdown-item" href="#">Clear list</a></li>
         </ul>
     </div>
 </div>

koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-comment-status.inc

@@ -1,9 +1,9 @@
-<div id="mana_comment_progress" class="dialog message mana_comment_status" style="display:none">
+<div id="mana_comment_progress" class="alert alert-info mana_comment_status" style="display:none">
     <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Submitting comment </div>
 </div>
-<div id="mana_comment_success" class="dialog message mana_comment_status" style="display:none">
+<div id="mana_comment_success" class="alert alert-info mana_comment_status" style="display:none">
     Your comment has been submitted
 </div>
-<div id="mana_comment_failed" class="dialog alert mana_comment_status" style="display:none">
+<div id="mana_comment_failed" class="alert alert-warning mana_comment_status" style="display:none">
     Your comment could not be submitted. Please try again later.
-</div>
+</div>

koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc

@@ -29,7 +29,7 @@
 
 <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>
                 <h2>Mana Knowledge Base report search results</h2>
 
@@ -118,13 +118,13 @@
                 </div>
 
             </main>
-        </div> <!-- /.col-sm-10.col-sm-push-2 -->
+        </div> <!-- /.col-md-10.order-md-2 -->
 
-        <div class="col-sm-2 col-sm-pull-10">
+        <div class="col-md-2 order-sm-2 order-md-1">
             <aside>
                 [% INCLUDE 'guided-reports-view.inc' %]
             </aside>
-        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
+        </div> <!-- /.col-md-2.order-md-1 -->
      </div> <!-- /.row -->
 
 [% INCLUDE 'intranet-bottom.inc' %]

koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-share-report.inc

@@ -1,19 +1,19 @@
 <div id="mana_share_report" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_share_modal_label">
-    <div class="modal-dialog modal-wide" role="document">
+    <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl">
                 [% INCLUDE 'csrf-token.inc' %]
                 <div class="modal-header">
-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h1 class="modal-title" id="mana_share_modal_label">Share with Mana</h1>
-                    <h3 id="mana_share_modal_label">Share with Mana</h3>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     [% IF (mana_id) %]
-                        <div class="dialog alert">
+                        <div class="alert alert-warning">
                             <p>Your report is already linked with a Mana report. Share it if you have made modifications, otherwise it will do nothing.</p>
                         </div>
                     [% END %]
-                    <div id="note-error" class="dialog alert" role="alert">
+                    <div id="note-error" class="alert alert-warning" role="alert">
                         Please enter a report name and descriptive note before sharing (minimum 20 characters)
                     </div>
                     <div class="shared_infos rows">
@@ -87,8 +87,8 @@
                 </div> <!-- /.modal-body -->
                 <div class="modal-footer">
                     <input type="hidden" id="reportid" name="reportid"/>
-                    <button id="ManaShareButton" type="submit" class="btn btn-default shared_infos">Share</button>
+                    <button id="ManaShareButton" type="submit" class="btn btn-primary shared_infos">Share</button>
-                    <button class="btn btn-default" id="ManaCloseButton" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    <button type="button" class="btn btn-default" id="ManaCloseButton" data-bs-dismiss="modal">Cancel</button>
                 </div>
             </form> <!-- /#mana_share_form -->
         </div> <!-- /.modal-content -->

koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc

@@ -52,17 +52,17 @@
                                 <td class="actions">
                                     <button class="btn btn-default btn-xs mana-use" data-subscription_id="[% subscription.id | html %]" id="mana-use-[% subscription.id | html %]"><i class="fa fa-download"></i> Import</button>
                                     <div class="dropup">
-                                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            Report <span class="caret"></span>
+                                            Report
                                         </button>
-                                        <ul class="dropdown-menu pull-right mana-actions" id="mana-actions-[% subscription.id | html %]">
+                                        <ul class="dropdown-menu dropdown-menu-end mana-actions" id="mana-actions-[% subscription.id | html %]">
                                             [% IF ( subscription.comments.size ) %]
                                                 [% FOREACH comment IN subscription.comments %]
-                                                    <li><a data-commentid="[% comment.id | html %]" data-resourceid="[% subscription.id | html %]" href="#">[% comment.message | html %] ([% comment.nb | html %])</a></li>
+                                                    <li><a class="dropdown-item" data-commentid="[% comment.id | html %]" data-resourceid="[% subscription.id | html %]" href="#">[% comment.message | html %] ([% comment.nb | html %])</a></li>
                                                 [% END %]
-                                                <li role="separator" class="divider"></li>
+                                                <li><hr class="dropdown-divider"></li>
                                             [% END %]
-                                            <li><a data-commentid="other" data-resourceid="[% subscription.id | html %]" href="#">New comment</a></li>
+                                            <li><a class="dropdown-item" data-commentid="other" data-resourceid="[% subscription.id | html %]" href="#">New comment</a></li>
                                         </ul>
                                     </div>
                                 </td>

koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc

@@ -32,7 +32,7 @@
 
                 <div>
                     <label for="searchtype" class="control-label">Search type</label>
-                    <select name="searchtype" id="searchtype" class="form-control">
+                    <select name="searchtype" id="searchtype" class="form-select">
                         [% IF searchtype == 'starts_with' %]
                             <option value='starts_with' selected='selected'>Starts with</option>
                             <option value='contains'>Contains</option>
@@ -46,7 +46,7 @@
                 <div>
                     [% SET branches = Branches.all( selected => branchcode_filter, only_from_group => 1 ) %]
                     <label for="branchcode" class="control-label">Library</label>
-                    <select name="branchcode_filter" id="branchcode" class="form-control">
+                    <select name="branchcode_filter" id="branchcode" class="form-select">
                         [% IF branches.size != 1 %]
                             <option value="">Any</option>
                         [% END %]
@@ -57,7 +57,7 @@
                 <div>
                     [% SET categories = Categories.all() %]
                     <label for="categorycode" class="control-label">Category</label>
-                    <select name="categorycode_filter" id="categorycode" class="form-control">
+                    <select name="categorycode_filter" id="categorycode" class="form-select">
                         <option value="">Any</option>
                         [% FOREACH category IN categories %]
                             [% IF category.categorycode == categorycode_filter %]

koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc

@@ -20,22 +20,22 @@
 
     [% IF CAN_user_circulate_circulate_remaining_permissions %]
     <div class="btn-group">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>
+        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-print"></i> Print</button>
             <ul class="dropdown-menu">
-                <li><a class="printslip" data-code="printsummary" href="#">Print summary</a></li>
+                <li><a class="dropdown-item printslip" data-code="printsummary" href="#">Print summary</a></li>
-                <li><a class="printslip" data-code="issueslip" href="#">Print slip</a></li>
+                <li><a class="dropdown-item printslip" data-code="issueslip" href="#">Print slip</a></li>
-                <li><a class="printslip" data-code="issueqslip" href="#">Print quick slip</a></li>
+                <li><a class="dropdown-item printslip" data-code="issueqslip" href="#">Print quick slip</a></li>
                 [% IF patron.account_balance != 0 %]
-                <li><a id="printfineslip" target="_blank" href="/cgi-bin/koha/members/printnotice.pl?notice=ACCOUNTS_SUMMARY&borrowernumber=[% patron.borrowernumber | uri %]">Print account balance</a></li>
+                <li><a class="dropdown-item" id="printfineslip" target="_blank" href="/cgi-bin/koha/members/printnotice.pl?notice=ACCOUNTS_SUMMARY&borrowernumber=[% patron.borrowernumber | uri %]">Print account balance</a></li>
                 [% END %]
                 [% IF patron.has_overdues %]
-                    <li><a id="print_overdues" href="#">Print overdues</a></li>
+                    <li><a class="dropdown-item" id="print_overdues" href="#">Print overdues</a></li>
                 [% END %]
                 [% IF patron.privacy < 2 %] [%# 2 is the privacy rule "Never" (Delete my history immediately) %]
-                    <li><a class="printslip" data-code="checkinslip" href="#">Print checkin slip</a></li>
+                    <li><a class="dropdown-item printslip" data-code="checkinslip" href="#">Print checkin slip</a></li>
                 [% END %]
                 [% FOREACH notice IN Notices.GetTemplates( 'patron_slip' ) %]
-                    <li><a class="printslip" data-code="[% notice.code | html %]" href="#">Print [% notice.name | html %]</a></li>
+                    <li><a class="dropdown-item printslip" data-code="[% notice.code | html %]" href="#">Print [% notice.name | html %]</a></li>
                 [% END %]
             </ul>
     </div>
@@ -46,7 +46,7 @@
     [% END %]
 
     [% IF CAN_user_borrowers_edit_borrowers %]
-        <a id="addnewmessageLabel" href="#add_message_form" data-toggle="modal" class="btn btn-default"><i class="fa-solid fa-comment"></i> Add message</a>
+        <a id="addnewmessageLabel" href="#add_message_form" data-bs-toggle="modal" class="btn btn-default"><i class="fa-solid fa-comment"></i> Add message</a>
     [% END %]
 
     [% IF Koha.Preference('CurbsidePickup') %]
@@ -55,65 +55,65 @@
 
     [% IF CAN_user_borrowers_edit_borrowers %]
         <div class="btn-group">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
+        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown">More <span class="caret"></span></button>
-            <ul class="dropdown-menu dropdown-menu-right">
+            <ul class="dropdown-menu dropdown-menu-end">
                 [% IF CAN_user_borrowers_edit_borrowers %]
-                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;destination=[% destination | html %]&amp;reregistration=y">Renew patron</a></li>
+                    <li><a class="dropdown-item" id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&amp;destination=[% destination | html %]&amp;reregistration=y">Renew patron</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
+                    <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
                 [% END %]
                 [% IF ( CAN_user_permissions ) %]
-                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% patron.borrowernumber | html %]">Set permissions</a></li>
+                    <li><a class="dropdown-item" id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% patron.borrowernumber | html %]">Set permissions</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
+                    <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
                 [% END %]
 
                 [% IF ( Koha.Preference('TwoFactorAuthentication') == 'enforced' || Koha.Preference('TwoFactorAuthentication') == 'enabled' ) && logged_in_user.borrowernumber == patron.borrowernumber %]
-                    <li><a id="twofa" href="/cgi-bin/koha/members/two_factor_auth.pl">Manage two-factor authentication</a></li>
+                    <li><a class="dropdown-item" id="twofa" href="/cgi-bin/koha/members/two_factor_auth.pl">Manage two-factor authentication</a></li>
                 [% END %]
 
                 [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
-                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharge</a></li>
+                    <li><a class="dropdown-item" href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharge</a></li>
                 [% END %]
 
                 [% IF Koha.Preference('RESTOAuth2ClientCredentials') %]
                     [% IF CAN_user_superlibrarian OR loggedinusernumber == patron.borrowernumber %]
-                        <li><a id="apikeys" href="/cgi-bin/koha/members/apikeys.pl?patron_id=[% patron.borrowernumber | html %]">Manage API keys</a></li>
+                        <li><a class="dropdown-item" id="apikeys" href="/cgi-bin/koha/members/apikeys.pl?patron_id=[% patron.borrowernumber | html %]">Manage API keys</a></li>
                     [% ELSE %]
-                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to manage API keys" id="apikeys" href="#">Manage API keys</a></li>
+                        <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="You are not authorized to manage API keys" id="apikeys" href="#">Manage API keys</a></li>
                     [% END %]
                 [% END %]
 
                 [% IF CAN_user_borrowers_edit_borrowers %]
-                    <li><a id="sendwelcome" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]&op=send_welcome">Send welcome notice</a></li>
+                    <li><a class="dropdown-item" id="sendwelcome" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]&op=send_welcome">Send welcome notice</a></li>
                 [% END %]
 
                 [% IF CAN_user_borrowers_edit_borrowers && patron.category.effective_reset_password %]
-                    <li><a id="resetpassword" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]&op=send_password_reset">Send password reset</a></li>
+                    <li><a class="dropdown-item" id="resetpassword" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]&op=send_password_reset">Send password reset</a></li>
                 [% END %]
 
                 [% IF CAN_user_borrowers_delete_borrowers %]
                     [% IF ( patron.protected == 1 ) %]
-                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is protected" id="deletepatron" href="#">Delete</a></li>
+                        <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="Patron is protected" id="deletepatron" href="#">Delete</a></li>
                     [% ELSE %]
-                        <li><a id="deletepatron" href="#">Delete</a></li>
+                        <li><a class="dropdown-item" id="deletepatron" href="#">Delete</a></li>
                     [% END %]
                 [% ELSE %]
-                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to delete patrons" id="deletepatron" href="#">Delete</a></li>
+                    <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="You are not authorized to delete patrons" id="deletepatron" href="#">Delete</a></li>
                 [% END %]
                 [% SET adult_categories = Categories.scalar.all(category_type => 'A') %]
                 [% IF adult_categories.count > 0 %]
                     [% IF patron.is_child %]
-                        <li><a id="updatechild" href="#">Update child to adult patron</a></li>
+                        <li><a class="dropdown-item" id="updatechild" href="#">Update child to adult patron</a></li>
                     [% ELSE %]
-                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li>
+                        <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li>
                     [% END %]
                 [% END %]
                 [% IF Koha.Preference('intranetreadinghistory') %]
                     [%IF ( privacy == 2 ) %]
-                        <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Not allowed by patron's privacy settings" id="exportbarcodes" href="#">Export today's checked in barcodes</a></li>
+                        <li class="disabled"><a class="dropdown-item" data-bs-toggle="tooltip" data-bs-placement="left" title="Not allowed by patron's privacy settings" id="exportbarcodes" href="#">Export today's checked in barcodes</a></li>
                     [% ELSE %]
-                        <li><a id="exportcheckins" href="#">Export today's checked in barcodes</a></li>
+                        <li><a class="dropdown-item" id="exportcheckins" href="#">Export today's checked in barcodes</a></li>
                     [% END %]
                 [% END %]
             </ul>
@@ -123,23 +123,21 @@
 
 <!-- Modal -->
 <div id="add_message_form" class="modal" tabindex="-1" role="dialog" aria-labelledby="addnewmessageLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content modal-lg">
             <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f">
                 [% INCLUDE 'csrf-token.inc' %]
                 <input type="hidden" name="op" value="cud-add_message">
                 <div class="modal-header">
-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
+                    <h1 class="modal-title">Leave a message</h1>
-                        <span aria-hidden="true">&times;</span>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </button>
-                    <h4>Leave a message</h4>
                 </div>
                 <div class="modal-body">
                     <fieldset id="message_fieldset">
                         <ol>
                             <li class="form-group form-row">
                                 <label for="message_type" class="col-form-label">Add a message for:</label>
-                                <select name="message_type" id="message_type" class="form-control">
+                                <select name="message_type" id="message_type" class="form-select">
                                     <option value="L">Staff - Internal note</option>
                                     <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
                                     [% IF CAN_user_borrowers_send_messages_to_borrowers %]
@@ -152,7 +150,7 @@
                             [% IF bor_notes %]
                                 <li class="form-group form-row">
                                     <label for="select_patron_messages" class="col-form-label">Predefined notes: </label>
-                                    <select name="type" id="select_patron_messages" class="form-control">
+                                    <select name="type" id="select_patron_messages" class="form-select">
                                         <option value="">Select note</option>
                                         [% FOREACH bor_note IN bor_notes %]
                                             <option value="[% bor_note.lib | html %]">[% bor_note.lib | html %]</option>
@@ -165,7 +163,7 @@
                             [% IF patron_letters %]
                                 <li class="form-group form-row">
                                     <label for="select_patron_notice" class="col-form-lable" style="display:none;">Patron notice: </label>
-                                    <select name="select_patron_notice" id="select_patron_notice" class="form-control" style="display:none;">
+                                    <select name="select_patron_notice" id="select_patron_notice" class="form-select" style="display:none;">
                                         <option value="">Select notice</option>
                                         [% FOREACH letter IN patron_letters %]
                                             <option value="[% letter.code | html %]">[% letter.name | html %]</option>
@@ -190,7 +188,7 @@
                 </div>
                 <div class="modal-footer">
                     <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
-                    <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
+                    <button class="btn btn-default deny cancel" type="button" data-bs-dismiss="modal"><i class="fa fa-times"></i> Cancel</button>
                 </div>
             </form>
         </div>

koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc

@@ -10,7 +10,7 @@
         [% IF Koha.Preference('SMSSendDriver') %]<th>SMS</th>[% END %]
         [% IF Koha.Preference('TalkingTechItivaPhoneNotification') || Koha.Preference('PhoneNotification') %]<th>Phone</th>[% END %]
         <th>Email</th>
-        <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="fa fa-info-circle"></i></th>
+        <th>Digests only <i id="info_digests" data-bs-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-bs-placement="right" class="fa fa-info-circle"></i></th>
         <!-- <th>RSS</th> -->
     </tr>
     </thead>
@@ -197,24 +197,24 @@
                 <input type="checkbox"
                      id="digest[% messaging_preference.message_attribute_id | html %]"
                      value="[% messaging_preference.message_attribute_id | html %]"
-                     name="digest" class="pmp_digest" checked="checked" disabled="disabled" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
+                     name="digest" class="pmp_digest" checked="checked" disabled="disabled" data-bs-toggle="tooltip" title="You must select a digestible transport to select digests" />
               [% ELSE %]
                 <input type="checkbox"
                      id="digest[% messaging_preference.message_attribute_id | html %]"
                      value="[% messaging_preference.message_attribute_id | html %]"
-                     name="digest" class="pmp_digest" disabled="disabled" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
+                     name="digest" class="pmp_digest" disabled="disabled" data-bs-toggle="tooltip" title="You must select a digestible transport to select digests" />
               [% END %]
           [% ELSE %]
               [% IF ( messaging_preference.digest ) %]
                 <input type="checkbox"
                      id="digest[% messaging_preference.message_attribute_id | html %]"
                      value="[% messaging_preference.message_attribute_id | html %]"
-                     name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
+                     name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-bs-toggle="tooltip" title="You must select a digestible transport to select digests" />
               [% ELSE %]
                 <input type="checkbox"
                      id="digest[% messaging_preference.message_attribute_id | html %]"
                      value="[% messaging_preference.message_attribute_id | html %]"
-                     name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
+                     name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-bs-toggle="tooltip" title="You must select a digestible transport to select digests" />
               [% END %]
           [% END %]
       </td>

koha-tmpl/intranet-tmpl/prog/en/includes/modal-claims.inc

@@ -3,8 +3,8 @@
 
 [% BLOCK 'modal-claims-display' %]
     <!-- Claims Returned Modal -->
-    <div class="modal fade" id="claims-returned-modal" tabindex="-1" role="dialog" aria-labelledby="claims-returned-modal-label">
+    <div class="modal" id="claims-returned-modal" tabindex="-1" role="dialog" aria-labelledby="claims-returned-modal-label">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title" id="claims-returned-modal-label">Claim returned</h4>
@@ -33,7 +33,7 @@
                 </div>
                 <div class="modal-footer">
                     <button id="claims-returned-modal-btn-submit" type="button" class="btn btn-primary"><i class="fa fa-exclamation-circle"></i> Make claim</button>
-                    <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
+                    <button class="btn btn-default deny cancel" type="button" data-bs-dismiss="modal"><i class="fa fa-times"></i> Cancel</button>
                 </div>
             </div>
         </div>
@@ -58,7 +58,7 @@
         $('#claims-returned-itemnumber').val(itemnumber);
         $('#claims-returned-notes').val("");
         $('#claims-returned-charge-lost-fee').attr('checked', false);
-        $('#claims-returned-modal').modal();
+        $('#claims-returned-modal').modal("show");
     });
     $(document).on("click", '#claims-returned-modal-btn-submit', function(e){
         let itemnumber = $('#claims-returned-itemnumber').val();

koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc

@@ -4,13 +4,11 @@
 [% SET CatalogConcernTemplate = AdditionalContents.get( location => "CatalogConcernTemplate", lang => lang, library => logged_in_user.branchcode ) %]
 <!-- Add concern modal -->
 <div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content modal-lg">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
+                <h1 class="modal-title" id="addConcernModalLabel">Add concern</h1>
-                    <span aria-hidden="true">&times;</span>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </button>
-                <h4 class="modal-title" id="addConcernModalLabel">Add concern</h4>
             </div>
             <div class="modal-body">
                 <fieldset id="concern_fieldset">
@@ -31,12 +29,12 @@
                             [%- END -%]
                             </div>
                             [%- END -%]
-                            <div class="hidden" id="concern_template">
+                            <div style="display:none" id="concern_template">
-                            [%- IF CatalogConcernTemplate && CatalogConcernTemplate.content && CatalogConcernTemplate.content.count > 0 -%]
+                                [%- IF CatalogConcernTemplate && CatalogConcernTemplate.content && CatalogConcernTemplate.content.count > 0 -%]
-                            [%- FOREACH template IN CatalogConcernTemplate.content -%]
+                                    [%- FOREACH template IN CatalogConcernTemplate.content -%]
-                            [%- template.content | $raw -%]
+                                        [%- template.content | $raw -%]
-                            [%- END -%]
+                                    [%- END -%]
-                            [%- END -%]
+                                [%- END -%]
                             </div>
                         </li>
                     </ol>
@@ -45,7 +43,7 @@
             <div class="modal-footer">
                 <input type="hidden" id="concern_biblio" name="biblio_id" value="[% biblionumber | html %]">
                 <button type="submit" class="btn btn-primary" id="addConfirm">Submit <i id="concern-submit-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
             </div> <!-- /.modal-footer -->
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/bundle_contents.inc

@@ -1,10 +1,10 @@
 <!-- Bundle contents modal -->
 <div class="modal printable" id="bundleContentsModal" tabindex="-1" role="dialog" aria-labelledby="bundleContentsLabel">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h1 class="modal-title" id="bundleContentsLabel">Bundle contents for [% item.barcode | html %]</h1>
-                <h4 class="modal-title" id="bundleContentsLabel">Bundle contents for [% item.barcode | html %]</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <table style="width:100%">
@@ -27,8 +27,8 @@
                 </table>
             </div> <!-- /.modal-body -->
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 <button type="button" class="printModal btn btn-primary"><i class="fa fa-print"></i> Print</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div> <!-- /.modal-footer -->
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/cancel_booking.inc

@@ -1,11 +1,11 @@
 <!-- Cancel booking modal -->
 <div class="modal" id="cancelBookingModal" tabindex="-1" role="dialog" aria-labelledby="cancelBookingLabel">
     <form method="get" id="cancelBookingForm">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h1 class="modal-title" id="cancelBookingLabel">Cancel booking</h1>
-                    <h4 class="modal-title" id="cancelBookingLabel">Cancel booking</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div id="cancel_booking_result"></div>
@@ -13,8 +13,8 @@
                     <p>Are you sure you want to cancel this booking?</p>
                 </div> <!-- /.modal-body -->
                 <div class="modal-footer">
-                    <button type="submit" class="btn btn-danger">Confirm</button>
+                    <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Yes, cancel booking</button>
-                    <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    <button type="button" class="btn btn-default deny" data-bs-dismiss="modal"><i class="fa fa-remove"></i> No, do not cancel</button>
                 </div> <!-- /.modal-footer -->
             </div> <!-- /.modal-content -->
         </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/cashup_summary.inc

@@ -1,10 +1,10 @@
 <!-- Cashup summary modal -->
 <div class="modal printable" id="cashupSummaryModal" tabindex="-1" role="dialog" aria-labelledby="cashupSummaryLabel">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h1 class="modal-title" id="cashupSummaryLabel">Cashup summary</h1>
-                <h4 class="modal-title" id="cashupSummaryLabel">Cashup summary</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <ul>
@@ -25,8 +25,8 @@
                 </table>
             </div> <!-- /.modal-body -->
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 <button type="button" class="printModal btn btn-primary"><i class="fa fa-print"></i> Print</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div> <!-- /.modal-footer -->
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/cataloguing_create_av.inc

@@ -1,9 +1,9 @@
-<div id="avCreate" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="avCreateLabel" aria-hidden="true">
+<div id="avCreate" class="modal" tabindex="-1" role="dialog" aria-labelledby="avCreateLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+                <h1 class="modal-title" id="avCreateLabel">Create a new authorized value</h1>
-                <h3 id="avCreateLabel">Create a new authorized value</h3>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <form id="add_new_av" method="get">
                 <div class="modal-body">
@@ -30,12 +30,12 @@
                             </li>
                         </ol>
                     </fieldset>
-                    <div class="avCreate_error dialog alert" style="display:none;"></div>
+                    <div class="avCreate_error alert alert-warning" style="display:none;"></div>
                 </div>
                 <div class="modal-footer">
                     <input type="hidden" name="select2" value="" />
                     <button type="submit" class="btn btn-default">Save</button>
-                    <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    <button class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                 </div>
             </form>
         </div> <!-- /.modal-content -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/checkout_renewals.inc

@@ -1,10 +1,10 @@
 <!-- Checkout renewals modal -->
-<div id="checkoutRenewals" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="checkoutRenewalsLabel" aria-hidden="true">
+<div id="checkoutRenewals" class="modal" tabindex="-1" role="dialog" aria-labelledby="checkoutRenewalsLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+                <h1 class="modal-title" id="checkoutRenewalsLabel"> Item renewals</h1>
-                <h3 id="checkoutRenewalsLabel"> Item renewals</h3>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div> <!-- /.modal-header -->
             <div class="modal-body">
                 <div id="retrieving" class="alert" style="display:none">Retrieving renewals...</div>
@@ -12,7 +12,7 @@
                 <ul id="results" style="display:none"></ul>
             </div> <!-- /.modal-body -->
             <div class="modal-footer">
-                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+                <button class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div> <!-- /.modal-footer -->
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc

@@ -3,11 +3,11 @@
 [% SET resolutions = AuthorisedValues.GetAuthValueDropbox('TICKET_RESOLUTION') %]
 <!-- Display updates concern modal -->
 <div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
-    <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h1 class="modal-title" id="displayUpdateLabel">Ticket details</h1>
-                <h4 class="modal-title" id="displayUpdateLabel">Ticket details</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <div id="concern-details"></div>
@@ -30,7 +30,7 @@
                 <input type="hidden" name="ticket_id" id="ticket_id">
                 [% IF resolutions.count %]
                 <div class="btn-group">
-                  <button type="button" class="btn btn-danger dropdown-toggle" id="resolveTicket" data-toggle="dropdown" aria-expanded="false">
+                  <button type="button" class="btn btn-danger dropdown-toggle" id="resolveTicket" data-bs-toggle="dropdown" aria-expanded="false">
                     Resolve <span class="caret"></span> <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i>
                   </button>
                   <ul class="dropdown-menu">
@@ -45,22 +45,23 @@
                 <button type="button" class="btn btn-danger resolveSubmit" id="resolveTicket">Resolve <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
                 [% END %]
                 [% IF status.count %]
-                <div class="btn-group">
+                    <div class="btn-group">
-                  <button type="button" class="btn btn-primary updateSubmit" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
+                    <button type="button" class="btn btn-primary updateSubmit" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
-                  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="caret"></span>
+                        <span class="caret"></span>
-                    <span class="sr-only">Select status</span>
+                        <span class="sr-only">Select status</span>
-                  </button>
+                    </button>
-                  <ul class="dropdown-menu">
+                    <ul class="dropdown-menu">
-                    [% FOR st IN status %]
+                        [% FOR st IN status %]
-                    <li>
+                        <li>
-                      <a class="dropdown-item updateSubmit" type="button" data-status="[% st.authorised_value | html %]">[% st.lib | html_entity %]</a>
+                        <a class="dropdown-item updateSubmit" type="button" data-status="[% st.authorised_value | html %]">[% st.lib | html_entity %]</a>
-                    </li>
+                        </li>
-                    [% END %]
+                        [% END %]
-                  </ul>
+                    </ul>
-                </div>
+                    </div>
                 [% ELSE %]
-                <button type="submit" class="btn btn-primary updateSubmit" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
+                    <button type="submit" class="btn btn-primary updateSubmit" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
                 [% END %]
             </div> <!-- /.modal-footer -->
         </div> <!-- /.modal-content -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/edit_authority_preview.inc

@@ -1,14 +1,13 @@
 <div class="modal" id="auEditPreview" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <div class="modal-dialog modal-wide" role="document">
+    <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span
+                <h1 class="modal-title" id="avCreateLabel">Preview based on MARC structure</h1>
-                        aria-hidden="true">&times;</span></button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                <h3 class="modal-title" id="avCreateLabel">Preview based on MARC structure</h3>
             </div>
             <div class="modal-body" id="auloadpreview"></div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
             </div>
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc

@@ -1,6 +1,9 @@
 <div id="generate_next" class="modal" tabindex="-1" role="dialog" aria-labelledby="generate_next" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
             <form action="/cgi-bin/koha/serials/serials-collection.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
                 <div class="modal-body">
@@ -12,8 +15,8 @@
                 </div>
 
                 <div class="modal-footer">
-                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+                    <button type="submit" class="btn btn-default approve">Yes</button>
-                    <input type="submit" class="btn btn-default approve" value="Yes" />
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                 </div>
             </form>
         </div>

koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc

@@ -1,11 +1,11 @@
 <!-- Place booking modal -->
 <div class="modal" id="placeBookingModal" tabindex="-1" role="dialog" aria-labelledby="placeBookingLabel">
     <form method="get" id="placeBookingForm">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h1 class="modal-title" id="placeBookingLabel"></h1>
-                    <h4 class="modal-title" id="placeBookingLabel"></h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div id="booking_result"></div>
@@ -49,7 +49,7 @@
                 </div> <!-- /.modal-body -->
                 <div class="modal-footer">
                     <button type="submit" class="btn btn-primary">Submit</button>
-                    <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                 </div> <!-- /.modal-footer -->
             </div> <!-- /.modal-content -->
         </div> <!-- /.modal-dialog -->

koha-tmpl/intranet-tmpl/prog/en/includes/modals/resolve_return_claim.inc

@@ -1,17 +1,17 @@
 <!-- Resolve Return Claim Modal -->
-<div class="modal fade" id="claims-returned-resolved-modal" tabindex="-1" role="dialog" aria-labelledby="claims-returned-resolved-modal-label">
+<div class="modal" id="claims-returned-resolved-modal" tabindex="-1" role="dialog" aria-labelledby="claims-returned-resolved-modal-label">
-  <div class="modal-dialog" role="document">
+  <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h1 class="modal-title" id="claims-returned-resolved-modal-label">Resolve return claim</h1>
-        <h4 class="modal-title" id="claims-returned-resolved-modal-label">Resolve return claim</h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
 
           <div class="form-group">
             <label for="claims-returned-resolved-code">Resolution</label>
             [% SET resolutions = AuthorisedValues.GetAuthValueDropbox('RETURN_CLAIM_RESOLUTION') %]
-            <select class="form-control" id="claims-returned-resolved-modal-resolved-code">
+            <select class="form-select" id="claims-returned-resolved-modal-resolved-code">
               [% FOREACH r IN resolutions %]
                   <option value="[% r.authorised_value | html %]">[% r.lib | html %]</option>
               [% END %]
@@ -19,7 +19,7 @@
 
             <label for="new_lost_status">New item lost value:</label>
             [% SET itemlost = AuthorisedValues.GetAuthValueDropbox('LOST') %]
-            <select class="form-control" id="new_lost_status">
+            <select class="form-select" id="new_lost_status">
               <option value="0">(Not lost)</option>
               [% FOREACH lost IN itemlost %]
                   <option value="[% lost.authorised_value | html %]">[% lost.lib | html %]</option>
@@ -35,7 +35,7 @@
           <i id="claims-returned-resolved-modal-btn-submit-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i>
           Resolve claim
          </button>
-        <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
+        <button class="btn btn-default deny cancel" href="#" data-bs-dismiss="modal"><i class="fa fa-times"></i> Cancel</button>
       </div>
     </div>
   </div>

koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_multi_receiving.inc

@@ -1,11 +1,15 @@
 <div id="multi_receiving" class="modal" tabindex="-1" role="dialog" aria-labelledby="multi_receiving_label" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
+            <div class="modal-header">
+                <h1 class="modal-title" id="multi_receiving_label">Multi receiving</h1>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
             <form action="/cgi-bin/koha/serials/serials-collection.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
                 <div class="modal-body">
                     <fieldset class="rows">
-                        <legend>Multi receiving</legend>
+                        <legend class="sr-only">Multi receiving</legend>
                         <ol>
                             <li>
                             <label for="nbissues" class="required">How many issues do you want to receive?</label>
@@ -24,8 +28,8 @@
                 </div>
 
                 <div class="modal-footer">
-                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+                    <button type="submit" class="btn btn-default approve">Submit</button>
-                    <input type="submit" class="btn btn-default approve" value="OK" />
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                 </div>
             </form>
         </div>

koha-tmpl/intranet-tmpl/prog/en/includes/modals/serials_skip_issues.inc

@@ -1,6 +1,9 @@
 <div id="skip_issues" class="modal" tabindex="-1" role="dialog" aria-labelledby="skip_issues_label" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
             <form action="/cgi-bin/koha/serials/serials-collection.pl" method="post">
                 [% INCLUDE 'csrf-token.inc' %]
                 <div class="modal-body">
@@ -20,8 +23,8 @@
                 </div>
 
                 <div class="modal-footer">
-                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+                    <button type="submit" class="btn btn-default approve">Submit</button>
-                    <input type="submit" class="btn btn-default approve" value="OK" />
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                 </div>
             </form>
         </div>

koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc

@@ -1,5 +1,5 @@
 [% IF ( no_add ) %]
-    <div class="dialog alert">
+    <div class="alert alert-warning">
         <h3>Cannot add patron</h3>
         [% IF ( no_branches ) %]
             <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>

koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc

@@ -1,20 +1,38 @@
 [% USE raw %]
-[% IF ( PAGE_NUMBERS ) %]<nav><ul class="pagination">
+[% IF ( PAGE_NUMBERS ) %][% FILTER collapse %]
- [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
+    <nav>
-    [% IF ( previous_page_offset.defined ) %]
+        <ul class="pagination">
-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]"><i class="fa fa-fw fa-angle-double-left"></i> First</a></li>
+            [% IF hits_to_paginate < total %]
-        <!-- Row of numbers corresponding to search result pages -->
+                <h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>
-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% previous_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]"><i class="fa fa-fw fa-angle-left"></i> Previous</a></li>
+            [% END %]
-    [% END %]
+            [% IF ( previous_page_offset.defined ) %]
-    [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
+                <li class="page-item">
-        [% IF ( PAGE_NUMBER.highlight ) %]
+                    <a class="page-link" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]"><i class="fa fa-fw fa-angle-double-left"></i> First</a>
-            <li class="active"><span>[% PAGE_NUMBER.pg | html %]</span></li>
+                </li>
-        [% ELSE %]
+                <!-- Row of numbers corresponding to search result pages -->
-            <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% PAGE_NUMBER.offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
+                <li class="page-item">
-        [% END %]
+                    <a class="page-link" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% previous_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]"><i class="fa fa-fw fa-angle-left"></i> Previous</a>
-    [% END %]
+                </li>
-    [% IF ( next_page_offset ) %]
+            [% END %]
-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% next_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">Next <i class="fa fa-fw fa-angle-right"></i></a></li>
+            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
-        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% last_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">Last <i class="fa fa-fw fa-angle-double-right"></i></a></li>
+                [% IF ( PAGE_NUMBER.highlight ) %]
-    [% END %]
+                    <li class="page-item active" aria-current="page">
-</ul></nav>[% END %]
+                        <a href="#" class="page-link">[% PAGE_NUMBER.pg | html %]</a>
+                    </li>
+                [% ELSE %]
+                    <li class="page-item">
+                        <a class="page-link" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% PAGE_NUMBER.offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">[% PAGE_NUMBER.pg | html %]</a>
+                    </li>
+                [% END %]
+            [% END %]
+            [% IF ( next_page_offset ) %]
+                <li class="page-item">
+                    <a class="page-link" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% next_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">Next <i class="fa fa-fw fa-angle-right"></i></a>
+                </li>
+                <li class="page-item">
+                    <a class="page-link" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% last_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">Last <i class="fa fa-fw fa-angle-double-right"></i></a>
+                </li>
+            [% END %]
+        </ul> <!-- /.pagination -->
+    </nav>
+[% END %][% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc

@@ -4,24 +4,24 @@
 [% WRAPPER tabs id= "finesholdsissues" %]
     [% WRAPPER tabs_nav %]
         [% WRAPPER tab_item tabname= "checkouts" bt_active= 1 %]
-            <span>Checkouts (<span class="checkout_count">[% issuecount || 0 | html %]</span>)</span>
+            <span>Checkouts</span> (<span class="checkout_count">[% issuecount || 0 | html %]</span>)
         [% END %]
 
         [% IF relatives_issues_count %]
             [% WRAPPER tab_item tabname= "relatives-issues" %]
-                <span>Relatives' checkouts ([% relatives_issues_count | html %])</span>
+                <span>Relatives' checkouts</span> ([% relatives_issues_count | html %])
             [% END %]
         [% END %]
 
         [% IF ( guarantees_fines ) %]
             [% WRAPPER tab_item tabname= "guarantees_finesandcharges" %]
-                <span>Guarantees' charges ([% guarantees_fines | $Price %])</span>
+                <span>Guarantees' charges</span> ([% guarantees_fines | $Price %])
             [% END %]
         [% END %]
 
         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
             [% WRAPPER tab_item tabname= "holds" %]
-                <span>Holds ([% holds_count || 0 | html %])</span>
+                <span>Holds</span> ([% holds_count || 0 | html %])
             [% END %]
             [% WRAPPER tab_item tabname="bookings" %]
                 [% SET bookings_count = patron.bookings.filter_by_active.count %]
@@ -31,14 +31,14 @@
 
         [% IF Koha.Preference('UseRecalls') %]
             [% WRAPPER tab_item tabname= "recalls" %]
-                <span>Recalls ([% recalls.count || 0 | html %])</span>
+                <span>Recalls</span> ([% recalls.count || 0 | html %])
             [% END %]
         [% END %]
 
         [% IF Koha.Preference('ArticleRequests') %]
             [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
             [% WRAPPER tab_item tabname= "article-requests" %]
-                <span>Article requests ([% article_requests.count || 0 | html %])</span>
+                <span>Article requests</span> ([% article_requests.count || 0 | html %])
             [% END %]
         [% END %]
 
@@ -47,19 +47,19 @@
                 <span>Claims</span>
                 [% IF ( patron.return_claims.count ) %]
                     ([% IF patron.return_claims.resolved.count == 0 %]
-                        <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
+                        <span title="Resolved claims" class="badge text-bg-info" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
                     [% ELSE %]
-                        <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
+                        <span title="Resolved claims" class="badge text-bg-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
                     [% END %]
                     [% IF patron.return_claims.unresolved.count == 0 %]
-                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
+                        <span title="Unresolved claims" class="badge text-bg-info" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
                     [% ELSE %]
-                        <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
+                        <span title="Unresolved claims" class="badge text-bg-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
                     [% END %])
                 [% ELSE %]
                     [% no_claims = 0 %]
-                    (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% no_claims | html %]</span>
+                    (<span title="Resolved claims" class="badge text-bg-info" id="return-claims-count-resolved">[% no_claims | html %]</span>
-                    <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% no_claims | html %]</span>)
+                    <span title="Unresolved claims" class="badge text-bg-info" id="return-claims-count-unresolved">[% no_claims | html %]</span>)
                 [% END # /IF patron.return_claims.count %]
             [% END # /WRAPPER tab_item return-claims %]
         [% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc

@@ -151,8 +151,8 @@
 
     <div id="[% table_id | html %]_search_results" style="display:none;">
 
-        <div class="info dialog message" style="display: none; margin: 1em 0;"></div>
+        <div class="info alert alert-info" style="display: none; margin: 1em 0;"></div>
-        <div class="error dialog alert" style="display: none; margin: 1em 0"></div>
+        <div class="error alert alert-warning" style="display: none; margin: 1em 0"></div>
 
         <input type="hidden" class="firstletter_filter" value="" />
         [% IF open_on_row_click %]
@@ -189,7 +189,7 @@
 
 <!-- Patron preview modal -->
 <div class="modal" id="patronPreview" tabindex="-1" role="dialog" aria-labelledby="patronPreviewLabel">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-body">
                 <div id="loading">
@@ -919,11 +919,11 @@
     [% search_results_block_id = patron_search_modal_id _ '_searchresults' %]
 
     <div id="[% patron_search_modal_id | html %]" class="modal modal-full patron_search_modal" tabindex="-1" role="dialog" aria-labelledby="patronSearchLabel" aria-hidden="true" data-backdrop="">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog modal-xl">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h1 class="modal-title" id="patronSearchLabel">[% modal_title | html %]</h1>
-                    <h4 class="modal-title" id="patronSearchLabel">[% modal_title | html %]</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     [% PROCESS patron_search_filters filters => ['branch','category','sort1','sort2'] %]
@@ -943,7 +943,7 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <a href="#" class="btn btn-default cancel" data-dismiss="modal" aria-hidden="true">Close</a>
+                    <button type="button" class="btn btn-default cancel" data-bs-dismiss="modal">Close</a>
                 </div>
             </div>
         </div>

koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc

@@ -6,16 +6,16 @@
 <div id="toolbar" class="btn-toolbar">
     [% IF CAN_user_borrowers_edit_borrowers %]
         <div class="btn-group" id="new-patron-button">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
+            <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button>
                 <ul class="dropdown-menu">
-                    [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add_form&amp;categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %]
+                    [% FOREACH category IN categories %]<li><a class="dropdown-item" href="/cgi-bin/koha/members/memberentry.pl?op=add_form&amp;categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %]
                 </ul>
         </div>
         [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %]
             <div class="btn-group" id="quick-add-new-patron-button">
-                <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
+                <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button>
                     <ul class="dropdown-menu">
-                        [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add_form&amp;categorycode=[% category.categorycode | uri %]&amp;quickadd=true">[% category.description | html %]</a></li>[% END %]
+                        [% FOREACH category IN categories %]<li><a class="dropdown-item" href="/cgi-bin/koha/members/memberentry.pl?op=add_form&amp;categorycode=[% category.categorycode | uri %]&amp;quickadd=true">[% category.description | html %]</a></li>[% END %]
                     </ul>
             </div>
         [% END %]

koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc

@@ -349,7 +349,7 @@
                     </span>
                     [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
                         [% IF moremember %]
-                            <a id="#edit_message_form_[% patron_message.message_id | html %]" class="btn btn-link edit_message" href="#edit_message_form_[% patron_message.message_id | uri %]" data-target="#edit_message_form_[% patron_message.message_id | html %]" data-toggle="modal" class="btn btn-default"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
+                            <a id="#edit_message_form_[% patron_message.message_id | html %]" class="btn btn-link edit_message" href="#edit_message_form_[% patron_message.message_id | uri %]" data-bs-target="#edit_message_form_[% patron_message.message_id | html %]" data-bs-toggle="modal" class="btn btn-default"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
                             <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
                                 [% INCLUDE 'csrf-token.inc' %]
                                 <input type="hidden" name="op" value="cud-delete">
@@ -359,7 +359,7 @@
                                 <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
                             </form>
                         [% ELSE %]
-                            <a id="#edit_message_form_[% patron_message.message_id | html %]" class="btn btn-link edit_message" href="#edit_message_form_[% patron_message.message_id | uri %]" data-target="#edit_message_form_[% patron_message.message_id | html %]" data-toggle="modal" class="btn btn-default"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
+                            <a id="#edit_message_form_[% patron_message.message_id | html %]" class="btn btn-link edit_message" href="#edit_message_form_[% patron_message.message_id | uri %]" data-bs-target="#edit_message_form_[% patron_message.message_id | html %]" data-bs-toggle="modal" class="btn btn-default"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
                             <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
                                 [% INCLUDE 'csrf-token.inc' %]
                                 <input type="hidden" name="op" value="cud-delete">
@@ -372,11 +372,11 @@
                 </li>
             [% END %]
         </ul>
-        <a id="addnewmessageLabel" href="#add_message_form" class="btn btn-link" data-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
+        <a id="addnewmessageLabel" data-bs-target="#add_message_form" class="btn btn-link" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
     </div> <!-- /#messages -->
 
     [% FOREACH pm IN patron_messages %]
-        <div id="edit_message_form_[% pm.message_id | html %]" class="modal" tabindex="-1" role="dialog" aria-labelledby="#edit_message_form_[% patron_message.message_id | html %]" aria-hidden="true">
+        <div id="edit_message_form_[% pm.message_id | html %]" class="modal" tabindex="-1" aria-labelledby="#edit_message_form_[% patron_message.message_id | html %]" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f">
@@ -384,24 +384,26 @@
                         <input type="hidden" name="op" value="cud-edit_message">
                         <input type="hidden" name="message_id" value="[% pm.message_id | html %]"/>
                         <div class="modal-header">
-                            <h3>Edit message</h3>
+                            <h1 class="modal-title">Edit message</h1>
                         </div>
                         <div class="modal-body">
                             <div class="form-group">
-                                <label for="message_type">Message is for:</label>
+                                <label for="message_type">
-                                <select name="message_type" id="message_type" disabled>
+                                    Message is for:
-                                    [% IF pm.message_type == "L" %]
+                                    <select name="message_type" id="message_type" disabled>
-                                        <option value="L" selected="selected">Staff - Internal note</option>
+                                        [% IF pm.message_type == "L" %]
-                                    [% ELSE %]
+                                            <option value="L" selected="selected">Staff - Internal note</option>
-                                        <option value="L">Staff - Internal note</option>
+                                        [% ELSE %]
-                                    [% END %]
+                                            <option value="L">Staff - Internal note</option>
+                                        [% END %]
 
-                                    [% IF pm.message_type == "B" %]
+                                        [% IF pm.message_type == "B" %]
-                                        <option value="B" selected="selected">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
+                                            <option value="B" selected="selected">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
-                                    [% ELSE %]
+                                        [% ELSE %]
-                                        <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
+                                            <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
-                                    [% END %]
+                                        [% END %]
-                                </select>
+                                    </select>
+                                </label>
                             </div>
                             <div class="form-group">
                                 <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message" >[% pm.message | html %]</textarea>
@@ -409,12 +411,11 @@
                         </div>
                         <div class="modal-footer">
                             <button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
-                            <button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
+                            <button class="btn btn-default deny cancel" type="button" data-bs-dismiss="modal"><i class="fa fa-times"></i> Cancel</button>
                         </div>
                     </form>
                 </div>
             </div>
         </div>
     [% END %]
-
 [% END # /IF patron_messages %]

koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc

@@ -6,7 +6,7 @@
 [% BLOCK b_template %]<span>Template: </span>[% END %]
 
 [% IF ( error || error_pdferr )  %]
-<div class="dialog alert">
+<div class="alert alert-warning">
   <p>
     <strong>WARNING:</strong>
         [% IF error_pdferr %]<span>Error while creating PDF file. </span>

koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc

@@ -1,22 +1,22 @@
 <div id="toolbar" class="btn-toolbar">
     <div class="btn-group">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New <span class="caret"></span></button>
+        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-plus"></i> New</button>
         <ul class="dropdown-menu">
-            <li><a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=new">Card batch</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/image-manage.pl">Image</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/edit-layout.pl?op=new">Layout</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/edit-layout.pl?op=new">Layout</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/edit-template.pl?op=new">Card template</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/edit-template.pl?op=new">Card template</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/edit-profile.pl?op=new">Printer profile</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/edit-profile.pl?op=new">Printer profile</a></li>
         </ul>
     </div>
     <div class="btn-group">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Manage <span class="caret"></span></button>
+        <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Manage</button>
         <ul class="dropdown-menu">
-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Card batches</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/image-manage.pl">Images</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Layouts</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/manage.pl?card_element=layout">Layouts</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Card templates</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/manage.pl?card_element=template">Card templates</a></li>
-            <li><a href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Printer profiles</a></li>
+            <li><a class="dropdown-item" href="/cgi-bin/koha/patroncards/manage.pl?card_element=profile">Printer profiles</a></li>
         </ul>
     </div>
 </div>

koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc

@@ -81,7 +81,7 @@
 [%- BLOCK patron_fields_dropdown -%]
     [% IF search_box %]
         <label for="searchfieldstype" class="control-label">Search field:</label>
-        <select name="searchfieldstype" id="searchfieldstype" class="form-control">
+        <select name="searchfieldstype" id="searchfieldstype" class="form-select">
     [% ELSE %]
         <label for="searchfieldstype_filter">Search field:</label>
         <select name="searchfieldstype" class="searchfieldstype_filter">

koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc

@@ -97,20 +97,20 @@
                              
                         [% ELSE %]
                             <div class="btn-group">
-                                <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    Actions <span class="caret"></span>
+                                    Actions
                                 </button>
-                                <ul class="dropdown-menu pull-right">
+                                <ul class="dropdown-menu dropdown-menu-end">
                                     [% IF ( recall.requested or recall.overdue ) %]
-                                        <li><a class="cancel_recall" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel</a></li>
+                                        <li><a class="cancel_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel</a></li>
                                         [% IF ( recall.should_be_overdue ) %]
                                             <li><a class="overdue_recall" data-id="[% recall.id | html %]"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li>
                                         [% END %]
                                     [% ELSIF ( recall.waiting ) %]
-                                        <li><a class="revert_recall" data-id="[% recall.id | html %]"><i class="fa fa-undo"></i> Revert waiting</a></li>
+                                        <li><a class="revert_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-undo"></i> Revert waiting</a></li>
-                                        <li><a class="expire_recall" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Expire</a></li>
+                                        <li><a class="expire_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Expire</a></li>
                                     [% ELSIF ( recall.in_transit ) %]
-                                        <li><a class="transit_recall" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li>
+                                        <li><a class="transit_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li>
                                     [% END %]
                                 </ul>
                             </div>
@@ -124,9 +124,9 @@
     </table>
     [% ELSE %]
         [% IF patron.borrowernumber %]
-            <div class="dialog message">Patron has no recalls.</div>
+            <div class="alert alert-info">Patron has no recalls.</div>
         [% ELSE %]
-            <div class="dialog message">There are no recalls to show.</div>
+            <div class="alert alert-info">There are no recalls to show.</div>
         [% END %]
     [% END %]
 </div>

koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc

@@ -1,12 +1,12 @@
 <div id="toolbar" class="btn-toolbar">
     [% IF ( CAN_user_reports_create_reports ) %]
         <div class="btn-group">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
+            <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-plus"></i> New report</button>
             <ul class="dropdown-menu">
-                <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">New guided report</a> </li>
+                <li id="newmenuc"><a class="dropdown-item" href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">New guided report</a> </li>
-                <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql">New SQL report</a> </li>
+                <li id="newsql"><a class="dropdown-item" href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql">New SQL report</a> </li>
                 [% IF Koha.Preference('Mana')==1 %]
-                    <li id="new_mana_sql"><a href="#" data-toggle="modal" data-target="#mana_search_result">New SQL from Mana</a> </li>
+                    <li id="new_mana_sql"><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#mana_search_result">New SQL from Mana</a> </li>
                 [% END %]
             </ul>
         </div>
@@ -26,21 +26,21 @@
         [% ELSE %]
             [% IF ( CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %]
                 <div class="btn-group">
-                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
+                    <button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true"
                         aria-expanded="false">
-                        <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit <span class="caret"></span>
+                        <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit
                     </button>
                     <ul class="dropdown-menu">
                         [% IF ( CAN_user_reports_create_reports ) %]
                             [% UNLESS ( editsql ) # Do not show edit button on edit page %]
                                 <li>
-                                    <a id="editreport" href="/cgi-bin/koha/reports/guided_reports.pl?id=[% id | html %]&amp;op=edit_form">
+                                    <a class="dropdown-item" id="editreport" href="/cgi-bin/koha/reports/guided_reports.pl?id=[% id | html %]&amp;op=edit_form">
                                         Edit
                                     </a>
                                 </li>
                             [% END %]
                             <li>
-                                <a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?op=duplicate&amp;id=[% id | uri %]">
+                                <a class="dropdown-item" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?op=duplicate&amp;id=[% id | uri %]">
                                     Duplicate
                                 </a>
                             </li>
@@ -53,7 +53,7 @@
                                     <input type="hidden" name="op" value="cud-delete" />
                                     <input type="hidden" name="id" value="[% id | html %]" />
                                 </form>
-                                <a href="#" class="delete">Delete</button>
+                                <a href="#" class="dropdown-item delete">Delete</a>
                             </li>
                         [% END %]
                     </ul>
@@ -71,9 +71,9 @@
             </div>
             [% IF templates.count %]
             <div class="btn-group">
-                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
+                <button type="button" class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true"
                     aria-expanded="false">
-                    <i class="fa fa-code"></i> Run with template <span class="caret"></span>
+                    <i class="fa fa-code"></i> Run with template
                 </button>
                 <ul class="dropdown-menu">
                     [% FOREACH tmpl IN templates %]
@@ -95,24 +95,24 @@
 
         [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
             <div class="btn-group">
-                <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> Report mistake <span class="caret"></span></button>
+                <button class="btn btn-default btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> Report mistake</button>
                 <ul class="dropdown-menu">
                     [% FOREACH c IN mana_comments %]
                         <li class="mana-comment" data-id="[% c.id | $raw %]">
-                            <a href="#">[% c.message | html %] ([% c.nb | html %])</a>
+                            <a class="dropdown-item" href="#">[% c.message | html %] ([% c.nb | html %])</a>
                         </li>
                     [% END %]
-                    <li role="separator" class="divider"></li>
+                    <li><hr class="dropdown-divider"></li>
-                    <li class="mana-other-comment"><a href="#">Other</a> </li>
+                    <li class="mana-other-comment"><a class="dropdown-item" href="#">Other</a> </li>
                 </ul>
             </div>
 
             <div id="mana-comment-box" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label">
-                <div class="modal-dialog modal-lg" role="document">
+                <div class="modal-dialog modal-lg">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                            <h1 class="modal-title" id="mana_submit_comment">Enter a new comment (max 35 characters)</h1>
-                            <h3 id="mana_submit_comment">Enter a new comment (max 35 characters)</h3>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                         </div>
                         <div class="modal-body">
                             <input hidden id="mana-resource" value="report">
@@ -135,29 +135,29 @@
 
 
             <div class="btn-group">
-                <button class="btn btn-default dropdown-toggle" aria-haspopup="menu" aria-label="Select format and download report results" data-toggle="dropdown" id="format"><i class="fa fa-download"></i> Download <span class="caret"></span></button>
+                <button class="btn btn-default dropdown-toggle" aria-haspopup="menu" aria-label="Select format and download report results" data-bs-toggle="dropdown" id="format"><i class="fa fa-download"></i> Download</button>
                 <ul class="dropdown-menu">
-                    <li><a id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=csv&amp;id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
+                    <li><a class="dropdown-item" id="csv" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=csv&amp;id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">[% PROCESS 'delimiter_text.inc' %]</a></li>
-                    <li><a id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=tab&amp;id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li>
+                    <li><a class="dropdown-item" id="tab" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=tab&amp;id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Tab separated text</a></li>
-                    <li><a id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=ods&amp;id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Open Document Spreadsheet</a></li>
+                    <li><a class="dropdown-item" id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=ods&amp;id=[% id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Open Document Spreadsheet</a></li>
                     [% IF processed_notice_title %]
-                    <li><a id="template" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=template&amp;id=[% id | html %]&amp;template=[% template_id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Rendered template ([% processed_notice_title | html %])</a></li>
+                    <li><a class="dropdown-item" id="template" href="/cgi-bin/koha/reports/guided_reports.pl?op=export&amp;format=template&amp;id=[% id | html %]&amp;template=[% template_id | html %]&amp;reportname=[% name |uri %][% PROCESS params %]">Rendered template ([% processed_notice_title | html %])</a></li>
                     [% END %]
                     [% IF (results.json) %]
-                        <li><a id="download-chart" href="#">Chart (.svg)</a></li>
+                        <li><a class="dropdown-item" id="download-chart" href="#">Chart (.svg)</a></li>
                     [% END %]
                 </ul>
             </div>
             <div class="btn-group">
-                <button type="button" id="toggle_sql" class="btn btn-default toggle_sql" data-complete-text="<i class='fa-solid fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-toggle="button" aria-pressed="false" autocomplete="off">
+                <button type="button" id="toggle_sql" class="btn btn-default toggle_sql" data-complete-text="<i class='fa-solid fa-eye-slash'></i> [% t('Hide SQL code') | html %]" data-bs-toggle="button" aria-pressed="false" autocomplete="off">
                     <i class="fa-solid fa-eye"></i> Show SQL code
                 </button>
             </div>
             <div class="btn-group">
                 [% IF allresults.size %]
-                    <a class="btn btn-default" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-chart-bar"></i> Create chart</a>
+                    <a class="btn btn-default" href="#" data-bs-toggle="modal" data-bs-target="#chartModal"><i class="fa fa-chart-bar"></i> Create chart</a>
                 [% ELSE %]
-                    <a class="btn btn-default" href="#" data-toggle="modal" data-target="#chartModal"><i class="fa fa-chart-bar"></i> Create chart</a>
+                    <a class="btn btn-default" href="#" data-bs-toggle="modal" data-bs-target="#chartModal"><i class="fa fa-chart-bar"></i> Create chart</a>
                     <a class="btn btn-default fetch_chart_data" href="/cgi-bin/koha/reports/guided_reports.pl?id=[% id | html %]&amp;op=run&amp;reportname=[% name |uri %][% PROCESS params %]&amp;want_full_chart=1"><i class="fa fa-chart-bar"></i> Fetch all data for chart</a>
                 [% END %]
 
@@ -173,15 +173,15 @@
             <form method="get" id="mana_search_form">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <h1 class="modal-title" id="mana_search_result_label">Mana search</h1>
-                        <h3 id="mana_search_result_label">Mana search</h3>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
-                        <div id="mana_search_failed" class="dialog alert mana_search_status" style="display:none">
+                        <div id="mana_search_failed" class="alert alert-warning mana_search_status" style="display:none">
                             Your search could not be completed. Please try again later.
                             <div id="mana_search_errortext"></div>
                         </div>
-                        <div id="mana_use_failed" class="dialog alert mana_search_status" style="display:none">
+                        <div id="mana_use_failed" class="alert alert-warning mana_search_status" style="display:none">
                             This report could not be imported. Please try again later.
                             <div id="mana_use_errortext"></div>
                         </div>
@@ -197,7 +197,7 @@
                         </div>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button>
                     </div>
                 </div>
             </form>

koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc

@@ -12,29 +12,29 @@
         [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
             [% UNLESS ( cannotedit ) %]
                 <div class="btn-group">
-                    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit <span class="caret"></span></button>
+                    <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</button>
                         <ul class="dropdown-menu">
                             [% IF ( CAN_user_serials_edit_subscription ) %]
                                 <li>
-                                    <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid | uri %]">Edit subscription</a>
+                                    <a class="dropdown-item" href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid | uri %]">Edit subscription</a>
                                 </li>
                             [% END %]
 
                             [% IF ( CAN_user_serials_create_subscription ) %]
                                 <li>
-                                    <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid | uri %]">Edit as new (duplicate)</a>
+                                    <a class="dropdown-item" href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid | uri %]">Edit as new (duplicate)</a>
                                 </li>
                             [% END %]
 
                             [% IF CAN_user_editcatalogue_edit_catalogue %]
                                 <li>
-                                    <a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]">Edit record</a>
+                                    <a class="dropdown-item" id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]">Edit record</a>
                                 </li>
                             [% END %]
 
                             [% IF serialsadditems && CAN_user_editcatalogue_edit_items %]
                                 <li>
-                                    <a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Edit items</a>
+                                    <a class="dropdown-item" id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Edit items</a>
                                 </li>
                             [% END %]
 
@@ -44,7 +44,7 @@
                                         [% INCLUDE 'csrf-token.inc' %]
                                         <input type="hidden" name="op" value="cud-del" />
                                         <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" />
-                                        <button type="submit" class="btn btn-default" id="deletesub">Delete subscription</button>
+                                        <button type="submit" class="dropdown-item" id="deletesub">Delete subscription</button>
                                     </form>
                                 </li>
                             [% END %]
@@ -85,25 +85,25 @@
 
         [% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
             [% IF one_language_enabled==0 or mana_id %]
-                <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div>
+                <div class="btn-group"><a data-bs-toggle="modal" data-bs-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing." data-bs-target="#mana_share_modal" class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div>
             [% ELSE %]
-                <div class="btn-group" id="mana-subscription-share" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div>
+                <div class="btn-group" id="mana-subscription-share" data-bs-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div>
             [% END %]
         [% END %]
 
         [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
             <div class="btn-group">
-                <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> Report mistake <span class="caret"></span></button>
+                <button class="btn btn-default btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> Report mistake</button>
                 <ul class="dropdown-menu mana-actions">
                     [% IF ( mana_comments ) %]
                         [% FOREACH c IN mana_comments %]
                             <li>
-                                <a data-commentid="[% c.id | html %]" data-resourceid="[% mana_id | html %]" href="#">[% c.message | html %] ([% c.nb | html %])</a>
+                                <a class="dropdown-item" data-commentid="[% c.id | html %]" data-resourceid="[% mana_id | html %]" href="#">[% c.message | html %] ([% c.nb | html %])</a>
                             </li>
                         [% END %]
-                        <li role="separator" class="divider"></li>
+                        <li><hr class="dropdown-divider"></li>
                     [% END %]
-                    <li><a data-commentid="other" data-resourceid="[% mana_id | html %]" href="#">New comment</a></li>
+                    <li><a class="dropdown-item" data-commentid="other" data-resourceid="[% mana_id | html %]" href="#">New comment</a></li>
                 </ul>
             </div>
         [% END %]
@@ -119,12 +119,12 @@
 [% END %]
 
 <div class="modal" id="mana-comment-box" tabindex="-1" role="dialog" aria-labelledby="mana_submit_comment">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <form id="mana_comment_form" action="/cgi-bin/koha/serials/subscription-detail.pl" method="get">
                 <div class="modal-header">
-                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h1 class="modal-title" id="mana_submit_comment">Please enter a new comment (max 35 characters)</h1>
-                    <h4 class="modal-title" id="mana_submit_comment">Please enter a new comment (max 35 characters)</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <input type="hidden" id="mana-resource" value="subscription" />
@@ -134,7 +134,7 @@
                     <a href="#" class="cancel" id="mana-comment-close">Cancel</a>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
                 </div>
             </form>
         </div> <!-- /.modal-content -->
@@ -142,11 +142,11 @@
 </div> <!-- /#mana-comment-box -->
 
 <div id="mana_share_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_share_modal_label">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h1 class="modal-title" id="mana_share_modal_label">Share [% bibliotitle | html %] to Mana</h1>
-                <h4 id="mana_share_modal_label">Share [% bibliotitle | html %] to Mana</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 [% IF (mana_id) %]
@@ -228,8 +228,8 @@
                 [% END %]
             </div> <!-- /.modal-body -->
             <div class="modal-footer">
-                <button type="submit" form="mana_share_form" class="btn btn-default">Share</button>
+                <button type="submit" form="mana_share_form" class="btn btn-primary">Share</button>
-                <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                <button class="btn btn-default" type="button" data-bs-dismiss="modal">Cancel</button>
             </div>
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->