Bugzilla – Attachment 82845 Details for
Bug 21942
Clean up cataloging merge template
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21942: Clean up cataloging merge template
Bug-21942-Clean-up-cataloging-merge-template.patch (text/plain), 2.45 KB, created by
Owen Leonard
on 2018-12-04 15:41:34 UTC
(
hide
)
Description:
Bug 21942: Clean up cataloging merge template
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-12-04 15:41:34 UTC
Size:
2.45 KB
patch
obsolete
>From e4adc1a1d73ebc1fde83710a1056ffc1a48dc46d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 4 Dec 2018 15:32:17 +0000 >Subject: [PATCH] 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. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > >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 586a495..c21baca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -6,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › Merging records</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css"> >+<style> > div.record ul, div.record li { float:none; display:block; } > div#result { margin-top: 1em; } > /* We use this style "against" the li ui-tabs-nav style automatically applied */ >@@ -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) { >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21942
:
82845
|
88000
|
88034
|
88129