diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
index 72be3f10e8..d27059c45f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
@@ -1,8 +1,8 @@
[% INCLUDE 'format_price.inc' %]
-
-
-
-
+
+
+
+
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
index c5647934b9..7dc56b3286 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 91402eb3ed..319bcda340 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -10,16 +10,16 @@
-
-
-
-
-
+
+
+
+
+
[% INCLUDE intranetstylesheet.inc %]
-[% IF ( bidi ) %][% END %]
+[% IF ( bidi ) %][% END %]
[% IF ( login ) %]
-
+
[% END %]
[% IF ( IntranetUserCSS ) %][% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc
index 11d7581676..dcc80ee490 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc
@@ -1,7 +1,7 @@
-
-
-
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
index 7d85d9505a..4c2f955abe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
@@ -2,19 +2,19 @@
Online help
-
-
+
+
[% INCLUDE intranetstylesheet.inc %]
[% IF ( bidi ) %]
-
+
[% END %]
-
-
-
-
+
+
+
+
-
+
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
index 16de754256..ec984e2490 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
@@ -1,14 +1,14 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
[% END %]
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
[% INCLUDE 'validator-strings.inc' %]
[% IF ( IntranetUserJS ) %]
@@ -51,11 +51,11 @@
//]]>
-
+
[% END %]
[% IF LocalCoverImages %]
-
+
-
-
+
+
+
-
+
+
+
[% INCLUDE 'datatables.inc' %]
-
-
+
+
+
[% INCLUDE 'datatables.inc' %]
-
+
-
-
-
-
+
+
+
+
+
[% IF ( grouping ) %]
-
-
-
-
+
+
+
+
-
+
[% INCLUDE 'header.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index ddf104ad8e..8ead4d848b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -1,10 +1,10 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %]
-
+
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'z3950_search.inc' %]
-
+
@@ -85,9 +85,9 @@
[% MACRO jsinclude BLOCK %]
-
+
[% INCLUDE 'datatables.inc' %]
-
+
+
[% INCLUDE 'datatables.inc' %]
-
+
+
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
index 24ce22e6b4..4fecf601d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
@@ -279,6 +279,6 @@
[% MACRO jsinclude BLOCK %]
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index 869edc9fea..f3e3d8823e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -2,7 +2,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › [% IF op =='add_form' %]Cities › [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -174,7 +174,7 @@
[% MACRO jsinclude BLOCK %]
-
+
[% INCLUDE 'datatables.inc' %]
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
index f58621aeff..fee48e09ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
@@ -67,7 +67,7 @@
[% MACRO jsinclude BLOCK %]
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
index d7faa30a76..adac3ab3fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
@@ -165,7 +165,7 @@
[% MACRO jsinclude BLOCK %]
-
+
+
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
index ee52187451..2feff31a01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
@@ -171,6 +171,6 @@
[% MACRO jsinclude BLOCK %]
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
index 46cd8d554a..96913220dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt
@@ -74,7 +74,7 @@
[% MACRO jsinclude BLOCK %]
-
+
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
index ea419ca939..3b0b18fd82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
@@ -109,11 +109,11 @@
[% MACRO jsinclude BLOCK %]
-
+
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 17ddd0bf85..183e4f080d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -22,7 +22,7 @@ Data deleted
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
[% ELSE %][% INCLUDE 'doc-head-close.inc' %]
-
+
[% END %]
[% IF ( print_basket ) %][% ELSE %][% END %]
@@ -290,8 +290,8 @@
[% INCLUDE js_includes.inc %]
[% UNLESS ( print_basket ) %]
[% INCLUDE 'datatables.inc' %]
-
-
+
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
index eb76911ee9..3a42fd1aeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
@@ -48,9 +48,9 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'catalog-strings.inc' %]
-
+
[% INCLUDE 'browser-strings.inc' %]
-
+
+
[% INCLUDE 'browser-strings.inc' %]
-
+
+
+
[% INCLUDE 'greybox.inc' %]
[% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %]
-
+
[% END %]
[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'browser-strings.inc' %]
-
+
+
-
+
+
+
[% INCLUDE 'browser-strings.inc' %]
-
+
+
[% INCLUDE 'browser-strings.inc' %]
-
+
-
+
+
+
-
+
+
[% INCLUDE 'browser-strings.inc' %]
-
+
[% IF ( bidi ) %]
-
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 5907868d8e..0b681188b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -3,13 +3,13 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber %]) › Items
-
+
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'columns_settings.inc' %]
[% INCLUDE 'browser-strings.inc' %]
-
+
[% IF ( bidi ) %]
-
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
index 6deefad165..6c7ebdc73d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt
@@ -7,7 +7,7 @@
[% IF ( bidi ) %]
-
+
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index 76c91494bd..3dfdf735bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -186,7 +186,7 @@ div#result { margin-top: 1em; }
[% MACRO jsinclude BLOCK %]
-
+
[% INCLUDE 'merge-record-strings.inc' %]
+
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'z3950_search.inc' %]
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 23775f24b1..c3bdb40c48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -2,7 +2,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Z39.50/SRU search results
[% INCLUDE 'doc-head-close.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index f2e443d45f..200f95c1b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -7,7 +7,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Circulation › Holds to pull
[% INCLUDE 'doc-head-close.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
index 09b550b924..8395e7ffc8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
@@ -12,7 +12,7 @@
[% INCLUDE 'doc-head-close.inc' %]
-
+
[% IF ( Koha.Preference('SlipCSS') ) %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 1ca4a6644f..a64dc1206d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -7,7 +7,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Circulation › Request article
[% INCLUDE 'doc-head-close.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index dc6cfe4438..6125bd7b37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -6,7 +6,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Circulation › Hold ratios
[% INCLUDE 'doc-head-close.inc' %]
-
+
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 844e4a3ebe..8a6efa73b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -5,7 +5,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Circulation › Holds awaiting pickup
[% INCLUDE 'doc-head-close.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
index dfca97af28..02b5b2181e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
@@ -5,7 +5,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Tools › Patron clubs › Club enrollments
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -51,7 +51,7 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
-
+
+
+
[% INCLUDE intranetstylesheet.inc %]
-
+
Online Help
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index f167a0b7e8..c21fc97951 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -5,8 +5,8 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › ILL requests ›
[% INCLUDE 'doc-head-close.inc' %]
-
-
+
+
[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'datatables.inc' %]
+
-
+
+
+
+
[% INCLUDE 'calendar.inc' %]
-
+
[% INCLUDE 'header.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index 2e00db9c73..6f0ce08d03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -4,7 +4,7 @@
[% INCLUDE 'doc-head-close.inc' %]
-
+
[% INCLUDE 'slip-print.inc' #printThenClose %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 180d941562..6277abd40b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -13,17 +13,17 @@
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
-
+
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
[% INCLUDE 'strings.inc' %]
-
-
+
+
[% INCLUDE 'timepicker.inc' %]
-
-
-
-
+
+
+
+
+
+
-
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
index 51ed7f0e7f..1207b85a01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt
@@ -4,7 +4,7 @@
[% INCLUDE 'installer-doc-head-close.inc' %]
[% INCLUDE 'validator-strings.inc' %]
[% INCLUDE 'installer-strings.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
index ec9c7b6d9e..9110179f9e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt
@@ -3,7 +3,7 @@
[% INCLUDE 'installer-doc-head-close.inc' %]
[% INCLUDE 'validator-strings.inc' %]
[% INCLUDE 'installer-strings.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
index dfae544472..a2532898c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt
@@ -9,7 +9,7 @@
[% INCLUDE 'installer-doc-head-close.inc' %]
[% INCLUDE 'validator-strings.inc' %]
[% INCLUDE 'installer-strings.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
index f094a61f5d..2a27110bcc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
@@ -65,7 +65,7 @@
[% MACRO jsinclude BLOCK %]
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
index e0092fbdc1..ba846b5901 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
@@ -4,7 +4,7 @@
Koha › Tools › Patron lists › [% list.name %] › Add patrons
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -104,10 +104,10 @@
[% MACRO jsinclude BLOCK %]
-
+
[% INCLUDE 'datatables.inc' %]
-
+
+
[% INCLUDE 'datatables.inc' %]
+
[% INCLUDE 'calendar.inc' %]
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
index c7bf918e70..a5dc9acb81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
@@ -121,8 +121,8 @@
[% MACRO jsinclude BLOCK %]
-
-
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
index cb0e7297b9..1bfe14d7e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
@@ -137,8 +137,8 @@
[% MACRO jsinclude BLOCK %]
-
-
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
index 3564235cc1..111e92d615 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
@@ -3,7 +3,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Tools › Rotating collections
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -67,8 +67,8 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
-
-
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
index 7d457b8972..51777738bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
@@ -59,8 +59,8 @@
[% MACRO jsinclude BLOCK %]
-
-
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
index e356bbeb12..06ee078858 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
@@ -10,7 +10,7 @@
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index eb001f4b43..5c823b98e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -4,7 +4,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Claims
[% INCLUDE 'doc-head-close.inc' %]
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index 2b14039539..f59fd350fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -5,7 +5,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Serial collection information for [% bibliotitle %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -270,8 +270,8 @@
var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?");
var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?");
-
-
+
+
-
+
+
[% INCLUDE 'calendar.inc' %]
+
-
+
-
-
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index c9d0330531..f759d14ec6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -378,7 +378,7 @@
var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?");
var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?");
-
+
+
[% END %]
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index f7e6fcc2f0..c793e2d298 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -19,7 +19,7 @@
[% INCLUDE 'doc-head-close.inc' %]
[% IF ( op_else ) %]
-
+
[% END %]
[% IF ( op_else ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
index 989b451431..eacb7d8cec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -3,7 +3,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -186,10 +186,10 @@
[% MACRO jsinclude BLOCK %]
-
+
[% INCLUDE 'datatables.inc' %]
-
-
+
+
-
-
+
+
+
[% INCLUDE 'datatables.inc' %]
-
-
+
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
index aee52e1480..ae3ac4bc01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
@@ -3,7 +3,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Tools › Batch record deletion
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -177,9 +177,9 @@
[% MACRO jsinclude BLOCK %]
-
+
[% INCLUDE 'datatables.inc' %]
-
+
+
[% INCLUDE 'datatables.inc' %]
-
-
+
+
+
[% INCLUDE 'calendar.inc' %]
+
+
[% INCLUDE 'calendar.inc' %]
+
+
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'calendar.inc' %]
-
+
+
[% IF ( opac_news_count ) %]
[% INCLUDE 'datatables.inc' %]
[% END %]
-
+
+
[% INCLUDE 'datatables.inc' %]
-
-
+
+
-
+
+
[% INCLUDE 'datatables.inc' %]
+
-
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 53b5c0d05e..d4a9e234d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -5,7 +5,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Tools › Batch patron modification
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -295,7 +295,7 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
-
+
+
+
[% INCLUDE 'datatables.inc' %]
-
+
+
[% INCLUDE 'datatables.inc' %]
-
-
+
+
+
[% INCLUDE 'calendar.inc' %]
-
+
+
-
-
+
+
+
-
-
+
+
+
+
[% INCLUDE 'datatables.inc' %]
-
+
+
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index e1064e4e17..d3c4ac4002 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -6,7 +6,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname | html %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname | html %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
[% BLOCK list_permissions %]
@@ -415,7 +415,7 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
-
+
[% IF print %]
-
+
+
[% END %]
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
index 5635cdcacc..0f651c8c4a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -3,15 +3,15 @@
[% IF ( bidi ) %]
-
+
[% ELSE %]
-
+
[% END %]
[% IF ( bidi ) %]
-
+
[% ELSE %]
-
+
[% END %]
[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
@@ -30,9 +30,9 @@
[% IF ( opac_css_override ) %]
[% END %]
-
+
[% IF ( bidi ) %]
-
+
[% END %]
[% IF ( OPACUserCSS ) %][% END %]
[% IF SCO_login %]
@@ -50,6 +50,6 @@
-
-
+
+
[% PROCESS 'html_helpers.inc' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc
index 92ef62d682..67a081f11a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc
@@ -1,7 +1,7 @@
-
-
-
+
+
+
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 834669144d..70c8ad9b62 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -77,14 +77,14 @@
-
-
+
+
-
-
+
+
-
+
[% END %]
[% IF Koha.Preference( 'opacbookbag' ) == 1 %]
-
+
[% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
-
+
[% ELSE %]
[% END %]
-[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %]
+[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %]
[% IF ( GoogleJackets ) %]
-
+
[% END %]
[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
-
+
+
+
+
-
+
[% END %]
[% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
@@ -240,7 +240,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
[% END %]
-
+
-
+
+
+
+
[% END %]
[% ELSE %]
-
+
[% INCLUDE 'datatables.inc' %]
+
[% END %]
[% IF ( Babeltheque ) %]
@@ -1383,16 +1383,16 @@
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
[% IF ( SocialNetworks ) %]
-
-
+
[% END %]
-[% IF ( OpacStarRatings != 'disable' ) %][% END %]
+[% IF ( OpacStarRatings != 'disable' ) %][% END %]
-[% IF ( OpacHighlightedWords ) %][% END %]
+[% IF ( OpacHighlightedWords ) %][% END %]
+
[% PROCESS 'password_check.inc' %]
[% PROCESS 'add_password_check' new_password => 'borrower_password' %]
-
+
+
+
[% PROCESS 'password_check.inc' %]
[% PROCESS 'add_password_check' new_password => 'Newkey' %]
+
[% END %]
[% END %]
-[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% END %]
-[% IF ( OverDriveEnabled ) %][% END %]
-
-[% IF ( OpacHighlightedWords ) %]
+[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% END %]
+[% IF ( OverDriveEnabled ) %][% END %]
+
+[% IF ( OpacHighlightedWords ) %]
[% END %]
+
+
+
[% INCLUDE 'datatables.inc' %]
[% IF Koha.Preference('OverDriveCirculation') %]
-
+
-
+
[% INCLUDE 'masthead-sco.inc' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
index 025bf53ead..cd87e00dac 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
@@ -3,14 +3,14 @@
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout › Print Receipt for [% borrowernumber %]
-
+
[% IF stylesheet %]
[% END %]
-
-
+
+
[% INCLUDE 'slip-print.inc' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index 2ab9367288..cdbd52d77e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -6,9 +6,9 @@
-
-
-
+
+
+
[% IF ( Koha.Preference('OPACUserCSS') ) %][% END %]
[% IF ( Koha.Preference('SCOUserCSS') ) %][% END %]