From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 4 Dec 2018 15:32:17 +0000 (+0000)
Subject: Bug 21942: Clean up cataloging merge template
X-Git-Url: http://git.equinoxoli.org/?p=koha-equinox.git;a=commitdiff_plain;h=c54c12f53d75598f2b014fb03c14aa2b1d7bb7c5

Bug 21942: Clean up cataloging merge template

This patch makes a few minor markup corrections to the cataloging merge
template:

 - Remove invalid "type" attributes from <style> and <script>
 - Add missing closing </span>
 - Remove obsolete YUI grid markup

To test, apply the patch and test the process of merging records in
Cataloging. Everything should look correct and work correctly.
Validating the HTML source should return no errors stemming from the
template.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index 3e6c884..c21baca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -155,7 +155,6 @@ div#result { margin-top: 1em; }
 [% ELSE %]
 <form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()">
 
-<div class="yui-g">
 <div class="col-sm-6">
 [% PROCESS mergesource sourcerecords=records %]
 </div>
@@ -173,9 +172,8 @@ div#result { margin-top: 1em; }
     <input type="submit" name="merge" value="Merge" />
     <label for="report_fields">Fields to display in report:</label>
     <input type="text" name="report_fields" id="report_fields" value="[% MergeReportFields | html %]" />
-    <span class="hint">(Example: "001,245ab,600")
+    <span class="hint">(Example: "001,245ab,600")</span>
 </fieldset>
-</div>
 </form>
 [% END %]
 [% END %]
@@ -187,7 +185,7 @@ div#result { margin-top: 1em; }
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/merge-record.js") | $raw %]
     [% INCLUDE 'merge-record-strings.inc' %]
-    <script type="text/javascript">
+    <script>
         [% UNLESS (result) %]
           [% IF (choosereference) %]
             function changeFramework(fw) {