Bugzilla – Attachment 148016 Details for
Bug 33181
Use template wrapper for tabs on record merge pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33181: Use template wrapper for tabs on record merge pages
Bug-33181-Use-template-wrapper-for-tabs-on-record-.patch (text/plain), 9.19 KB, created by
Owen Leonard
on 2023-03-09 15:52:37 UTC
(
hide
)
Description:
Bug 33181: Use template wrapper for tabs on record merge pages
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-03-09 15:52:37 UTC
Size:
9.19 KB
patch
obsolete
>From 2fcdf201a5cb8010f39ad2809dbda258061c24b2 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 9 Mar 2023 15:43:24 +0000 >Subject: [PATCH] Bug 33181: Use template wrapper for tabs on record merge > pages > >This patch updates the include file which is used by both the >bibliographic and authority recrd merge pages. The markup is updated to >use the new tab WRAPPER directives. > >To test, apply the patch and perform a catalog search which will return >more than one record. > > - Select two or more records and choose "Merge records" from the edit > menu at the top of the search results. > - On the following page you should see one tab for each record you > selected from the search results. > - Clicking each tab should show you the correct bibliographic details. > >Perform the same tests from the authority search results page. >--- > .../prog/en/includes/merge-record.inc | 107 +++++++++--------- > 1 file changed, 54 insertions(+), 53 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >index 260d328fd1..cdf3aefb54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >@@ -1,70 +1,71 @@ > [% BLOCK sourcetab %] >- <div id="tabrecord[% record.recordid | html %]" role="tabpanel" class="tab-pane"> >- <div class="record"> >- <ul id="ulrecord[% record.recordid | html %]"> >- [% FOREACH field IN record.display %] >- [% IF field.tag != biblionumbertag %] >- <li id="k[% field.key | html %]"> >- [% IF (tabrecord.reference) %] >- <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% record.recordid | html %]_[% field.key | html %]" /> >- [% ELSE %] >- <input type="checkbox" class="fieldpick" id="rec_[% record.recordid | html %]_[% field.key | html %]" /> >- [% END %] >- <label for="rec_[% record.recordid | html %]_[% field.key | html %]"><span class="field">[% field.tag | html %]</span></label> >+ <div class="record"> >+ <ul id="ulrecord[% record.recordid | html %]"> >+ [% FOREACH field IN record.display %] >+ [% IF field.tag != biblionumbertag %] >+ <li id="k[% field.key | html %]"> >+ [% IF (tabrecord.reference) %] >+ <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% record.recordid | html %]_[% field.key | html %]" /> >+ [% ELSE %] >+ <input type="checkbox" class="fieldpick" id="rec_[% record.recordid | html %]_[% field.key | html %]" /> >+ [% END %] >+ <label for="rec_[% record.recordid | html %]_[% field.key | html %]"><span class="field">[% field.tag | html %]</span></label> > >- <input type="hidden" name="tag_[% field.tag | html %]_indicator1_[% field.key | html %]" value="[% field.indicator1 | html %]" /> >- <input type="hidden" name="tag_[% field.tag | html %]_indicator2_[% field.key | html %]" value="[% field.indicator2 | html %]" /> >- [% IF ( field.value ) %] >- / [% field.value | html %] >- <input type="hidden" name="tag_[% field.tag | html %]_code_00_[% field.key | html %]" value="00" /> >- <input type="hidden" name="tag_[% field.tag | html %]_subfield_00_[% field.key | html %]" value="[% field.value | html %]" /> >- [% END %] >+ <input type="hidden" name="tag_[% field.tag | html %]_indicator1_[% field.key | html %]" value="[% field.indicator1 | html %]" /> >+ <input type="hidden" name="tag_[% field.tag | html %]_indicator2_[% field.key | html %]" value="[% field.indicator2 | html %]" /> >+ [% IF ( field.value ) %] >+ / [% field.value | html %] >+ <input type="hidden" name="tag_[% field.tag | html %]_code_00_[% field.key | html %]" value="00" /> >+ <input type="hidden" name="tag_[% field.tag | html %]_subfield_00_[% field.key | html %]" value="[% field.value | html %]" /> >+ [% END %] > >- [% IF ( field.subfield.size ) %] >- <ul> >- [% FOREACH subfield IN field.subfield %] >- <li id="k[% subfield.subkey | html %]"> >- [% IF (tabrecord.reference) %] >- <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% record.recordid | html %]_[% subfield.subkey | html %]" /> >- [% ELSE %] >- <input type="checkbox" class="subfieldpick" id="rec_[% record.recordid | html %]_[% subfield.subkey | html %]" /> >- [% END %] >- <label for="rec_[% record.recordid | html %]_[% subfield.subkey | html %]"><span class="subfield">[% subfield.subtag | html %]</span> / [% subfield.value | html %]</label> >- <input type="hidden" name="tag_[% field.tag | html %]_code_[% subfield.subtag | html %]_[% field.key | html %]_[% subfield.subkey | html %]" value="[% subfield.subtag | html %]" /> >- <input type="hidden" name="tag_[% field.tag | html %]_subfield_[% subfield.subtag | html %]_[% subfield.key | html %]_[% subfield.subkey | html %]" value="[% subfield.value | html %]" /> >- </li> >- [% END %] >- </ul> >- [% END %] >- </li> >- [% END %] >+ [% IF ( field.subfield.size ) %] >+ <ul> >+ [% FOREACH subfield IN field.subfield %] >+ <li id="k[% subfield.subkey | html %]"> >+ [% IF (tabrecord.reference) %] >+ <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% record.recordid | html %]_[% subfield.subkey | html %]" /> >+ [% ELSE %] >+ <input type="checkbox" class="subfieldpick" id="rec_[% record.recordid | html %]_[% subfield.subkey | html %]" /> >+ [% END %] >+ <label for="rec_[% record.recordid | html %]_[% subfield.subkey | html %]"><span class="subfield">[% subfield.subtag | html %]</span> / [% subfield.value | html %]</label> >+ <input type="hidden" name="tag_[% field.tag | html %]_code_[% subfield.subtag | html %]_[% field.key | html %]_[% subfield.subkey | html %]" value="[% subfield.subtag | html %]" /> >+ <input type="hidden" name="tag_[% field.tag | html %]_subfield_[% subfield.subtag | html %]_[% subfield.key | html %]_[% subfield.subkey | html %]" value="[% subfield.value | html %]" /> >+ </li> >+ [% END %] >+ </ul> >+ [% END %] >+ </li> > [% END %] >- </ul> >- </div><!-- /div.record --> >- </div><!-- /div#tabrecordXXX --> >+ [% END %] >+ </ul> >+ </div><!-- /div.record --> > [% END %] > > [% BLOCK mergesource %] >- <div id="tabs" class="toptabs"> >+ >+ [% WRAPPER tabs id= "tabs" %] > <h2>Source records</h2> >- <ul class="nav nav-tabs" role="tablist"> >+ [% WRAPPER tabs_nav %] > [% FOREACH record IN sourcerecords %] >- <li role="presentation"> >- <a href="#tabrecord[% record.recordid | uri %]" aria-controls="tabrecord[% record.recordid | uri %]" role="tab" data-toggle="tab"> >- [% record.recordid | html %] >- [% IF record.reference %]<span>(ref)</span>[% END %] >- </a> >- </li> >+ [% WRAPPER tab_item tabname= "tabrecord${record.recordid}" %] >+ [% record.recordid | html %] >+ [% IF record.reference %]<span>(ref)</span>[% END %] >+ [% END %] > [% END %] >- </ul> >- <div class="tab-content"> >+ [% END # /WRAPPER tabs_nav %] >+ >+ [% WRAPPER tab_panels %] > [% IF ( sourcerecords.size ) %] > [% FOREACH record IN sourcerecords %] >- [% PROCESS sourcetab tabrecord=record %] >+ [% WRAPPER tab_panel tabname="tabrecord${record.recordid}" %] >+ [% PROCESS sourcetab tabrecord=record %] >+ [% END %] > [% END %] > [% END %] >- </div> <!-- /.tab-content --> >- </div> <!-- // #tabs --> >+ [% END # /WRAPPER tab_panels %] >+ [% END # /WRAPPER tabs %] >+ > [% END %] > > [% BLOCK mergetarget %] >-- >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 33181
:
148016
|
148488
|
148912
|
149324