Bug 15824 - 'Done' button is unclear on batch item modification and deletion

EDIT: Making sure the messages and the buttons show the same text, as per Comment 6.

To test:

MODIFICATION
1) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1)
2) Click edit -> Edit items in a batch
3) Click Save (you don't need to make any changes)
4) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

5) Go to a biblio record page
6) Select one or some or all items in the record
7) Click modify selected items
8) Click Save
9) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

10) Go to batch item modification (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl)
11) Write some barcodes into the barcode list and click Continue
12) Click Save
13) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item mod page.

DELETION
14) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1)
15) Click edit -> Delete items in a batch
16) Unselect all the items so you don't actually delete them, then click Delete selected items
17) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

18) Go to a biblio record page
19) Select one or some or all items in the record
20) Click Delete selected items
21) Unselect all the items so you don't actually delete them, then click Delete selected items
22) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

23) Go to batch item deletion (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl?del=1)
24) Write some barcodes into the barcode list and click Continue
25) Unselect all the items so you don't actually delete them, then click Delete selected items
26) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item deletion page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
index 92d3137..cb6038d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
@@ -156,6 +156,13 @@ for( x=0; x<allColumns.length; x++ ){
        <div class="dialog message">
             <p>[% deleted_items %] item(s) deleted.</p>
             [% IF delete_records %] <p>[% deleted_records %] record(s) deleted.</p> [% END %]
+            [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
+                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Return to the record</a>
+            [% ELSIF src %]
+                <a href="[% src %]">Return to where you were</a>
+            [% ELSE %]
+                <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
+            [% END %]
         </div>
        [% IF ( not_deleted_items ) %]
        <div style="width:55%;margin:auto;">
@@ -185,11 +192,11 @@ for( x=0; x<allColumns.length; x++ ){
 
     <p>
         [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
-           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Done</a>
+           <a class="btn" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
         [% ELSIF src %]
-           <a href="[% src %]">Done</a>
+           <a class="btn" href="[% src %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
         [% ELSE %]
-           <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
+           <a class="btn" href="/cgi-bin/koha/tools/batchMod.pl?del=1"><i class="fa fa-check-square-o"></i> Return to batch item deletion</a>
         [% END %]
     </p>
 [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
index 38a76ce..362bf9a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
@@ -59,7 +59,16 @@ $(document).ready(function(){
             [% ELSE %]
               <h1>Batch item modification results</h1>
               <div class="dialog message">
-              [% modified_items %] item(s) modified (with [% modified_fields %] fields modified)
+              [% modified_items %] item(s) modified (with [% modified_fields %] fields modified).
+              <fieldset class="action">
+                  [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
+                      <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Return to the record</a>
+                  [% ELSIF src %]
+                      <a href="[% src %]">Return to where you were</a>
+                  [% ELSE %]
+                      <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a>
+                  [% END %]
+              </fieldset>
               </div>
             [% END %]
 [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
@@ -236,11 +245,11 @@ $(document).ready(function(){
 [% ELSE %] <!-- // show -->
 <fieldset class="action">
 [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
-   <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]">Done</a>
+   <a class="btn" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
 [% ELSIF src %]
-   <a href="[% src %]">Done</a>
+   <a class="btn" href="[% src %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
 [% ELSE %]
-   <a href="/cgi-bin/koha/tools/batchMod.pl">Done</a>
+   <a class="btn" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a>
 [% END %]
 </fieldset>