Bugzilla – Attachment 175478 Details for
Bug 30707
Move container's closing div tag into template from intranet-bottom.inc
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30707: Move container's closing div tag into template from intranet-bottom.inc
Bug-30707-Move-containers-closing-div-tag-into-tem.patch (text/plain), 118.77 KB, created by
David Nind
on 2024-12-15 18:13:32 UTC
(
hide
)
Description:
Bug 30707: Move container's closing div tag into template from intranet-bottom.inc
Filename:
MIME Type:
Creator:
David Nind
Created:
2024-12-15 18:13:32 UTC
Size:
118.77 KB
patch
obsolete
>From 33cd3d9a3308b00c47befb9424d2dc64bc9607cc Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 3 Jun 2022 15:52:46 +0000 >Subject: [PATCH] Bug 30707: Move container's closing div tag into template > from intranet-bottom.inc > >For templates which use the intranet-bottom include file, the markup in >that template lacks the main container's closing </div>, expecting it to >be closed in intranet-bottom.inc. > >This patch moves that closing </div> into each template. This is >intended to make it clearer to anyone trying to maintain the correct >structure of the page and hopefully to make it possible to automatically >tidy template files. > >Signed-off-by: David Nind <david@davidnind.com> >--- > .../prog/en/includes/intranet-bottom.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 ++- > .../prog/en/modules/acqui/acqui-home.tt | 1 + > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 1 + > .../prog/en/modules/acqui/basketheader.tt | 1 + > .../prog/en/modules/acqui/booksellers.tt | 1 + > .../prog/en/modules/acqui/duplicate_orders.tt | 1 + > .../prog/en/modules/acqui/edifactmsgs.tt | 1 + > .../prog/en/modules/acqui/histsearch.tt | 1 + > .../prog/en/modules/acqui/invoice-files.tt | 1 + > .../prog/en/modules/acqui/invoice.tt | 2 ++ > .../prog/en/modules/acqui/invoices.tt | 1 + > .../prog/en/modules/acqui/lateorders.tt | 1 + > .../prog/en/modules/acqui/neworderempty.tt | 1 + > .../prog/en/modules/acqui/newordersubscription.tt | 1 + > .../prog/en/modules/acqui/newordersuggestion.tt | 1 + > .../prog/en/modules/acqui/ordered.tt | 1 + > .../prog/en/modules/acqui/orderreceive.tt | 2 ++ > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 1 + > .../prog/en/modules/acqui/parcels.tt | 1 + > .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 1 + > .../prog/en/modules/acqui/supplier.tt | 1 + > .../prog/en/modules/acqui/transferorder.tt | 1 + > .../prog/en/modules/acqui/uncertainprice.tt | 1 + > .../prog/en/modules/acqui/z3950_search.tt | 1 + > .../prog/en/modules/admin/additional-fields.tt | 1 + > .../prog/en/modules/admin/adveditorshortcuts.tt | 1 + > .../prog/en/modules/admin/aqbudgetperiods.tt | 1 + > .../prog/en/modules/admin/aqbudgets.tt | 1 + > .../prog/en/modules/admin/aqcontract.tt | 1 + > .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 1 + > .../prog/en/modules/admin/audio_alerts.tt | 2 ++ > .../en/modules/admin/auth_subfields_structure.tt | 1 + > .../prog/en/modules/admin/auth_tag_structure.tt | 1 + > .../prog/en/modules/admin/authorised_values.tt | 1 + > .../prog/en/modules/admin/authtypes.tt | 1 + > .../prog/en/modules/admin/background_jobs.tt | 1 + > .../prog/en/modules/admin/biblio_framework.tt | 1 + > .../en/modules/admin/branch_transfer_limits.tt | 1 + > .../prog/en/modules/admin/branches.tt | 1 + > .../prog/en/modules/admin/cash_registers.tt | 1 + > .../prog/en/modules/admin/categories.tt | 1 + > .../prog/en/modules/admin/checkmarc.tt | 1 + > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 1 + > .../prog/en/modules/admin/classsources.tt | 1 + > .../prog/en/modules/admin/clone-rules.tt | 1 + > .../prog/en/modules/admin/columns_settings.tt | 1 + > .../prog/en/modules/admin/credit_types.tt | 1 + > .../prog/en/modules/admin/currency.tt | 1 + > .../prog/en/modules/admin/debit_types.tt | 1 + > .../intranet-tmpl/prog/en/modules/admin/desks.tt | 1 + > .../prog/en/modules/admin/didyoumean.tt | 1 + > .../prog/en/modules/admin/edi_accounts.tt | 1 + > .../prog/en/modules/admin/edi_ean_accounts.tt | 1 + > .../en/modules/admin/item_circulation_alerts.tt | 1 + > .../prog/en/modules/admin/items_search_field.tt | 1 + > .../prog/en/modules/admin/items_search_fields.tt | 2 +- > .../prog/en/modules/admin/itemtypes.tt | 1 + > .../prog/en/modules/admin/koha2marclinks.tt | 1 + > .../prog/en/modules/admin/library_groups.tt | 1 + > .../prog/en/modules/admin/localization.tt | 4 ++-- > .../en/modules/admin/marc_subfields_structure.tt | 1 + > .../prog/en/modules/admin/marctagstructure.tt | 1 + > .../prog/en/modules/admin/matching-rules.tt | 1 + > .../prog/en/modules/admin/oai_set_mappings.tt | 1 + > .../prog/en/modules/admin/oai_sets.tt | 1 + > .../prog/en/modules/admin/overdrive.tt | 1 + > .../prog/en/modules/admin/patron-attr-types.tt | 1 + > .../prog/en/modules/admin/preferences.tt | 1 + > .../admin/searchengine/elasticsearch/mappings.tt | 1 + > .../prog/en/modules/admin/share_content.tt | 1 + > .../prog/en/modules/admin/smart-rules.tt | 1 + > .../prog/en/modules/admin/sms_providers.tt | 1 + > .../prog/en/modules/admin/smtp_servers.tt | 1 + > .../prog/en/modules/admin/sru_modmapping.tt | 1 + > .../prog/en/modules/admin/sru_modmapping_auth.tt | 1 + > .../prog/en/modules/admin/systempreferences.tt | 1 + > .../prog/en/modules/admin/transfer_limits.tt | 1 + > .../en/modules/admin/transport-cost-matrix.tt | 1 + > .../prog/en/modules/admin/usage_statistics.tt | 1 + > .../prog/en/modules/admin/z3950servers.tt | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 1 + > .../prog/en/modules/authorities/auth_finder.tt | 1 + > .../en/modules/authorities/authorities-home.tt | 2 +- > .../authorities/blinddetail-biblio-search.tt | 1 + > .../prog/en/modules/authorities/detail.tt | 1 + > .../prog/en/modules/authorities/merge.tt | 1 + > .../modules/authorities/searchresultlist-auth.tt | 4 ++-- > .../en/modules/authorities/searchresultlist.tt | 1 + > .../prog/en/modules/catalogue/ISBDdetail.tt | 1 + > .../prog/en/modules/catalogue/MARCdetail.tt | 1 + > .../prog/en/modules/catalogue/advsearch.tt | 1 + > .../prog/en/modules/catalogue/detail.tt | 1 + > .../prog/en/modules/catalogue/imageviewer.tt | 1 + > .../prog/en/modules/catalogue/issuehistory.tt | 1 + > .../prog/en/modules/catalogue/itemsearch.tt | 1 + > .../en/modules/catalogue/labeledMARCdetail.tt | 1 + > .../prog/en/modules/catalogue/moredetail.tt | 1 + > .../prog/en/modules/catalogue/results.tt | 1 + > .../prog/en/modules/catalogue/search-history.tt | 3 ++- > .../prog/en/modules/catalogue/stockrotation.tt | 1 + > .../prog/en/modules/cataloguing/addbooks.tt | 1 + > .../prog/en/modules/cataloguing/merge.tt | 1 + > .../prog/en/modules/cataloguing/moveitem.tt | 1 + > .../en/modules/cataloguing/z3950_auth_search.tt | 3 ++- > .../prog/en/modules/cataloguing/z3950_search.tt | 3 ++- > .../prog/en/modules/circ/article-requests.tt | 2 +- > .../prog/en/modules/circ/bookcount.tt | 1 + > .../prog/en/modules/circ/checkout-notes.tt | 1 + > .../prog/en/modules/circ/circulation.tt | 1 + > .../modules/circ/circulation_batch_checkouts.tt | 1 + > .../prog/en/modules/circ/on-site_checkouts.tt | 1 + > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 1 + > .../prog/en/modules/circ/pendingreserves.tt | 1 + > .../intranet-tmpl/prog/en/modules/circ/renew.tt | 1 + > .../prog/en/modules/circ/request-article.tt | 1 + > .../prog/en/modules/circ/reserveratios.tt | 1 + > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + > .../prog/en/modules/circ/set-library.tt | 15 ++++++++------- > .../prog/en/modules/circ/transfers_to_send.tt | 1 + > .../prog/en/modules/circ/transferstoreceive.tt | 1 + > .../prog/en/modules/circ/view_holdsqueue.tt | 1 + > .../prog/en/modules/circ/waitingreserves.tt | 1 + > .../prog/en/modules/clubs/club-enrollments.tt | 1 + > .../prog/en/modules/clubs/clubs-add-modify.tt | 1 + > .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 1 + > .../prog/en/modules/clubs/templates-add-modify.tt | 1 + > .../en/modules/course_reserves/add_items-step1.tt | 1 + > .../en/modules/course_reserves/add_items-step2.tt | 1 + > .../en/modules/course_reserves/batch_add_items.tt | 1 + > .../en/modules/course_reserves/batch_rm_items.tt | 1 + > .../en/modules/course_reserves/course-details.tt | 1 + > .../en/modules/course_reserves/course-reserves.tt | 1 + > .../prog/en/modules/course_reserves/course.tt | 2 +- > .../prog/en/modules/ill/ill-requests.tt | 1 + > .../prog/en/modules/installer/step3.tt | 4 ++-- > .../prog/en/modules/intranet-main.tt | 2 +- > .../prog/en/modules/labels/barcode-print.tt | 1 + > .../prog/en/modules/labels/label-edit-batch.tt | 1 + > .../prog/en/modules/labels/label-edit-layout.tt | 1 + > .../prog/en/modules/labels/label-edit-profile.tt | 1 + > .../prog/en/modules/labels/label-edit-template.tt | 1 + > .../prog/en/modules/labels/label-home.tt | 1 + > .../prog/en/modules/labels/label-manage.tt | 1 + > .../prog/en/modules/labels/label-print.tt | 2 +- > .../prog/en/modules/labels/result.tt | 2 +- > .../prog/en/modules/labels/search.tt | 2 +- > .../prog/en/modules/labels/spinelabel-home.tt | 1 + > .../en/modules/members/accountline-details.tt | 1 + > .../prog/en/modules/members/apikeys.tt | 1 + > .../prog/en/modules/members/boraccount.tt | 1 + > .../prog/en/modules/members/deletemem.tt | 1 + > .../prog/en/modules/members/discharge.tt | 1 + > .../prog/en/modules/members/discharges.tt | 1 + > .../prog/en/modules/members/files.tt | 1 + > .../prog/en/modules/members/holdshistory.tt | 1 + > .../prog/en/modules/members/housebound.tt | 1 + > .../prog/en/modules/members/ill-requests.tt | 1 + > .../prog/en/modules/members/mancredit.tt | 1 + > .../prog/en/modules/members/maninvoice.tt | 1 + > .../prog/en/modules/members/member-flags.tt | 1 + > .../prog/en/modules/members/member-password.tt | 1 + > .../prog/en/modules/members/member.tt | 1 + > .../prog/en/modules/members/memberentrygen.tt | 2 ++ > .../prog/en/modules/members/members-update.tt | 1 + > .../prog/en/modules/members/merge-patrons.tt | 1 + > .../prog/en/modules/members/moremember-print.tt | 2 ++ > .../prog/en/modules/members/moremember.tt | 1 + > .../prog/en/modules/members/notices.tt | 1 + > .../intranet-tmpl/prog/en/modules/members/pay.tt | 1 + > .../prog/en/modules/members/paycollect.tt | 1 + > .../en/modules/members/purchase-suggestions.tt | 1 + > .../prog/en/modules/members/readingrec.tt | 1 + > .../prog/en/modules/members/recallshistory.tt | 1 + > .../prog/en/modules/members/routing-lists.tt | 1 + > .../prog/en/modules/members/statistics.tt | 1 + > .../prog/en/modules/members/two_factor_auth.tt | 1 + > .../prog/en/modules/members/update-child.tt | 3 ++- > .../prog/en/modules/offline_circ/list.tt | 1 + > .../prog/en/modules/offline_circ/process_koc.tt | 1 + > .../prog/en/modules/onboarding/onboardingstep2.tt | 4 ++-- > .../prog/en/modules/onboarding/onboardingstep3.tt | 4 ++-- > .../prog/en/modules/onboarding/onboardingstep4.tt | 4 ++-- > .../prog/en/modules/onboarding/onboardingstep5.tt | 4 ++-- > .../prog/en/modules/patron_lists/add-modify.tt | 3 ++- > .../prog/en/modules/patron_lists/list.tt | 1 + > .../prog/en/modules/patron_lists/lists.tt | 1 + > .../prog/en/modules/patroncards/edit-batch.tt | 2 ++ > .../prog/en/modules/patroncards/edit-layout.tt | 1 + > .../prog/en/modules/patroncards/edit-profile.tt | 1 + > .../prog/en/modules/patroncards/edit-template.tt | 1 + > .../prog/en/modules/patroncards/image-manage.tt | 1 + > 192 files changed, 218 insertions(+), 36 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >index cb6b50ae30..8de8e397ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >@@ -8,7 +8,7 @@ > [% SET CookieConsentPopup = AdditionalContents.get( location => "CookieConsentPopup", lang => lang, library => branchcode || default_branch ) %] > [% USE JSConsents %] > [% END %] >- </div> >+ > [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %] > [% UNLESS ( one_language_enabled ) %] > <div id="changelanguage" class="navbar navbar-expand navbar-light bg-light"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 51ec026650..112d4c1d74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -59,7 +59,8 @@ > <div id="koha_community"><a href="https://www.koha-community.org"><i class="fa-solid fa-globe"></i> Koha Community</a></div> > </div> <!-- /.col-md-12 --> > </div> <!-- /.row --> >-<!-- the main div is closed in intranet-bottom.inc --> >+</div> <!-- /.main.container-fluid --> >+ > [% INCLUDE 'intranet-bottom.inc' %] > > [% BLOCK about_panel %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index f8f91cab66..b670c6720d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -218,6 +218,7 @@ > </div> > > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 729661670b..8ee3b6231b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -966,6 +966,7 @@ > </aside> > </div> <!-- /.col-md-2 order-sm-2 order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > <!-- Modal for editing vendor and internal notes --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 75a5443193..47d1fc3f48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -160,6 +160,7 @@ > [% END %] > </div> <!-- /.col-md-10 offset-md-1 col-lg-8 offset-lg-2 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 726e10188a..931df5d3d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -255,6 +255,7 @@ > </aside> > </div> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index a430243375..aa382df885 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -308,6 +308,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 69cb4c43c5..cc6cd3ef4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -68,6 +68,7 @@ > </aside> > </div> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 18f3d32df0..2792ad9c7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -155,6 +155,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index 5e502804a9..bf2c01e341 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -123,6 +123,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index baef5c261a..d0fc98709e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -539,6 +539,8 @@ > [% END # /FOREACH budget %] > </span> <!-- /#all_fund_dropdown --> > >+</div> <!-- /.main.container-fluid --> >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% Asset.js("js/form-submit.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 6c46799d2a..d5d4e718ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -416,6 +416,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 51873b164d..784185b0f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -276,6 +276,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> >+</div> <!-- /.main.container-fluid --> > > <!-- Modal for editing vendor and internal notes --> > <div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 72433c41ef..c124e9757e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -799,6 +799,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %] > [% SET columns = ['cardnumber','name','category','branch','action'] %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index 884fdd79bc..09f22aedef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -119,6 +119,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 198934b565..8c1c19324e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -123,6 +123,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index b948122764..0afb161745 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -136,6 +136,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 4ac0cbc33c..3c3aa4c64b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -455,6 +455,8 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 0d3d2a16ed..7cc04f97c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -353,6 +353,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 2501b191fb..6a04174e51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -252,6 +252,7 @@ > </div> <!-- /.col-md-2.order-md-1 --> > > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index c074de2512..9dcfab02ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -151,6 +151,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 1a2450ee93..d989d4b663 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -529,6 +529,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >index 167170c3dd..499eb25b5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -156,6 +156,7 @@ > </fieldset> > </div> > </nav> >+ </div> <!-- /.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% IF transferred %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 820e49373c..1f96b75e7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -176,6 +176,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >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 0dac1852d1..855cc1c0da 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 >@@ -299,6 +299,7 @@ tr.selected td { > [% END %] > </div> <!-- /.col-md-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >index 3cf17ac616..be9d188ddf 100755 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt >@@ -286,6 +286,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >index 57182803e0..2952d4b295 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >@@ -80,6 +80,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index 210b1043d3..0372dc92aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -550,6 +550,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 479ab84895..64549f2d4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -542,6 +542,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acq.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index 4986b3f5cb..4267797e12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -201,6 +201,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index 9c047d754e..345ea3a491 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -297,6 +297,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acq.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >index e1ee9d934a..8877a21986 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >@@ -189,6 +189,8 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> >+ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% Asset.js("js/audio_alerts.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 571ae059e9..3b1c08d9ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -403,6 +403,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index 7f6500c938..d5d72f9860 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -291,6 +291,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 2bfb4f3f7f..2a7145f450 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -398,6 +398,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index 7f1671a3ae..ba4c202bf2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -296,6 +296,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >index 70a9b7776d..d7715dbca8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >@@ -150,6 +150,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index 7e471c48c6..e704d5f8fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -334,6 +334,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index cc26798a4f..e8c26d6b0b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -119,6 +119,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index cdf73a5b86..c1683e5a21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -623,6 +623,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >index b81a5067e5..094f20aa7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >@@ -240,6 +240,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index a162519f98..f60cb45555 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -818,6 +818,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >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 769700dafd..10e454e22c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >@@ -306,6 +306,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >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 f98e5415a9..e3cb897b56 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -214,6 +214,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index 6d61effe87..abaad1fe12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -438,6 +438,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >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 b687473394..d56f247971 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 >@@ -57,6 +57,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >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 01de61d112..f4a399e40d 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 >@@ -396,6 +396,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >index cccf873a6c..7686dfecb9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >@@ -239,6 +239,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index a3ef292b31..5f6d0b0be3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -283,6 +283,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >index e0aa3a7bd4..440122c5af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >@@ -259,6 +259,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index 782a86fe5b..c947c77fad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -220,6 +220,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index 270e868b09..44ea3534a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -88,6 +88,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 6068ebcfe5..43c1616fc0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >@@ -402,6 +402,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >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 073ff33df6..fa6f315e93 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 >@@ -224,6 +224,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >index d3f9b770d5..a7afbaff24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >@@ -179,6 +179,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >index a43ac03215..38dd2152cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >@@ -83,6 +83,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >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 e6ebdd5e8e..dcd12f8197 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 >@@ -120,7 +120,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >- >+ </div> <!-- /.main.container-fluid --> > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% Asset.js("js/item_search_fields.js") | $raw %] >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 278d10815f..f2e0ad642f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -537,6 +537,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index 6d608f07e8..4dd254916d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -88,6 +88,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >index 8120dd647a..2654995401 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >@@ -100,6 +100,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <div id="add-group-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="add-group-modal-label" aria-hidden="true"> > <form method="post" id="add-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >index fc500a8e31..8301d6966f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >@@ -12,7 +12,7 @@ > </head> > > <body id="admin_localization" class="admin"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div class="col-sm-12"> > <h1>Localization</h1> >@@ -89,7 +89,7 @@ > </table> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >- </div> <!-- /.container-fluid --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index 1c7ee58112..0dd5956c21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -416,6 +416,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index 440cc0d184..efd8d1d393 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -304,6 +304,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index 0de0a22dc8..b11ff9d458 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -599,6 +599,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >index d90ff115c8..3e83a27870 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -149,6 +149,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index c3d6f60b7e..57fad8d0b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -168,6 +168,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >index 3c08cc12f5..b09012e19a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >@@ -77,6 +77,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 5e846dc3e4..e5eb41c132 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -403,6 +403,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index f682965e82..bf2f2b5466 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -250,6 +250,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <!-- Modal --> > <div class="modal" id="prefModal" tabindex="-1" role="dialog" aria-labelledby="prefModalLabel"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index b32a11b63f..301a7d5d0c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -597,6 +597,7 @@ a.add, a.delete { > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >index 6185062ef1..1880123879 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt >@@ -164,6 +164,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 4ec21fb454..9aae93b3b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -1460,6 +1460,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >index f586003e8d..d65be901f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -115,6 +115,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >index 83f76569db..d0d17dcddf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >@@ -319,6 +319,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >index afd564a60f..5df30c3d6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >@@ -84,6 +84,7 @@ > </nav> > </form> > </main> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt >index 031c893bda..98a95ce1c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt >@@ -85,6 +85,7 @@ > </form> > > </main> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 302c7e0148..bd053c9af9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -454,6 +454,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [%# Add WYSIWYG editor for htmlarea system preferences %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >index c7a357e7c0..16e27761b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transfer_limits.tt >@@ -133,6 +133,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index 3c0641804c..3a3e2e18b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >@@ -112,6 +112,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index 48494d573c..99eb07cf6d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -262,6 +262,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 3ba997b0cf..2c62148e1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -272,6 +272,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index b9f8af23fb..fc9bf182fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -257,6 +257,7 @@ > [% END %] > > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt >index 1c6f801f2c..7706ffb5c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt >@@ -15,6 +15,7 @@ > > <h1>Authority search</h1> > [% INCLUDE 'auth-finder-search.inc' %] >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >index a0af6dd4e9..2855a11804 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt >@@ -43,7 +43,7 @@ > [%- END -%] > </div> > </div> >- >+</div> <!-- /.main.container-fluid --> > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'authorities_js.inc' %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt >index 74782e569c..65bcd16ada 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt >@@ -20,6 +20,7 @@ > > </div> > </div> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index b501bcbccf..cb1135fb1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -138,6 +138,7 @@ > [% END # /IF ( unknownauthid ) %] > </div> <!-- /.col-md-8 offset-md-2 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'authorities_js.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 6cbaa2f847..efb1ee38b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -133,6 +133,7 @@ div#result { margin-top: 1em; } > </main> > </div> <!-- /.col-md-8 offset-md-2 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'authorities_js.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >index 2b1e9ce345..df3c3bb635 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >@@ -23,7 +23,7 @@ > </head> > > <body id="auth_searchresultlist_auth" class="auth"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > > <h1>Authority search results</h1> > [% INCLUDE 'auth-finder-search.inc' %] >@@ -127,7 +127,7 @@ > >></a> > [% END %] > </div>[% END %] >- </div> >+ </div> <!-- /.main.container-fluid --> > > [% INCLUDE 'authority-detail-modal.inc' %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index 2461371da0..fb04d818c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -149,6 +149,7 @@ > </div> <!-- /.page-section --> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'authorities_js.inc' %] >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 4beb984640..f99e54ed00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt >@@ -79,6 +79,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% IF ( Koha.Preference('CatalogConcerns') ) %] > [% INCLUDE 'modals/add_catalog_concern.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index 7ea162a6a0..1f66d884ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -203,6 +203,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 9e5562ae64..6b1d04ef13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -404,6 +404,7 @@ > </form> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/browser.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 999258932b..5dbe56f312 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1206,6 +1206,7 @@ > [% IF ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) %] > [% INCLUDE 'modals/display_ticket.inc' %] > [% END %] >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index 4db3fd50e8..6e22a63733 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -132,6 +132,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% IF ( Koha.Preference('CatalogConcerns') ) %] > [% INCLUDE 'modals/add_catalog_concern.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 8025e2bc2f..e4159f821d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -133,6 +133,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 69d7addc56..bd293817ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -350,6 +350,7 @@ > </div> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > <form method="POST" action="/cgi-bin/koha/tools/batchMod.pl" id="batch_item_operations"> > <!-- dummy values which will be replaced by JavaScript --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >index 9e560acc6f..7fc20063d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -92,6 +92,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > [% END %] > > [% IF ( Koha.Preference('CatalogConcerns') ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 2020f9fb9d..3a1f7952da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -512,6 +512,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% IF ( Koha.Preference('CatalogConcerns') ) %] > [% INCLUDE 'modals/add_catalog_concern.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 4c8deeb929..6ea3632ccf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -795,6 +795,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <input type="hidden" id="query_json" value="[% query_json | html %]"> > <input type="hidden" id="limit_json" value="[% limit_json | html %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 3c7e3449b5..d11f788461 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -30,7 +30,7 @@ > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] > >-<div class="container-fluid"> >+<div class="main container-fluid"> > <div class="row"> > <div class="col-md-12 col-lg-8 offset-lg-2"> > [% INCLUDE 'messages.inc' %] >@@ -220,6 +220,7 @@ > > </div> [% # /div.col-md-8 %] > </div> [% # /div.row %] >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >index b3751ec9b9..d30e7bd5d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -211,6 +211,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/browser.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index 9e4b2c6fb3..cff186b286 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -270,6 +270,7 @@ > </div> <!-- /#dataPreview --> > </div> <!-- /.col-md-10.offset-md-1.col-lg-8.offset-lg-2 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >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 00f695755a..26c6c84e9c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -198,6 +198,7 @@ div#result { margin-top: 1em; } > > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/merge-record.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >index ea3242ab5a..6d59f87e21 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt >@@ -119,6 +119,7 @@ > > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index edd4fe08d2..b8c6afa756 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -15,7 +15,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > > <body id="cat_z3950_auth_search" class="cat"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > > [% IF ( opsearch ) %] > <h1>Z39.50 authority search points</h1> >@@ -226,6 +226,7 @@ > [% END %] > > [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending | html %] servers to search</h3>[% END %] >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >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 11d28f65e2..1435457dde 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 >@@ -13,7 +13,7 @@ > </head> > > <body id="cat_z3950_search" class="cat"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > [% IF ( opsearch ) %] > <h1>Z39.50/SRU search</h1> > <form method="post" action="z3950_search.pl" name="f" class="checkboxed"> >@@ -252,6 +252,7 @@ > </form> > </div> <!-- /.col --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > [% END # /IF opsearch %] > > [% IF ( numberpending ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index 1453e7c327..441f815927 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -525,7 +525,7 @@ > </div> > [% END %] > </div> >- </div> >+ </div> <!-- /.main.container-fluid --> > [% PROCESS cancel_modal %] > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >index 399afc8b0f..5d99302167 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt >@@ -103,6 +103,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >index 96e7527fc7..45ce18def3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >@@ -136,6 +136,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index da34a34669..af656b29c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -957,6 +957,7 @@ > > </div> <!-- /.row --> > </main> >+ </div> <!-- /.main.container-fluid --> > > [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %] > [% INCLUDE 'modals/resolve_return_claim.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index a6a1c86dec..913e6f0154 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -352,6 +352,7 @@ > </div> <!-- /.col-md-2.order-md-1 --> > [% END %] > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 5aadfdd2b5..85299759c9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -95,6 +95,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 8a985c11e9..a98d8c566f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -289,6 +289,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.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 8769a5be97..f199c6e950 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -299,6 +299,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index e587225f4b..c04a69d50b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -258,6 +258,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >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 7a00c9de14..55123d2540 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 >@@ -360,6 +360,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.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 a68493818f..12081bdf58 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -197,6 +197,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 98a1ea119b..40be0524cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -1407,6 +1407,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% IF ( ReturnClaims ) %] > [% INCLUDE 'modals/resolve_return_claim.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >index d8e2f4754f..69a665247f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt >@@ -101,18 +101,19 @@ > <input type="hidden" name="oldreferer" value="[% referer or "/cgi-bin/koha/mainpage.pl" %]" /> > </div> > </form> >- <!-- /updated --> >- [% IF Koha.Preference('CircSidebar') %] >+ <!-- /updated --> > </div> <!-- /.col-md-10... --> >+ [% IF Koha.Preference('CircSidebar') %] > <div class="col-md-2 order-sm-2 order-md-1"> > <aside> > [% INCLUDE 'circ-nav.inc' %] > </aside> > </div> <!-- /.col-md-2 order-sm-2 order-md-1 --> >- </div> <!-- /.row --> >- [% END %] >- </main> >- </div> <!-- /.col-sm-12 --> >-</div> <!-- /.row --> >+ [% END %] >+ </div> <!-- /.row --> >+ </main> >+ </div> <!-- /.col-sm-12 --> >+ </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >index 4c058f2589..ff01a6b667 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >@@ -114,6 +114,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 3eb34e8a83..81bde6eead 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -118,6 +118,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index ae74a101ff..f09ad09227 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -275,6 +275,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% BLOCK filter_form %] > <form method="get" name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl"> >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 2405b4da0f..fe195910ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -174,6 +174,7 @@ > </main> > </div> <!-- /.col-sm-12 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <div id="cancelModal" class="modal" tabindex="-1" role="dialog" aria-hidden="true"> > <div class="modal-dialog"> >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 9b291153be..cbea096af5 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 >@@ -101,6 +101,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >index 5876eb9800..eb2fedeeba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt >@@ -147,6 +147,7 @@ > </form> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 7ccbcffcad..ab0bc297c2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -159,6 +159,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >index be0ae811ca..4967b48a22 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt >@@ -205,6 +205,7 @@ > > </div> <!-- /.col-md-8 .offset-md-2 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > <div id="new-field-template" class="club-field" style="display:none"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >index 1d42281971..5ec65eefbf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >@@ -79,6 +79,7 @@ > </form> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >index 09b9c2afa1..ba32712104 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >@@ -266,6 +266,7 @@ > </form> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >index 8958066fbf..4683d3abcf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >@@ -216,6 +216,7 @@ > [% END %] > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >index 756f19af9f..07a52dc186 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt >@@ -85,6 +85,7 @@ > [% END %] > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index 929db917c3..ff506a0077 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -319,6 +319,7 @@ > [% END %] > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index a789cb06e0..e1e358f47a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -90,6 +90,7 @@ > </div> <!-- /.page-section --> > </div> > </div> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >index c646964ad3..c435389c76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >@@ -176,7 +176,7 @@ > </fieldset> > </form> > </div> >- </div> >+ </div> <!-- /.main.container-fluid --> > > [% ELSE %] > >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 2012d2469c..9f6d4326d0 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 >@@ -941,6 +941,7 @@ > </main> > </div> <!-- /.col-sm-10 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >index f6dd94594d..33c61144e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >@@ -43,7 +43,7 @@ > </head> > > <body id="installer" class="installer"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div id="installer-step3" class="installer-main col-sm-10 col-md-8 offset-sm-1 offset-md-2"> > <div id="logo"><a href="#">Koha</a></div> >@@ -467,7 +467,7 @@ > [% END # / IF updatestructure %] > </div> <!-- / #installer-step3 --> > </div> <!-- / .row --> >- </div><!-- / .container-fluid --> >+ </div><!-- / .main.container-fluid --> > > [% IF ( selectframeworks ) %] > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index c32de6ab9b..30dc2daf50 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -307,7 +307,7 @@ > </div> <!-- /.col-sm-9 --> > > </div> <!-- /.row --> >- >+ </div> <!-- /#container-main.container-fluid --> > [% MACRO jsinclude BLOCK %] > <script> > var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this news item? This cannot be undone."); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >index 4731a5e5fd..9b150171c2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/barcode-print.tt >@@ -133,6 +133,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >index a8c0741462..00252d6533 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt >@@ -208,6 +208,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <form action="/cgi-bin/koha/labels/label-edit-batch.pl" id="batch_remove_form" method="post"> > [% INCLUDE 'csrf-token.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >index a6fa0cd9e8..87d2f526a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt >@@ -229,6 +229,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >index e53ca77b42..72112f3fb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt >@@ -149,6 +149,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >index 39e7c92a88..20aabac36f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt >@@ -195,6 +195,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index 450d7978fd..b73b69b596 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -42,5 +42,6 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index 3d32b148f7..34b80cdce8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -131,6 +131,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'greybox.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >index d103768b8a..6949ce5f07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt >@@ -117,7 +117,7 @@ > </fieldset> > </form> > [% END %] >- </div> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 7842ef2172..a551878b4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -120,7 +120,7 @@ > </fieldset> > </div> > </nav> >- </div> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index 590f4fb722..a7694cd715 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -153,7 +153,7 @@ > </div> > </nav> > </form> >- </div> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >index 71bef93177..a293f63b5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt >@@ -56,6 +56,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >index b1061728a0..5dab580430 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >@@ -237,6 +237,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >index 02a15ac0f4..f012dfe18c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt >@@ -144,6 +144,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index cb2bc93ccd..ceeb169696 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -241,6 +241,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <!-- Issue payout modal --> > <div class="modal" id="issuePayoutModal" tabindex="-1" role="dialog" aria-labelledby="issuePayoutLabel"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >index 9b57bd6c45..200b2a27d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -93,6 +93,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >index 94a82d52ad..73fe61ef29 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -98,6 +98,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >index 5a7c44eb0e..a071dfc43f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -65,6 +65,7 @@ > > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index f60554a4b6..47161b765f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -123,6 +123,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index f224391bec..e45a96140c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -136,6 +136,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index 4bdfe61092..dc04b2da55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -447,6 +447,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >index 2300728525..1caa7e21ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt >@@ -56,6 +56,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- .row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >index b1ac445bef..247716670c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -132,6 +132,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >index 968b9d3514..a89b72004a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -126,6 +126,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index 545db193af..836f1d3d37 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -132,6 +132,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >index b30d09067f..6063e52590 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >@@ -128,6 +128,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index dbd1982805..b12ddfb1ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -134,6 +134,7 @@ > [% PROCESS patron_search_filters categories => categories, libraries => libraries, filters => ['search_field', 'search_type', 'category', 'branch'], search_filter => searchmember %] > </div> <!-- /.col-md-2 order-sm-2 order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <!-- New Patron List Modal --> > <div class="modal" id="new-patron-list" tabindex="-1" role="dialog" aria-labelledby="new-patron-listLabel"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index 2c1a1b7993..fbbcbb4e76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -1775,6 +1775,8 @@ legend.collapsed i.fa.fa-caret-down::before { > </div> <!-- /.col-md-2.order-md-1 --> > [% END %] > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> >+ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >index 0a34ebe579..7f879bd5dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >@@ -216,6 +216,7 @@ > > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index 77c30922fa..6b1295a009 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -208,6 +208,7 @@ > [% END %] > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > <!-- Modal --> > <div class="modal" id="compareModal" tabindex="-1" role="dialog" aria-labelledby="compareModalLabel"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index 1fd878dd13..cfae5e5cf9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -212,6 +212,8 @@ > </tfoot> > </table> > [% END %] >+ </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% 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 a12b9e3a50..01ecbff350 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -730,6 +730,7 @@ > </aside> > </div> <!-- /.col-sm-2 order-sm-2 order-md-1 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %] > [% INCLUDE 'modals/resolve_return_claim.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index a992078201..bf87673679 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -140,6 +140,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+ </div> <!-- /.main.container-fluid --> > > <!-- Modal --> > <div class="modal" id="noticeModal" tabindex="-1" aria-labelledby="noticeModalLabel" aria-hidden="true"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 918afe0890..3510d207b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -221,6 +221,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index ff91689ade..81ee734c82 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -410,6 +410,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > <!-- Modal --> > <div id="confirm_change_form" class="modal" tabindex="-1" role="dialog" aria-hidden="true"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 34bb11213f..bb40b7777a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -135,6 +135,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 771cedafa7..0314caf41c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -170,6 +170,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >index 9e30b0fec2..dc3b36a56c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt >@@ -45,6 +45,7 @@ > </aside> > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >index e7de1777b4..d4b61ba581 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >@@ -109,6 +109,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 327713c5cf..53659a03dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -107,6 +107,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'str/members-menu.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >index 4948d054c6..1e2c9b3a1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt >@@ -88,6 +88,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >index 617d992880..fdd35738e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >@@ -12,7 +12,7 @@ > </head> > > <body id="pat_update-child" class="pat"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > > [% IF ( MULTI ) %] > >@@ -57,6 +57,7 @@ > </form> > [% END %] > [% END %] >+</div> <!-- /.main.container-fluid --> > > > [% MACRO jsinclude BLOCK %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index 61c40c7668..be9d3bfbe2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -111,6 +111,7 @@ > > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index 6f88c827e6..e16f8eac06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -89,6 +89,7 @@ > > </div> > </div> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/file-upload.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >index 59bf61bcd3..6c8868e64b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >@@ -20,7 +20,7 @@ > </head> > > <body id="installer" class="installer"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div id="onboarding-step2" class="installer-main col-sm-10 col-md-8 offset-sm-1 offset-md-2"> > <div id="logo"><a href="#">Koha</a></div> >@@ -146,7 +146,7 @@ > </form> > </div> <!-- / #onboarding-step2 --> > </div> <!-- / .row --> >- </div><!-- / .container-fluid --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'validator-strings.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 ad400a8c16..2fb347a9a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -12,7 +12,7 @@ > </head> > > <body id="installer" class="installer"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div id="onboarding-step3" class="installer-main col-sm-10 col-md-8 offset-sm-1 offset-md-2"> > <div id="logo"><a href="#">Koha</a></div> >@@ -131,7 +131,7 @@ > </form> > </div> <!-- / #onboarding-step3 --> > </div> <!-- / .row --> >- </div><!-- / .container-fluid --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'validator-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 d379e295df..d3103d87fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >@@ -10,7 +10,7 @@ > </head> > > <body id="installer" class="installer"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div id="onboarding-step4" class="installer-main col-sm-10 col-md-8 offset-sm-1 offset-md-2"> > <div id="logo"><a href="#">Koha</a></div> >@@ -66,7 +66,7 @@ > </form> > </div> <!-- / #onboarding-step4 --> > </div> <!-- / .row --> >- </div><!-- / .container-fluid --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'validator-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 e3ccac8d73..0b82786767 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -14,7 +14,7 @@ > </head> > > <body id="installer" class="installer"> >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div id="onboarding-step5" class="installer-main col-sm-10 col-md-8 offset-sm-1 offset-md-2"> > <div id="logo"><a href="#">Koha</a></div> >@@ -175,7 +175,7 @@ > [% END %] > </div> <!-- / #onboarding-step5 --> > </div> <!-- / .row --> >- </div><!-- / .container-fluid --> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'validator-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 ac85fc1bc1..3fb2ffc453 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 >@@ -39,7 +39,7 @@ > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] > >- <div class="container-fluid"> >+ <div class="main container-fluid"> > <div class="row"> > <div class="col-md-10 offset-md-1 col-lg-8 offset-lg-2"> > [% INCLUDE 'messages.inc' %] >@@ -88,6 +88,7 @@ > </form> > </div> > </div> >+ </div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >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 ca60c7110c..4e216cfd16 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 >@@ -233,6 +233,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index d876423de6..758e168c10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -143,6 +143,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 55873393ad..673accd16a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -173,6 +173,8 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> >+ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index 623e696f56..a5515d2f75 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >@@ -504,6 +504,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >index 57ef65512d..48e89f0152 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >@@ -139,6 +139,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >index 5135d69e34..b0a81729f9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >@@ -193,6 +193,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >index ee67c6cebe..42f730deb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >@@ -161,6 +161,7 @@ > </aside> > </div> <!-- /.col-md-2.order-md-1 --> > </div> <!-- /.row --> >+</div> <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] > <script> >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30707
:
175454
|
175478
|
175489
|
175500
|
175611
|
175612
|
175613
|
175617
|
175766
|
177120
|
177121
|
177122
|
177123
|
177124
|
177137
|
177138
|
177139
|
177140
|
177141