Bugzilla – Attachment 79846 Details for
Bug 15766
Give label and patron card batches a description
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15766: (follow-up) Fixing layout of description button
Bug-15766-follow-up-Fixing-layout-of-description-b.patch (text/plain), 7.47 KB, created by
Owen Leonard
on 2018-10-02 17:37:09 UTC
(
hide
)
Description:
Bug 15766: (follow-up) Fixing layout of description button
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-10-02 17:37:09 UTC
Size:
7.47 KB
patch
obsolete
>From 5e3935d9465af2e8e17dda1281ea0c74545a43c8 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >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. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../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 6bbb183..adf1879 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 >@@ -16,8 +16,10 @@ > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › > <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> › > <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> › >- [% IF batch_id %] >- Edit ([% batch_id | html %]) >+ [% IF description %] >+ Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | html %]">[% description | html %]</a> >+ [% ELSIF batch_id %] >+ Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | html %]">([% batch_id | html %])</a> > [% ELSE %] > New > [% END %] >@@ -64,8 +66,7 @@ > <input type="hidden" name="op" value="add" /> > <input type="hidden" name="batch_id" value="[% batch_id | html %]" /> > <label for="description">Batch description: </label> >- <input type="text" name="description" value="[% description | html %]"> >- <a href="#" id="savedesc" data-batch_id="[% batch_id | html %]" class="btn btn-default btn-xs">Save description</a> <span id="change-status"></span> >+ <input type="text" name="description" value="[% description | html %]"> <span id="change-status"></span> > </li> > <li> > <input type="radio" name="number_type" id="barcode_enter" value="barcode" checked /> >@@ -85,6 +86,7 @@ > </form> > <div id="batch-manage" class="btn-toolbar"> > <a class="btn btn-default btn-sm" id="additems" href="#"><i class="fa fa-plus"></i> Add item(s)</a>[% IF ( table_loop ) %] >+ <a class="btn btn-default btn-sm" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> > <a class="btn btn-default btn-sm" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected items</a> > <a class="btn btn-default btn-sm" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> > <a class="btn btn-default btn-sm" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >@@ -329,7 +331,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, >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 740c663..99616a8 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 >@@ -15,8 +15,10 @@ > <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › > <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> › > <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Batches</a> › >- [% IF batch_id %] >- Edit ([% batch_id | html %]) >+ [% IF description %] >+ Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | html %]">[% description | html %]</a> >+ [% ELSIF batch_id %] >+ Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | html %]">([% batch_id | html %])</a> > [% ELSE %] > New > [% END %] >@@ -48,8 +50,7 @@ > <input type="hidden" name="op" value="add" /> > <input type="hidden" name="batch_id" value="[% batch_id | html %]" /> > <label for="description">Batch description: </label> >- <input type="text" name="description" value="[% description | html %]"> >- <a href="#" id="savedesc" data-batch_id="[% batch_id | html %]" class="btn btn-default btn-xs">Save description</a> <span id="change-status"></span> >+ <input type="text" name="description" value="[% description | html %]"> <span id="change-status"></span> > </li><li> > <label for="bor_num_list">Add by borrowernumber(s): > <br /> <span class="hint">One borrowernumber per line.</span> >@@ -61,6 +62,7 @@ > </form> > <div id="batch-manage" class="action"> > <a class="btn btn-default btn-sm" id="additems" href="#"><i class="fa fa-plus"></i> Add patron(s)</a>[% IF ( table_loop ) %] >+ <a class="btn btn-default btn-sm" id="savedesc" href="#" data-batch_id="[% batch_id | html %]"><i class="fa fa-save"></i> Save description</a> > <a class="btn btn-default btn-sm" id="removeitems" href="#"><i class="fa fa-trash"></i> Remove selected patrons</a> > <a class="btn btn-default btn-sm" id="deletebatch" href="#"><i class="fa fa-minus-square"></i> Delete batch</a> > <a class="btn btn-default btn-sm" id="deduplicate" href="#"><i class="fa fa-minus"></i> Remove duplicates</a> >@@ -303,7 +305,7 @@ > }); > }); > $("#savedesc").click(function(event){ >- 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, >diff --git a/svc/creator_batches b/svc/creator_batches >old mode 100644 >new mode 100755 >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15766
:
59994
|
59998
|
59999
|
61462
|
61463
|
61464
|
63221
|
63222
|
63223
|
66515
|
67305
|
67862
|
68282
|
68359
|
68360
|
68361
|
68362
|
75213
|
75214
|
75215
|
75216
|
75715
|
75843
|
79839
|
79840
|
79841
|
79842
|
79843
|
79844
|
79845
|
79846
|
80446
|
80447
|
80448
|
80449
|
80450
|
80451
|
81070
|
81084
|
81086