@@ -, +, @@
Authorities, part 1
- Authorities
- New from Z39.50
-> Search
-> Results
- New from Z39.50
- Deletion confirmation
- Merge records -> Merge
- Tabs
- Tag selection
-> Authority detail
- Tabs
- Deletion confirmation
- New from Z39.50
---
.../prog/en/includes/authorities-search.inc | 16 -----
.../prog/en/includes/authorities-toolbar.inc | 24 -------
.../prog/en/includes/authorities_js.inc | 54 +++++++++++++++-
.../en/modules/authorities/authorities-home.tt | 28 ++------
.../prog/en/modules/authorities/detail.tt | 75 ++++++++--------------
.../prog/en/modules/authorities/merge.tt | 75 ++++++++++++----------
.../en/modules/authorities/searchresultlist.tt | 45 ++-----------
7 files changed, 133 insertions(+), 184 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -1,22 +1,6 @@
-
+
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'authorities_js.inc' %]
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
[% PROCESS 'authorities.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Authorities ›
@@ -8,56 +9,8 @@
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% IF ( displayhierarchy ) %]
-
-[% END %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'authorities-search.inc' %]
@@ -143,4 +96,28 @@ function searchauthority() {
[% END %]
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'authorities_js.inc' %]
+ [% IF ( displayhierarchy ) %]
+
+ [% END %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -1,47 +1,15 @@
[% PROCESS 'merge-record.inc' %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Cataloging › Merging records
[% INCLUDE 'doc-head-close.inc' %]
-
-[% INCLUDE 'merge-record-strings.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'authorities-search.inc' %]
@@ -139,4 +107,43 @@ function changeFramework(fw) {
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'merge-record-strings.inc' %]
+ [% INCLUDE 'authorities_js.inc' %]
+
+ [% INCLUDE 'merge-record-strings.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -1,46 +1,10 @@
+[% SET footerjs = 1 %]
[% PROCESS 'authorities-search-results.inc' %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Authorities › Authority search results
[% INCLUDE 'doc-head-close.inc' %]
-
-[% INCLUDE 'authorities_js.inc' %]
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'authorities-search.inc' %]
@@ -116,4 +80,9 @@ function searchauthority() {
+
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'authorities_js.inc' %]
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--