From d37ea59584e46626b054a529f82e1d3457a676ea Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 6 Jun 2018 01:48:33 +0000 Subject: [PATCH] Bug 15766: [FOLLOW-UP] Fixing layout of description button This patch moves the 'Save' button to the toolbar as suggested. The description textbox and 'Save' button are hidden if the batch is new and appears when items are added. --- .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt | 12 +++++++----- .../intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt | 12 +++++++----- svc/creator_batches | 0 3 files changed, 14 insertions(+), 10 deletions(-) mode change 100644 => 100755 svc/creator_batches diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 3ef719f..4aa143a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -175,7 +175,7 @@ }); $("#savedesc").click(function(event){ event.preventDefault(); // prevent form submission - var newdescription = $(this).siblings('input[name="description"]').val(); + var newdescription = $('input[name="description"]').val(); var batch_id = $(this).data('batch_id'); var ajaxData = { 'newdescription': newdescription, @@ -212,8 +212,10 @@ ToolsLabel creatorBatches › - [% IF batch_id %] - Edit ([% batch_id %]) + [% IF description %] + Edit [% description %] + [% ELSIF batch_id %] + Edit ([% batch_id %]) [% ELSE %] New [% END %] @@ -258,8 +260,7 @@ - - Save description +
  • @@ -279,6 +280,7 @@
    Add item(s)[% IF ( table_loop ) %] + Save description Remove selected items Delete batch Remove duplicates diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index 7965a91..daff6a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -14,8 +14,10 @@ ToolsPatron card creatorBatches › - [% IF batch_id %] - Edit ([% batch_id %]) + [% IF description %] + Edit [% description %] + [% ELSIF batch_id %] + Edit ([% batch_id %]) [% ELSE %] New [% END %] @@ -47,8 +49,7 @@ - - Save description +