gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30423: Convert authority merge page tabs to Bootstrap 

This patch updates the authority merge page to use Bootstrap tabs
instead of jQueryUI.

To test, apply the patch go to Authorities in the staff interface.

- Perform an authority search which will return more than one
  authority record.
- On the results page, click Actions -> Merge for two authority
  records.
- Click "Next" after selecting a merge reference.
- On the next page you should see two tabs under "Source records."
  Confirm that they work correctly.
- Confirm that tag and subfield selection still works correctly.

Signed-off-by: Séverine Queune <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Owen Leonard 2022-03-31 17:34:35 +00:00 committed by Fridolin Somers
parent 8340956a9b
commit 408de34eaa
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
View File

@ -1,5 +1,5 @@
[% BLOCK sourcetab %]
<div id="tabrecord[% record.recordid | html %]">
<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 %]
@ -45,24 +45,26 @@
[% END %]
[% BLOCK mergesource %]
<div id="tabs" class="toptabs">
<h2>Source records</h2>
<ul>
[% FOREACH record IN sourcerecords %]
<li>
<a href="#tabrecord[% record.recordid | uri %]">
[% record.recordid | html %]
[% IF record.reference %](ref)[% END %]
</a>
</li>
[% END %]
</ul>
[% IF ( sourcerecords.size ) %]
[% FOREACH record IN sourcerecords %]
[% PROCESS sourcetab tabrecord=record %]
[% END %]
[% END %]
</div> <!-- // #tabs -->
<div id="tabs" class="toptabs">
<h2>Source records</h2>
<ul class="nav nav-tabs" role="tablist">
[% 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 %](ref)[% END %]
</a>
</li>
[% END %]
</ul>
<div class="tab-content">
[% IF ( sourcerecords.size ) %]
[% FOREACH record IN sourcerecords %]
[% PROCESS sourcetab tabrecord=record %]
[% END %]
[% END %]
</div> <!-- /.tab-content -->
</div> <!-- // #tabs -->
[% END %]
[% BLOCK mergetarget %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
View File

@ -144,9 +144,9 @@ div#result { margin-top: 1em; }
ev.preventDefault();
newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes');
});
// Creating tabs
$("#tabs").tabs();
if( $(".tab-pane.active").length < 1 ){
$("#tabs a:first").tab("show");
}
});