@@ -, +, @@
Patrons and circulation
---
.../en/modules/admin/branch_transfer_limits.tt | 80 +++----
.../prog/en/modules/admin/categories.tt | 22 +-
.../intranet-tmpl/prog/en/modules/admin/cities.tt | 35 +--
.../en/modules/admin/item_circulation_alerts.tt | 101 +++++----
.../prog/en/modules/admin/patron-attr-types.tt | 39 ++--
.../prog/en/modules/admin/smart-rules.tt | 247 +++++++++++----------
.../prog/en/modules/admin/transport-cost-matrix.tt | 116 +++++-----
7 files changed, 333 insertions(+), 307 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -1,48 +1,12 @@
[% USE Branches %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Library checkin and transfer policy
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
@@ -119,4 +83,44 @@
[% INCLUDE 'admin-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -1,22 +1,16 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE Price %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Patron categories › [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode |html %]'[% ELSE %]New category[% END %][% END %]
[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'patrons-admin-search.inc' %]
@@ -495,4 +489,16 @@
[% INCLUDE 'admin-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'calendar.inc' %]
+ [% INCLUDE 'datatables.inc' %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -1,23 +1,10 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › [% IF op =='add_form' %]Cities › [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cities-admin-search.inc' %]
@@ -185,5 +172,21 @@
[% INCLUDE 'admin-menu.inc' %]
-[% INCLUDE 'intranet-bottom.inc' %]
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
@@ -1,4 +1,5 @@
[% USE Branches %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Item circulation alerts
[% INCLUDE 'doc-head-close.inc' %]
@@ -37,55 +38,8 @@ table.grid td.default {
background: #f88;
}
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
@@ -202,4 +156,55 @@ $(function(){
[% INCLUDE 'admin-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -1,4 +1,5 @@
[% USE AuthorisedValues %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Patron attribute types
[% IF ( attribute_type_form ) %]
@@ -13,25 +14,8 @@
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
@@ -313,4 +297,23 @@ $(document).ready(function() {
[% INCLUDE 'admin-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -1,130 +1,10 @@
[% USE Branches %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Circulation and fine rules
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
@@ -834,4 +714,127 @@ $(document).ready(function() {
[% INCLUDE 'admin-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'calendar.inc' %]
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
@@ -1,70 +1,15 @@
[% USE Branches %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Administration › Transport cost matrix
[% INCLUDE 'doc-head-close.inc' %]
-
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'prefs-admin-search.inc' %]
@@ -144,4 +89,61 @@ $(document).ready(function(){
[% INCLUDE 'admin-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+
+
+[% END %]
[% INCLUDE 'intranet-bottom.inc' %]
--