From 472b41db3b666ec253c21fa12bf28d4ca9af7049 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 15 Feb 2018 15:09:35 -0300 Subject: [PATCH] Bug 19641: (follow-up) Move patron templates to the footer Fix bad merge conflict with bug 12904 --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt | 4 ++-- 17 files changed, 19 insertions(+), 19 deletions(-) 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 2195883c66..28efdaab5c 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 @@ -3,7 +3,7 @@ Koha › Administration › Library groups [% INCLUDE 'doc-head-close.inc' %] - + - + [% END %] [% INCLUDE 'intranet-bottom.inc' %] 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 52ed3156e8..660fd93a7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -60,7 +60,7 @@ [% MACRO jsinclude BLOCK %] - + [% END %] [% INCLUDE 'intranet-bottom.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 2ae59c3845..960fc620d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -73,7 +73,7 @@ [% MACRO jsinclude BLOCK %] - + [% END %] [% INCLUDE 'intranet-bottom.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 5ea23dd8d6..70f727a182 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -44,7 +44,7 @@ [% MACRO jsinclude BLOCK %] - + [% END %] [% INCLUDE 'intranet-bottom.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 0d73773da2..947b8d20ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -84,7 +84,7 @@ [% MACRO jsinclude BLOCK %] - + + + + + + + [% END %] [% INCLUDE 'intranet-bottom.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 e85f517385..5813babaa9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -172,7 +172,7 @@ [% MACRO jsinclude BLOCK %] - + + [% INCLUDE 'datatables.inc' %] + [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index ae5765a676..576356f079 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -240,8 +240,8 @@ Alternatively, you can supply dates in ISO format. [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - - + + - + +