From 0d096e0aa89080aaefccded31ad7a0fe789df9e3 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Sat, 7 Feb 2015 13:41:50 -0500 Subject: [PATCH] Bug 13680 - Items list on edit items page separates add items form from header and sidebar This patch moves the items table on the edit items screen to the bottom of the page. Test plan: 1 - Apply patch 2 - Ensure adding/editing items works as previously --- .../prog/en/modules/cataloguing/additem.tt | 117 ++++++++++---------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 9cdc1cf..ddbf3b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -134,9 +134,7 @@ $(document).ready(function() {
- -

Items for [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])

- +

Add items to [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])

[% IF ( barcode_not_unique ) %]
Error saving item: Barcode must be unique.
[% END %] [% IF ( no_next_barcode ) %]
Error saving items: Unable to automatically determine values for barcodes. No item has been inserted.
[% END %] [% IF ( book_on_loan ) %]
Cannot delete: item is checked out.
[% END %] @@ -144,61 +142,7 @@ $(document).ready(function() { [% IF ( not_same_branch ) %]
Cannot delete: The items do not belong to your library.
[% END %] [% IF ( linked_analytics ) %]
Cannot delete: item has linked analytics..
[% END %] -
- [% IF ( item_loop ) %] -
- - - - - [% FOREACH item_header_loo IN item_header_loop %] - - [% END %] - - - - [% FOREACH item_loo IN item_loop %] - [% IF ( item_loo.itemnumber == itemnumber) %] - [% IF item_loo.nomod %] - - [% ELSE %] - - [% END %] - [% ELSE %] - [% IF item_loo.nomod %] - - [% ELSE %] - - [% END %] - [% END %] - [% IF ( item_loo.nomod ) %] - - [% ELSE %] - - [% END %] - [% FOREACH item_valu IN item_loo.item_value %] - - [% END %] - - [% END %] - -
  - [% item_header_loo.header_value %] -
  - [% IF ( item_loo.hostitemflag ) %] - Edit in host   Delink - [% ELSE %] - Edit - [% IF ( item_loo.countanalytics ) %] - View analytics - [% ELSE %] - Delete - [% END %] - [% END %] - [% item_valu.field |html %]
-
- [% END %] -
+
[% INCLUDE 'biblio-view-menu.inc' %] @@ -278,6 +222,63 @@ $(document).ready(function() {
+

Existing items for [% title |html %] [% IF ( author ) %] by [% author %][% END %] (Record #[% biblionumber %])

+
+ [% IF ( item_loop ) %] +
+ + + + + [% FOREACH item_header_loo IN item_header_loop %] + + [% END %] + + + + [% FOREACH item_loo IN item_loop %] + [% IF ( item_loo.itemnumber == itemnumber) %] + [% IF item_loo.nomod %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF item_loo.nomod %] + + [% ELSE %] + + [% END %] + [% END %] + [% IF ( item_loo.nomod ) %] + + [% ELSE %] + + [% END %] + [% FOREACH item_valu IN item_loo.item_value %] + + [% END %] + + [% END %] + +
  + [% item_header_loo.header_value %] +
  + [% IF ( item_loo.hostitemflag ) %] + Edit in host   Delink + [% ELSE %] + Edit + [% IF ( item_loo.countanalytics ) %] + View analytics + [% ELSE %] + Delete + [% END %] + [% END %] + [% item_valu.field |html %]
+
+ [% END %] +
+
[% INCLUDE 'intranet-bottom.inc' %] -- 1.7.10.4