@@ -, +, @@
Cataloging
---
.../prog/en/modules/cataloguing/addbooks.tt | 158 +++++++-------
.../prog/en/modules/cataloguing/merge.tt | 228 +++++++++++----------
.../en/modules/cataloguing/z3950_auth_search.tt | 105 +++++-----
.../prog/en/modules/cataloguing/z3950_search.tt | 81 ++++----
4 files changed, 289 insertions(+), 283 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -1,85 +1,10 @@
[% USE Koha %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Cataloging
[% INCLUDE 'doc-head-close.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cataloging-search.inc' %]
@@ -286,4 +211,83 @@
+
+[% MACRO jsinclude BLOCK %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -3,126 +3,14 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Cataloging › Merging records
[% INCLUDE 'doc-head-close.inc' %]
-
-[% INCLUDE 'merge-record-strings.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cataloging-search.inc' %]
@@ -296,4 +184,118 @@ $(document).ready(function(){
+[% MACRO jsinclude BLOCK %]
+
+ [% INCLUDE 'merge-record-strings.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
@@ -1,45 +1,8 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Z39.50 search results
[% INCLUDE 'doc-head-close.inc' %]
-
-[% INCLUDE 'datatables.inc' %]
-
-[% INCLUDE 'z3950_search.inc' %]
-
- [% IF ( opsearch ) %]
-
-
-
-
- [% ELSE %]
-
-
-
- [% END %]
+[% IF ( opsearch ) %]
+
+
+
+
+[% ELSE %]
+
+
+
+
+[% END %]
+
[% IF ( opsearch ) %]
Z39.50 Authority search points
@@ -198,5 +163,41 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% IF ( numberpending ) %]Still [% numberpending %] servers to search
[% END %]
-
-