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>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Owen Leonard 2022-06-03 15:52:46 +00:00 committed by Katrin Fischer
parent 1f6e409871
commit ec0aeda9c7
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
192 changed files with 218 additions and 36 deletions

View File

@ -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">

View File

@ -61,7 +61,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 %]

View File

@ -219,6 +219,7 @@
</div>
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]

View File

@ -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 -->

View File

@ -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 %]

View File

@ -256,6 +256,7 @@
</aside>
</div>
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]

View File

@ -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 %]

View File

@ -69,6 +69,7 @@
</aside>
</div>
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]

View File

@ -156,6 +156,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]

View File

@ -124,6 +124,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 %]

View File

@ -541,6 +541,8 @@
</select>
</div> <!-- /#all_fund_dropdown -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]
[% Asset.js("js/form-submit.js") | $raw %]

View File

@ -418,6 +418,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 %]

View File

@ -277,6 +277,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">

View File

@ -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'] %]

View File

@ -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 %]

View File

@ -124,6 +124,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 %]

View File

@ -137,6 +137,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 %]

View File

@ -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' %]

View File

@ -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 %]

View File

@ -255,6 +255,7 @@
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]

View File

@ -152,6 +152,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 %]

View File

@ -530,6 +530,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 %]

View File

@ -156,6 +156,7 @@
</fieldset>
</div>
</nav>
</div> <!-- /.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% IF transferred %]

View File

@ -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 %]

View File

@ -299,6 +299,7 @@ tr.selected td {
[% END %]
</div> <!-- /.col-md-12 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% END %]

View File

@ -298,6 +298,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]

View File

@ -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 %]

View File

@ -551,6 +551,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]

View File

@ -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 %]

View File

@ -202,6 +202,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]

View File

@ -298,6 +298,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acq.js") | $raw %]

View File

@ -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 %]

View File

@ -404,6 +404,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -292,6 +292,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -399,6 +399,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 %]

View File

@ -297,6 +297,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -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 %]

View File

@ -335,6 +335,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -120,6 +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 %]

View File

@ -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 %]

View File

@ -241,6 +241,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 %]

View File

@ -822,6 +822,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
<script>

View File

@ -307,6 +307,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 %]

View File

@ -215,6 +215,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 %]

View File

@ -439,6 +439,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 %]

View File

@ -58,6 +58,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 %]

View File

@ -397,6 +397,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 %]

View File

@ -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 %]

View File

@ -284,6 +284,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 %]

View File

@ -260,6 +260,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 %]

View File

@ -221,6 +221,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 %]

View File

@ -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 %]

View File

@ -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 %]

View File

@ -225,6 +225,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 %]

View File

@ -180,6 +180,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 %]

View File

@ -84,6 +84,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 %]

View File

@ -121,7 +121,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 %]

View File

@ -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 %]

View File

@ -89,6 +89,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -101,6 +101,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">

View File

@ -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' %]

View File

@ -417,6 +417,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -305,6 +305,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -600,6 +600,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 %]

View File

@ -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 %]

View File

@ -169,6 +169,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 %]

View File

@ -78,6 +78,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 %]

View File

@ -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 %]

View File

@ -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">

View File

@ -598,6 +598,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' %]

View File

@ -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 %]

View File

@ -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 %]

View File

@ -116,6 +116,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 %]

View File

@ -321,6 +321,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]

View File

@ -84,6 +84,7 @@
</nav>
</form>
</main>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]

View File

@ -85,6 +85,7 @@
</form>
</main>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
<script>

View File

@ -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 %]

View File

@ -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 %]

View File

@ -113,6 +113,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 %]

View File

@ -262,6 +262,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'calendar.inc' %]

View File

@ -273,6 +273,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 %]

View File

@ -270,6 +270,7 @@
[% END %]
</div>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
<script>

View File

@ -15,6 +15,7 @@
<h1>Authority search</h1>
[% INCLUDE 'auth-finder-search.inc' %]
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
<script>

View File

@ -43,7 +43,7 @@
[%- END -%]
</div>
</div>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'authorities_js.inc' %]
[% END %]

View File

@ -20,6 +20,7 @@
</div>
</div>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
<script>

View File

@ -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' %]

View File

@ -134,6 +134,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' %]

View File

@ -57,7 +57,7 @@
[% END %]
<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' %]
@ -124,7 +124,7 @@
[% PROCESS 'result_page_numbers' %]
[% END %]
</div>
</div> <!-- /.main.container-fluid -->
[% INCLUDE 'authority-detail-modal.inc' %]

View File

@ -149,6 +149,7 @@
</div> <!-- /.page-section -->
</div>
</div>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'authorities_js.inc' %]

View File

@ -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' %]

View File

@ -203,6 +203,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% END %]

View File

@ -368,6 +368,7 @@
</form>
</div>
</div>
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/browser.js") | $raw %]

View File

@ -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' %]

View File

@ -133,6 +133,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' %]

View File

@ -133,6 +133,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]

View File

@ -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 -->

View File

@ -92,6 +92,7 @@
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->
[% END %]
[% IF ( Koha.Preference('CatalogConcerns') ) %]

View File

@ -511,6 +511,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' %]

View File

@ -772,6 +772,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 %]">

View File

@ -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' %]

Some files were not shown because too many files have changed in this diff Show More