Bugzilla – Attachment 170441 Details for
Bug 37452
The 'Compare matched records' diff view page is missing page-sections
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37452: Modernise the view in showdiffmarc
Bug-37452-Modernise-the-view-in-showdiffmarc.patch (text/plain), 3.83 KB, created by
Marcel de Rooy
on 2024-08-16 08:53:31 UTC
(
hide
)
Description:
Bug 37452: Modernise the view in showdiffmarc
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2024-08-16 08:53:31 UTC
Size:
3.83 KB
patch
obsolete
>From 960851de121d5fe7b88468203072808dc358c127 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 24 Jul 2024 15:59:31 +0100 >Subject: [PATCH] Bug 37452: Modernise the view in showdiffmarc >Content-Type: text/plain; charset=utf-8 > >The showdiffmarc view available from manage stage records when a match >is found looks dated. > >This patch adds a page-section, centers the display as a whole and >converts the link back to the staging area to an action button. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/modules/tools/showdiffmarc.tt | 56 ++++++++++--------- > 1 file changed, 29 insertions(+), 27 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index a752870c9f..41c2f47ad3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -41,39 +41,41 @@ > [% END #/ WRAPPER sub-header.inc %] > > <div class="main container-fluid"> >+ <main> > <div class="row"> >- <main> >- [% INCLUDE 'messages.inc' %] >+ <div class="col-sm-10 col-sm-push-1"> >+ [% INCLUDE 'messages.inc' %] > <h1>Compare matched records</h1> >- >- <div id="col1" class="col-sm-6"> >- <h2>Original</h2> >- [% IF ( ERROR_FORMATTED1 ) %] >- <div class="dialog alert"> >- <p>The record ID <em>[% RECORDID | html %]</em> doesn't match any existing record.</p> >+ <div class="page-section col-sm-12"> >+ <h2>[% RECORDTITLE | html %]</h2> >+ <div id="col1" class="col-sm-6"> >+ <h3>Original</h3> >+ [% IF ( ERROR_FORMATTED1 ) %] >+ <div class="dialog alert"> >+ <p>The record ID <em>[% RECORDID | html %]</em> doesn't match any existing record.</p> >+ </div> >+ [% ELSE %] >+ <pre>[% MARC_FORMATTED1 | html %]</pre> >+ [% END %] > </div> >- [% ELSE %] >- <h3>[% RECORDTITLE | html %]</h3> >- <pre>[% MARC_FORMATTED1 | html %]</pre> >- [% END %] >- </div> >- <div id="col2" class="col-sm-6"> >- <h2>Imported</h2> >- [% IF ( ERROR_FORMATTED2 ) %] >- <div class="dialog alert"> >- <p>The import ID number <em>[% IMPORTID | html %]</em> doesn't match any existing record.</p> >+ <div id="col2" class="col-sm-6"> >+ <h3>Imported</h3> >+ [% IF ( ERROR_FORMATTED2 ) %] >+ <div class="dialog alert"> >+ <p>The import ID number <em>[% IMPORTID | html %]</em> doesn't match any existing record.</p> >+ </div> >+ [% ELSE %] >+ <h3>[% IMPORTTITLE | html %]</h3> >+ <pre>[% MARC_FORMATTED2 | html %] </pre> >+ [% END %] > </div> >- [% ELSE %] >- <h3>[% IMPORTTITLE | html %]</h3> >- <pre>[% MARC_FORMATTED2 | html %] </pre> >- [% END %] >+ </div> >+ <fieldset class="action"> >+ <a class="btn btn-primary" href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a> >+ </fieldset> > </div> > </div> >- >-<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p> >- >- </main> >- </div> >+ </main> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >-- >2.30.2
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 37452
:
169499
|
169500
| 170441