Bugzilla – Attachment 74318 Details for
Bug 17674
Allow UI to delete serials issues in batch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17674 (follow-up) Fix some HTML and JS inconsistencies
Bug-17674-follow-up-Fix-some-HTML-and-JS-inconsist.patch (text/plain), 4.93 KB, created by
Owen Leonard
on 2018-04-17 13:07:52 UTC
(
hide
)
Description:
Bug 17674 (follow-up) Fix some HTML and JS inconsistencies
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-04-17 13:07:52 UTC
Size:
4.93 KB
patch
obsolete
>From 00be096073720b7437b607176097ea85349daa1a Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 17 Apr 2018 12:58:48 +0000 >Subject: [PATCH] Bug 17674 (follow-up) Fix some HTML and JS inconsistencies > >This patch makes some HTML and JS changes to make the template more >consistent with coding guidelines and other similar interfaces. > >- The confirmation dialog is now below the heading. Buttons are styled > to match others like them. The layout of messages hopefully makes it a > little more clear. >- The "delete selected" event handler has been moved from an "onclick" > attribute into the <script> tags. > >To test, apply the patch and follow the original test plan. > > - Confirm that the "Delete selected" button works correctly. > - Confirm that the confirmation dialog looks good and that its form > elements work correctly. >--- > .../prog/en/modules/serials/serials-collection.tt | 48 ++++++++++++---------- > 1 file changed, 27 insertions(+), 21 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 81e84e3..055d079 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -15,26 +15,6 @@ > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> › Serial collection information for <i>[% bibliotitle %]</i></div> > >-[% IF ( delete ) %] >- <div class="yui-g"> >- <div id="circ_needsconfirmation" class="dialog alert"> >- <h3>Are you sure delete <b> [% serialnumber %] </b> selected serials</h3> >- <form action="/cgi-bin/koha/serials/serials-collection.pl/#"> >- <h5>Delete associated items <input type="radio" name="delitems" value="Yes">Yes >- <input type="radio" name="delitems" value="No" checked>No</h5> >- <h5>Number of items available <b>: [% countitems %] </b> </h5> >- <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >- <input type="hidden" name="serialsid" value="[% serialsid %]" /> >- <input type="hidden" name="confdelete" value="1" /> >- <input type="submit" class="approve" value="Yes, delete"/> >- </form> >- <form action="/cgi-bin/koha/serials/serials-collection.pl/#"> >- <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >- <input type="submit" class="deny" value="No, don't delete"/> >- </form> >- </div> >- </div> >- [% END %] > <div id="doc3" class="yui-t2"> > > <div id="bd"> >@@ -50,6 +30,27 @@ > [% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1> > [% END %] > >+[% IF ( delete ) %] >+ <div class="dialog alert"> >+ <h3>Are you sure you want to delete? <b>[% serialnumber %]</b> serial(s) will be deleted</h3> >+ <form action="/cgi-bin/koha/serials/serials-collection.pl/#"> >+ <h5>Number of items available: <b>[% countitems %]</b></h5> >+ <p> >+ <label>Delete associated items? <input type="checkbox" name="delitems" value="Yes" />Yes</label> >+ </p> >+ >+ <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >+ <input type="hidden" name="serialsid" value="[% serialsid %]" /> >+ <input type="hidden" name="confdelete" value="1" /> >+ <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button> >+ </form> >+ <form action="/cgi-bin/koha/serials/serials-collection.pl/#"> >+ <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >+ <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button> >+ </form> >+ </div> >+[% END %] >+ > [% IF ( subscriptions ) %] > <table> > [% IF ( subscriptions.size == 1 ) %] >@@ -137,7 +138,7 @@ > <input type="button" value="Generate next" onclick="javascript:generateNext([% subscriptionidlist %])" /> > [% IF ( subscriptions.size == 1 and !serialsadditems ) %] <input type="button" value="Multi receiving" onclick="javascript:generateReceive([% subscriptionidlist %])" />[% END %] > [% END %] >- <input type="button" value="Delete selected issues" onclick="javascript:deleteIssues([% subscriptionidlist %])"/> >+ <input type="button" value="Delete selected issues" id="delete-issues" data-subscriptionids="[% subscriptionidlist %]" /> > </p> > [% END %] > <span class="checkall"> >@@ -385,6 +386,11 @@ > "bInfo": false, > "bFilter": false, > } )); >+ $("#delete-issues").on("click", function(e){ >+ e.preventDefault(); >+ var subscriptionids = "[% subscriptionidlist %]"; >+ deleteIssues( subscriptionids ); >+ }); > }); > > </script> >-- >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 17674
:
57731
|
58262
|
58263
|
58264
|
60925
|
61314
|
61315
|
61316
|
66565
|
69007
|
69010
|
69011
|
69013
|
69976
|
69977
|
69978
|
69979
|
71865
|
71866
|
71867
|
71868
|
71869
|
72985
|
73032
|
73035
|
73036
|
73037
|
73038
|
73039
|
73040
|
74318
|
74359
|
74472
|
75643
|
75644
|
75645
|
75646
|
75647
|
75648
|
75649
|
77745
|
77746
|
77747
|
77748
|
77749
|
77750
|
77751
|
77861
|
77862
|
77863
|
77864
|
77865
|
77866
|
77867
|
77868
|
79415
|
79420
|
79421
|
79422
|
79423
|
79424
|
79425
|
79426
|
79427
|
79428
|
79453
|
79454
|
79455
|
79456
|
79457
|
79458
|
79459
|
79460
|
80859
|
80944
|
80955
|
82237
|
86689
|
95474
|
99434
|
99944
|
99945
|
100906
|
100907