From cffc8c0cc0450f2023c1451fcd33b830d31742c8 Mon Sep 17 00:00:00 2001
From: Aleisha <aleishaamohia@hotmail.com>
Date: Sun, 13 Mar 2016 21:57:58 +0000
Subject: [PATCH] Bug 16052: Putting buttons from after MARC records have been
 staged into a toolbar

To test:
1) Go to Tools -> Stage MARC records for import
2) Upload any file and click Stage for import once it has uploaded
3) Confirm both links are now buttons in a toolbar and work as expected
4) Notice that 'Stage more MARC records' (what was once the 'Back' button) now takes you back to stage-marc-records.pl instead of tools-home.pl
5) Also confirm that the space between results and colon (MARC staging results :) is gone

Sponsored-by: Catalyst IT
---
 .../prog/en/includes/stage-marc-records-toolbar.inc            |    4 ++++
 .../intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt   |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/stage-marc-records-toolbar.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stage-marc-records-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stage-marc-records-toolbar.inc
new file mode 100644
index 0000000..410acdd
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stage-marc-records-toolbar.inc
@@ -0,0 +1,4 @@
+<div id="toolbar" class="btn-toolbar">
+        <a class="btn btn-small" href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% import_batch_id %]"><i class="fa fa-list-ul"></i> Manage staged records</a>
+        <a class="btn btn-small" href="/cgi-bin/koha/tools/stage-marc-import.pl"><i class="fa fa-plus"></i> Stage more MARC records</a>
+</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index 67a07f4..69bcea5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -84,9 +84,13 @@ function cbUpload( status, fileid ) {
 	<div id="yui-main">
 	<div class="yui-b">
 
+[% IF ( uploadmarc ) %]
+[% INCLUDE 'stage-marc-records-toolbar.inc' %]
+[% END %]
+
 <h1>Stage MARC records for import</h1>
 [% IF ( uploadmarc ) %]
-<p>MARC staging results :</p>
+<p>MARC staging results:</p>
 <ul>
     [% SWITCH (record_type) %]
     [% CASE 'biblio' %]
@@ -113,8 +117,6 @@ function cbUpload( status, fileid ) {
 	[% IF ( label_batch ) %]
 	  <li>New label batch created: # [% label_batch %] </li>
     [% END %]
-	<li><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% import_batch_id %]">Manage staged records</a></li>
-	<li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li>
 </ul>
 [% ELSE %]
 <ul>
-- 
1.7.10.4