@@ -, +, @@
part 1
- Serials -> New subscription
- Search for a vendor
- "Choose" link and "Cancel" button should work correctly
- Search for record
- "Choose" link and "Cancel" button should word correctly
- Serials -> Add subscription fields
- Datatable, delete confirmation
- Edit
- Form validation (submit both authorised value and MARC field)
- Serials -> Check expiration
- Date picker in search form
- Search
- Renew button triggers popup
- Serials -> Claims -> Search results
- Date picker, datatable, form validation
- Select all/none; Download claims
---
.../prog/en/modules/serials/acqui-search-result.tt | 38 ++--
.../prog/en/modules/serials/acqui-search.tt | 11 +-
.../prog/en/modules/serials/add_fields.tt | 67 +++---
.../prog/en/modules/serials/checkexpiration.tt | 36 +--
.../prog/en/modules/serials/claims.tt | 242 ++++++++++-----------
.../prog/en/modules/serials/result.tt | 37 ++--
6 files changed, 217 insertions(+), 214 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt
@@ -1,24 +1,9 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Select vendor
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -55,4 +40,23 @@ $(document).ready(function(){
+[% MACRO jsinclude BLOCK %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt
@@ -1,17 +1,8 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Search for vendor
[% INCLUDE 'doc-head-close.inc' %]
-
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
@@ -1,4 +1,5 @@
[% USE AuthorisedValues %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Manage new fields for subscriptions
[% IF op == "list" %] › List of fields
@@ -10,38 +11,6 @@
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE "datatables.inc" %]
-
@@ -172,4 +141,38 @@
[% INCLUDE 'serials-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE "datatables.inc" %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -1,26 +1,11 @@
[% USE Branches %]
[% USE KohaDates %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Check expiration
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'serials-search.inc' %]
@@ -128,4 +113,21 @@
[% INCLUDE 'serials-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'calendar.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -1,130 +1,12 @@
+[% USE AuthorisedValues %]
[% USE Branches %]
-
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
-[% USE AuthorisedValues %]
Koha › Serials › Claims
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-[% INCLUDE 'datatables.inc' %]
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'serials-search.inc' %]
@@ -321,4 +203,122 @@
[% INCLUDE 'serials-menu.inc' %]
+
+[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'calendar.inc' %]
+ [% INCLUDE 'datatables.inc' %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt
@@ -1,24 +1,9 @@
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Search results
[% INCLUDE 'doc-head-close.inc' %]
-
+
@@ -79,4 +64,22 @@
+[% MACRO jsinclude BLOCK %]
+
+[% END %]
+
[% INCLUDE 'intranet-bottom.inc' %]
--