@@ -, +, @@
---
Koha/ILL/Backend/intra-includes/create.inc | 3 +-
Koha/ILL/Backend/intra-includes/edititem.inc | 3 +-
Koha/ILL/Backend/opac-includes/create.inc | 18 +++---
.../shared-includes/form_input_helpers.inc | 36 +++++++++++
.../Backend/shared-includes/forms/article.inc | 46 ++------------
.../Backend/shared-includes/forms/book.inc | 41 +------------
.../Backend/shared-includes/forms/chapter.inc | 56 ++---------------
.../shared-includes/forms/conference.inc | 55 ++++-------------
.../Backend/shared-includes/forms/journal.inc | 26 +-------
.../shared-includes/forms/resource.inc | 60 ++++---------------
.../Backend/shared-includes/forms/thesis.inc | 25 ++------
11 files changed, 90 insertions(+), 279 deletions(-)
create mode 100644 Koha/ILL/Backend/shared-includes/form_input_helpers.inc
--- a/Koha/ILL/Backend/intra-includes/create.inc
+++ a/Koha/ILL/Backend/intra-includes/create.inc
@@ -1,4 +1,6 @@
[% SET koha_version = Koha.Version %]
+[% cwd = whole.cwd %]
+[% PROCESS "${cwd}/shared-includes/form_input_helpers.inc" %]
[% IF whole.error %]
[% IF whole.status == 'missing_identifier' %]
Please Note: Mandatory field Identifier is missing.
@@ -73,7 +75,6 @@
- [% cwd = whole.cwd %]
[% type = whole.value.other.type %]
[% IF type %]
[% INCLUDE "${cwd}/shared-includes/forms/${type}.inc" %]
--- a/Koha/ILL/Backend/intra-includes/edititem.inc
+++ a/Koha/ILL/Backend/intra-includes/edititem.inc
@@ -1,3 +1,5 @@
+[% cwd = whole.cwd %]
+[% PROCESS "${cwd}/shared-includes/form_input_helpers.inc" %]
[% IF whole.error %]
[% IF whole.status == 'missing_type' %]
Please Note: Mandatory field Type is missing.
@@ -66,7 +68,6 @@
- [% cwd = whole.cwd %]
[% type = whole.value.other.type %]
[% IF type %]
[% INCLUDE "${cwd}/shared-includes/forms/${type}.inc" %]
--- a/Koha/ILL/Backend/opac-includes/create.inc
+++ a/Koha/ILL/Backend/opac-includes/create.inc
@@ -1,3 +1,6 @@
+[% PROCESS 'i18n.inc' %]
+[% cwd = whole.cwd %]
+[% PROCESS "${cwd}/shared-includes/form_input_helpers.inc" %]
[% IF whole.error %]
[% IF whole.status == 'missing_identifier' %]
Please Note: Mandatory field Identifier is missing.
@@ -21,9 +24,8 @@
- [% cwd = whole.cwd %]
[% type = whole.value.other.type %]
[% IF type %]
[% INCLUDE "${cwd}/shared-includes/forms/${type}.inc" %]
@@ -84,8 +85,7 @@
-
-
-
+ [% END #ill_select_field %]
@@ -122,4 +122,4 @@
[% INCLUDE "${cwd}/shared-includes/shared.js" %]
// ]]>
-[% END %]
+[% END %]
--- a/Koha/ILL/Backend/shared-includes/form_input_helpers.inc
+++ a/Koha/ILL/Backend/shared-includes/form_input_helpers.inc
@@ -0,0 +1,36 @@
+[% BLOCK ill_text_input_field %]
+
+
+
+
+ [% SET required = 0 %]
+[% END %]
+
+[% BLOCK ill_select_field %]
+
+
+ [% SET required = 0 %]
+[% END %]
+
+[% BLOCK book_text_input_fields %]
+ [% PROCESS ill_text_input_field id = 'title' label = t('Title') value = whole.value.other.title %]
+ [% PROCESS ill_text_input_field id = 'author' label = t('Author') value = whole.value.other.author %]
+ [% PROCESS ill_text_input_field id = 'editor' label = t('Editor') value = whole.value.other.editor %]
+ [% PROCESS ill_text_input_field id = 'publisher' label = t('Publisher') value = whole.value.other.publisher %]
+ [% PROCESS ill_text_input_field id = 'published_place' label = t('Place of publication') value = whole.value.other.published_place %]
+ [% PROCESS ill_text_input_field id = 'year' label = t('Year') value = whole.value.other.year %]
+ [% PROCESS ill_text_input_field id = 'part_edition' label = t('Part / Edition') value = whole.value.other.part_edition %]
+ [% PROCESS ill_text_input_field id = 'volume' label = t('Volume') value = whole.value.other.volume %]
+ [% PROCESS ill_text_input_field id = 'isbn' label = t('ISBN') value = whole.value.other.isbn %]
+ [% PROCESS ill_text_input_field id = 'doi' label = t('DOI') value = whole.value.other.doi %]
+[% END %]
+
+[% BLOCK journal_text_input_fields %]
+ [% PROCESS ill_text_input_field id = 'title' label = t('Title') value = whole.value.other.title %]
+ [% PROCESS ill_text_input_field id = 'volume' label = t('Volume') value = whole.value.other.volume %]
+ [% PROCESS ill_text_input_field id = 'issue' label = t('Issue number') value = whole.value.other.issue %]
+ [% PROCESS ill_text_input_field id = 'year' label = t('Year') value = whole.value.other.issue %]
+ [% PROCESS ill_text_input_field id = 'issn' label = t('ISSN') value = whole.value.other.issn %]
+[% END %]
--- a/Koha/ILL/Backend/shared-includes/forms/article.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/article.inc
@@ -1,50 +1,16 @@
--- a/Koha/ILL/Backend/shared-includes/forms/book.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/book.inc
@@ -1,45 +1,6 @@
--- a/Koha/ILL/Backend/shared-includes/forms/chapter.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/chapter.inc
@@ -1,62 +1,14 @@
--- a/Koha/ILL/Backend/shared-includes/forms/conference.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/conference.inc
@@ -1,49 +1,16 @@
--- a/Koha/ILL/Backend/shared-includes/forms/journal.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/journal.inc
@@ -1,29 +1,7 @@
--- a/Koha/ILL/Backend/shared-includes/forms/resource.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/resource.inc
@@ -1,53 +1,17 @@
--- a/Koha/ILL/Backend/shared-includes/forms/thesis.inc
+++ a/Koha/ILL/Backend/shared-includes/forms/thesis.inc
@@ -1,25 +1,10 @@
--