From 8ccca1461003af58c6c54eefdb351ec758763d4a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 4 Dec 2015 20:37:47 -0500
Subject: [PATCH] Bug 15327: Minor tweaks to Bootstrap modal handling on Staged
 MARC management page
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.

To test:

1. Apply the patch and go to Tools -> Staged MARC management.
2. Click any staged MARC file containing multiple records.
3. Click the title in the "Citation" column and confirm that a Bootstrap
   modal is triggered showing the correct data.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Modal looks much better. Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 23c7de2bc7af7d2d8bf725e536f665bf78116065)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 53cebcb07d8e5c58aa4f9e9da25e9be11444ee51)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/modules/tools/manage-marc-import.tt             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index f00929f56a..84dd2db6e6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -90,7 +90,7 @@ $(document).ready(function(){
             [% END %]
 
             $('td:eq(1)', nRow).html(
-                '<a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=' + aData['import_record_id'] + '" class="previewMARC">' + aData['citation'] + '</a>'
+                '<a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=' + aData['import_record_id'] + '&viewas=html" class="previewMARC">' + aData['citation'] + '</a>'
             );
 
             $('td:eq(2)', nRow).html(
@@ -123,7 +123,7 @@ $(document).ready(function(){
             }
             if (aData['diff_url']){
                 $('td:eq(5)', nRow).html(
-                    '<a rel="gb_page_center[960,600]" href="'+aData['diff_url']+'">View</a>'
+                    '<a href="'+aData['diff_url']+'">View</a>'
                 );
             }
             $('td:eq(6)', nRow).html(
@@ -138,7 +138,7 @@ $(document).ready(function(){
         var ltitle = $(this).text();
         var page = $(this).attr("href");
         $("#marcPreviewLabel").text(ltitle);
-        $("#marcPreview .modal-body").load(page + " pre");
+        $("#marcPreview .modal-body").load(page + " table");
         $('#marcPreview').modal({show:true});
     });
     $("#marcPreview").on("hidden", function(){
-- 
2.39.5