From: Galen Charlton <gmc@esilibrary.com>
Date: Thu, 10 Oct 2013 21:50:08 +0000 (+0000)
Subject: bug 5202: (follow-up) adjust for the move of the merge record Javascript
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=4a2aa0e7687ac113d1a98c37a4bc8338fea156a4;p=koha.git

bug 5202: (follow-up) adjust for the move of the merge record Javascript

This patch applies to change from bug 10650 to the new
authority record merge feature.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
index 171de3ae8d..520b9cd508 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -3,6 +3,8 @@
 <title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
 [% INCLUDE 'greybox.inc' %]
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/merge-record.js"></script>
+[% INCLUDE 'merge-record-strings.inc' %]
 <style type="text/css">
 div.record ul, div.record li { float:none; display:block; }
 div#result { margin-top: 1em; }
@@ -28,7 +30,9 @@ $(document).ready(function(){
         ev.preventDefault();
         newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes');
     });
-    [% PROCESS mergejs %]
+
+    // Creating tabs
+    $("#tabs").tabs();
 });