Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 30570: Replace the use of jQueryUI tabs in OPAC templates

Browse source 
This patch switches to Bootstrap tabs anywhere in the OPAC where
jQueryUI tabs were used.

To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).

- Test the item type/collection/shelvinglocation tabs on the advanced
  search page. Test that it works correctly with different variations of
  the OpacAdvancedSearchTypes system preference.
- Search for an authority record and view the details. The "Notes"
  tab should be styled correctly.
- Locate a bibliographic record and view the detail page. Verify
  that tabs are working, including all the options:
- Holdings
- Other holdings ( If OpacSeparateHoldings is enabled)
- Descriptions ( MARC notes )
- Subscriptions
- Serial collection (UNIMARC, untested)
- Components ( If ShowComponentRecords is enabled. Link to sample
  record:
  https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78023 )
- Comments
- Editions (OPACFRBRizeEditions)
- Html5media ( If HTML5MediaEnabled is on. Link to sample records:
  (https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10685)
- Images ( If OPACLocalCoverImages is enabled )

Bonus points for testing these tabs for which I don't have
credentials:
- Syndetics TOC
- Syndetics Excerpt
- Syndetics Reviews
- Syndetics AuthorNotes
- LibraryThing for Libraries (with LibraryThingForLibrariesTabbedView
  set to "in tabs."
- NovelistSelect

- Check tabs on these patron-related pages:
  - Checkout history
  - Search history
  - Patron summary. The following tabs are
    ✓ Checkouts
    ✓ Relatives' checkouts
    ✓ Overdues
    ✓ Fines
    ✓ Relatives' fines
    ✓ Holds
    ✓ Recalls
    ✓ Article requests
    ✓ Overdrive

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Bug 30570: (follow-up) Correct rebase errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 894f7013eb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2022-07-06 11:36:11 +00:00 committed by Lucas Gass
parent 4f5b10118a
commit ebc552cac6
9 changed files with 1375 additions and 1239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
View file

@ -901,6 +901,40 @@ ul {
/* end jQueryUI core */
/* Bootstrap Tabs */
.tab-content {
background-color: #FFF;
border: 1px solid #d8d8d8;
border-top-width: 0;
margin-bottom: 1em;
padding: 1em;
}
.nav-tabs {
.nav-link {
background-color: #f0f3f3;
border: 1px solid #d8d8d8;
border-radius: 0;
margin-right: .4em;
&:hover,
&:focus {
border-color: #d8d8d8;
}
&.active {
background-color: #fff;
border: 1px solid #d8d8d8;
border-bottom-color: transparent;
color: #000;
cursor: default;
}
}
}
/* end Bootstrap Tabs */
.close {
color: #0088CC;
filter: none;
@ -1002,16 +1036,6 @@ button {
}
}
.nav-link {
&.active {
font-weight: bold;
}
}
.tab-content {
padding: 15px 0;
}
#logo {
background: transparent url( "../images/koha-green-logo.svg" ) no-repeat scroll 0%;
border: 0;

2
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
View file

@ -267,7 +267,7 @@ th {
}
.advsearch_limit {
border: 1px solid #EEE;
border: 1px solid #d8d8d8;
font-size: 90%;
height: 100%;
margin-bottom: 15px;

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
View file

@ -4,7 +4,7 @@
[% PROCESS 'i18n.inc' %]
[% IF ( HOLDS.count ) %]
<div id="opac-user-holds">
<div id="opac-user-holds" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-holds-tab">
<table id="holdst" class="table table-bordered table-striped">
<caption>Holds <span class="count">([% HOLDS.count | html %] total)</span></caption>
<!-- HOLDS TABLE ROWS -->

18
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
View file

@ -157,21 +157,22 @@
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %]
<div class="col order-first order-md-first order-lg-2">
<div id="advsearches" class="toptabs">
<ul>
<ul class="nav nav-tabs" role="tablist">
[% FOREACH advsearchloo IN advancedsearchesloop %]
<li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
<a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]">
<li class="nav-item" role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
<a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]" class="nav-link" aria-controls="advsearch-[% advsearchloo.advanced_search_type | html %]" aria-selected="false" role="tab" data-toggle="tab">
[% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]<span>Item type</span>
[% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]<span>Collection</span>
[% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]<span>Shelving location</span>
[% ELSE %]<span>Something else</span>
[% END %]
</a></li>
</a>
</li>
[% END %]
</ul>
<div class="tab-content">
[% FOREACH advsearchloo IN advancedsearchesloop %]
<div id="advsearch-[% advsearchloo.advanced_search_type | html %]" class="advsearch">
<div role="tabpanel" class="tab-pane" id="advsearch-[% advsearchloo.advanced_search_type | html %]" class="advsearch" aria-labelledby="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
<fieldset>
<legend>Limit to any of the following:</legend>
<div class="row">
@ -199,6 +200,7 @@
</fieldset>
</div> <!-- / #advsearch-[% advsearchloo.advanced_search_type | html %] -->
[% END # / FOREACH advancedsearchesloop %]
</div> <!-- /.tab-content -->
</div> <!-- / #advsearches -->
</div> <!-- / .col -->
[% END # /IF OpacAdvSearchOptions %]
@ -470,7 +472,9 @@ $(document).ready(function() {
});
[% END %]
$('#advsearches').tabs();
if( $("#advsearches .tab-pane.active").length < 1 ){
$("#advsearches a:first").tab("show");
}
$('.search-term-row .search-term-input select[name="op"]').first().prop("disabled",true).hide();

11
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt
View file

@ -153,16 +153,20 @@
[% END # / IF MARCURLS %]
<div id="authdescriptions" class="toptabs">
<ul>
<li id="tab_descriptions"><a href="#descriptions">Notes</a></li>
<ul class="nav nav-tabs" role="tablist">
<li id="tab_descriptions" class="nav-item" role="presentation">
<a class="nav-link active" id="descriptions-tab" data-toggle="tab" href="#descriptions" role="tab" aria-controls="descriptions" aria-selected="true" href="#descriptions">Notes</a>
</li>
</ul>
<div id="descriptions">
<div class="tab-content">
<div class="tab-pane active" role="tabpanel" aria-labelledby="descriptions-tab" id="descriptions">
<div class="content_set">
[% FOREACH note IN summary.notes %]
<p class="note auth[% note.field | html %]">[% note.note | html %]</p>
[% END %]
</div>
</div>
</div> <!-- /.tab-content -->
</div>
</div> <!-- / .#userauthdetails -->
</div> <!-- / .col-lg-10/12 -->
@ -177,7 +181,6 @@
[% END %]
<script>
$(document).ready(function() {
$('#authdescriptions').tabs();
[% IF ( displayhierarchy ) %]
$('#hierarchies').jstree({
"types" : {

150
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
View file

@ -370,12 +370,8 @@
</div> <!-- / #catalogue_detail_biblio -->
<div id="bibliodescriptions" class="toptabs">
<ul>
[% IF ( defaulttab == 'holdings' ) %]
<li id="tab_holdings" class="ui-tabs-active">
[% ELSE %]
<li id="tab_holdings">
[% END %]
<ul class="nav nav-tabs" role="tablist">
<li id="tab_holdings" class="nav-item" role="presentation">
[% BLOCK holding_tab_title %]
[% IF SeparateHoldings %]
<span>[% Branches.GetLoggedInBranchname | html %] holdings</span>
@ -387,10 +383,14 @@
[% END %]
[% END %]
[% END %]
<a href="#holdings">[% PROCESS holding_tab_title %] [% UNLESS too_many_items OR specific_item %][% ' ( ' _ (itemloop.size || 0) _ ' )' | html %][% END %]</a>
<a href="#holdings" class="nav-link" id="holdings-tab" data-toggle="tab" role="tab" aria-controls="holdings" aria-selected="false">
[% PROCESS holding_tab_title %] [% UNLESS too_many_items OR specific_item %][% ' ( ' _ (itemloop.size || 0) _ ' )' | html %][% END %]
</a>
</li>
[% IF (SeparateHoldings) %]
<li><a href="#otherholdings">Other holdings [% ' ( ' _ (otheritemloop.size || 0) _ ' )' | html %]</a></li>
<li class="nav-item" role="presentation">
<a href="#otherholdings" class="nav-link" id="otherholdings-tab" data-toggle="tab" role="tab" aria-controls="otherholdings" aria-selected="false">Other holdings [% ' ( ' _ (otheritemloop.size || 0) _ ' )' | html %]</a>
</li>
[% END %]
[% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
[% SET title_notes_count = 0 %]
@ -398,26 +398,31 @@
[% SET title_notes_count = MARCNOTES.size %]
[% END %]
[% IF SYNDETICS_SUMMARY %][% SET title_notes_count = title_notes_count + 1 %][% END %]
<li id="tab_descriptions"> <a href="#descriptions">Title notes ( [% title_notes_count | html %] )</a></li>
<li id="tab_descriptions" class="nav-item" role="presentation">
<a href="#descriptions" class="nav-link" id="tab_descriptions-tab" data-toggle="tab" role="tab" aria-controls="tab_descriptions" aria-selected="false">Title notes ( [% title_notes_count | html %] )</a>
</li>
[% END %]
[% IF ComponentParts && ComponentParts.size %]
[% IF defaulttab == 'components' %]
<li id="tab_components" class="ui-tabs-active">
[% ELSE %]
<li id="tab_components">
[% END %]
<a href="#components">Components ([% ComponentParts.size | html %])</a>
<li id="tab_components" class="nav-item" role="presentation">
<a href="#components" class="nav-link" id="tab_components-tab" data-toggle="tab" role="tab" aria-controls="tab_components" aria-selected="false">
Components ([% ComponentParts.size | html %])</a>
</li>
[% END %]
[% IF ( SYNDETICS_TOC ) %]
<li id="tab_toc"> <a href="#toc">TOC</a></li>
<li id="tab_toc" class="nav-item" role="presentation">
<a href="#toc" class="nav-link" id="tab_toc-tab" data-toggle="tab" role="tab" aria-controls="tab_toc" aria-selected="false">TOC</a>
</li>
[% END %]
[% IF ( SyndeticsEnabled ) %]
[% IF ( SyndeticsExcerpt && SYNDETICS_EXCERPT ) %]
<li id="tab_excerpt"> <a href="#excerpt">Excerpt</a></li>
<li id="tab_excerpt" class="nav-item" role="presentation">
<a href="#excerpt" class="nav-link" id="tab_excerpt-tab" data-toggle="tab" role="tab" aria-controls="tab_excerpt" aria-selected="false">Excerpt</a>
</li>
[% END %]
[% IF ( ( SyndeticsReviews && SYNDETICS_REVIEWS ) || ( LibraryThingForLibrariesTabbedView && LibraryThingForLibrariesID) ) %]
<li id="tab_reviews"> <a href="#reviews">Reviews</a></li>
<li id="tab_reviews" class="nav-item" role="presentation">
<a href="#reviews" class="nav-link" id="tab_reviews-tab" data-toggle="tab" role="tab" aria-controls="tab_reviews" aria-selected="false">Reviews</a>
</li>
[% IF ( LibraryThingForLibrariesID ) %]
<li id="tab_LTFLreviews">
<script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID | html %]"></script>
@ -426,53 +431,74 @@
[% END %]
[% END %]
[% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %]
<li id="tab_anotes"> <a href="#anotes">About the author</a></li>
<li id="tab_anotes" class="nav-item" role="presentation">
<a href="#anotes" class="nav-link" id="tab_anotes-tab" data-toggle="tab" role="tab" aria-controls="tab_anotes" aria-selected="false">About the author</a>
</li>
[% END %]
[% END # / IF SyndeticsEnabled %]
[% IF ( LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView ) %]
<li id="tab_LFTLSimilarItems"> <a href="#LFTLSimilarItems">Similar items</a></li>
<li id="tab_LTFLTagBrowse"> <a href="#LTFLTagBrowse">Tag browser</a></li>
<li id="tab_LFTLSimilarItems" class="nav-item" role="presentation">
<a href="#LFTLSimilarItems" class="nav-link" id="tab_LFTLSimilarItems-tab" data-toggle="tab" role="tab" aria-controls="tab_LFTLSimilarItems" aria-selected="false">Similar items</a>
</li>
<li id="tab_LTFLTagBrowse">
<a href="#LTFLTagBrowse" class="nav-link" id="tab_LTFLTagBrowse-tab" data-toggle="tab" role="tab" aria-controls="tab_LTFLTagBrowse" aria-selected="false">Tag browser</a>
</li>
[% END %]
[% IF ( subscriptionsnumber ) %]
[% IF ( defaulttab == 'subscriptions' ) %]<li id="tab_subscriptions" class="ui-tabs-active">[% ELSE %]<li id="tab_subscriptions">[% END %]
<a href="#subscriptions">Subscriptions ( [% subscriptionsnumber | html %] )</a>
<li id="tab_subscriptions" class="nav-item" role="presentation">
<a href="#subscriptions" class="nav-link" id="tab_subscriptions-tab" data-toggle="tab" role="tab" aria-controls="tab_subscriptions" aria-selected="false">
Subscriptions ( [% subscriptionsnumber | html %] )</a>
</li>
[% END %]
[% IF Koha.Preference( 'OPACComments' ) == 1 %]
<li id="tab_comments"><a href="#comments">Comments[% ' ( ' _ (reviews.size || 0) _ ' )' | html %]</a></li>
<li id="tab_comments" class="nav-item" role="presentation">
<a href="#comments" class="nav-link" id="tab_comments-tab" data-toggle="tab" role="tab" aria-controls="tab_comments" aria-selected="false">Comments[% ' ( ' _ (reviews.size || 0) _ ' )' | html %]</a>
</li>
[% END %]
[% IF ( NovelistSelectProfile && (normalized_isbn || normalized_upc) ) %]
[% IF ( NovelistSelectView == 'tab') %]
<li id="tab_NovelistSelect" class="NovelistSelect" style="display:none;"> <a href="#NovelistSelect">Novelist Select</a></li>
<li id="tab_NovelistSelect" class="NovelistSelect" style="display:none;" class="nav-item" role="presentation">
<a href="#NovelistSelect" class="nav-link" id="tab_NovelistSelect-tab" data-toggle="tab" role="tab" aria-controls="tab_NovelistSelect" aria-selected="false">Novelist Select</a>
</li>
[% END %]
[% END %]
[% IF ( OPACFRBRizeEditions && XISBNS ) %]
<li id="tab_editions"><a href="#editions">Editions</a></li>
<li id="tab_editions" class="nav-item" role="presentation">
<a href="#editions" class="nav-link" id="tab_editions-tab" data-toggle="tab" role="tab" aria-controls="tab_editions" aria-selected="false">Editions</a>
</li>
[% END %]
[% IF ( serialcollection ) %]
[% IF ( defaulttab == 'serialcollection' ) %]<li id="tab_serialcollection" class="ui-tabs-active">[% ELSE %]<li id="tab_serialcollection">[% END %]
<a href="#serialcollection">Serial collection</a>
<li id="tab_serialcollection" class="nav-item" role="presentation">
<a href="#serialcollection" class="nav-link" id="tab_serialcollection-tab" data-toggle="tab" role="tab" aria-controls="tab_serialcollection" aria-selected="false">
Serial collection
</a>
</li>
[% END %]
[% IF ( OPACLocalCoverImages && localimages.count ) %]
<li id="tab_images"><a href="#images">Images</a></li>
<li id="tab_images" class="nav-item" role="presentation">
<a href="#images" class="nav-link" id="tab_images-tab" data-toggle="tab" role="tab" aria-controls="tab_images" aria-selected="false">Images</a>
</li>
[% END %]
[% IF HTML5MediaEnabled && HTML5MediaSets.size %]
[% IF ( defaulttab == 'media' ) %]<li id="tab_html5media" class="ui-tabs-active">[% ELSE %]<li id="tab_html5media">[% END %]<a href="#html5media">Play media</a></li>
<li id="tab_html5media" class="nav-item" role="presentation">
<a href="#html5media" class="nav-link" id="tab_html5media-tab" data-toggle="tab" role="tab" aria-controls="tab_html5media" aria-selected="false">
Play media
</a>
</li>
[% END %]
</ul>
<div class="tab-content">
[% IF ( serialcollection ) %]
<div id="serialcollection">
<div id="serialcollection" class="tab-pane" role="tabpanel" aria-labelledby="tab_serialcollection-tab">
<table id="serialcollectiont" class="table table-bordered table-striped">
<caption class="sr-only">Serial collections</caption>
<thead>
@ -496,7 +522,7 @@
[% END # / IF serialcollection %]
<div id="holdings">
<div id="holdings" class="tab-pane" role="tabpanel" aria-labelledby="holdings-tab">
[% IF too_many_items %]
<p>This record has many physical items ([% items_count | html %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;viewallitems=1">View all the physical items.</a></p>
[% ELSIF ( itemloop.size ) %]
@ -550,7 +576,7 @@
</div> <!-- / #holdings -->
[% IF (SeparateHoldings) %]
<div id="otherholdings">
<div id="otherholdings" class="tab-pane" role="tabpanel" aria-labelledby="otherholdings-tab">
[% IF (otheritemloop.size) %]
[% INCLUDE items_table items=otheritemloop tab="otherholdings" table_id="otherholdingst" %]
[% ELSE %]
@ -561,7 +587,7 @@
[% END # / SeparateHoldings %]
[% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
<div id="descriptions">
<div id="descriptions" class="tab-pane" role="tabpanel" aria-labelledby="tab_descriptions-tab">
<div class="content_set">
[% IF ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY ) %]
@ -588,7 +614,7 @@
[% END # / IF MARCNOTES %]
[% IF ComponentParts && ComponentParts.size %]
<div id="components">
<div id="components" class="tab-pane" role="tabpanel" aria-labelledby="tab_components-tab">
<div class="content_set">
<table>
[% FOR PART IN ComponentParts %]
@ -600,7 +626,7 @@
[% END %]
</table>
[% IF ComponentParts.size == Koha.Preference('MaxComponentRecords')%]
<p>Only [% ComponentParts.size | html %] results are shown: <a href="/cgi-bin/koha/opac-search.pl?q=[% ComponentPartsQuery | url %]"/>show all component parts</a></p>
<p>Only [% ComponentParts.size | html %] results are shown: <a href="/cgi-bin/koha/opac-search.pl?q=[% ComponentPartsQuery | uri %]"/>show all component parts</a></p>
[% END %]
</div>
</div>
@ -608,7 +634,7 @@
[% IF ( SyndeticsEnabled ) %]
[% IF ( SyndeticsTOC && SYNDETICS_TOC ) %]
<div id="toc">
<div id="toc" class="tab-pane" role="tabpanel" aria-labelledby="tab_toc-tab">
<div class="content_set">
<h2>Table of contents provided by Syndetics</h2>
<ul>
@ -621,7 +647,7 @@
[% END # / IF SyndeticsTOC && SYNDETICS_TOC %]
[% IF ( SyndeticsExcerpt && SYNDETICS_EXCERPT ) %]
<div id="excerpt">
<div id="excerpt" class="tab-pane" role="tabpanel" aria-labelledby="tab_excerpt-tab">
<div class="content_set">
<h2>Excerpt provided by Syndetics</h2>
[% SYNDETICS_EXCERPT | $raw %]
@ -630,7 +656,7 @@
[% END # / IF SyndeticsExcerpt && SYNDETICS_EXCERPT %]
[% IF ( SyndeticsReviews && SYNDETICS_REVIEWS ) %]
<div id="reviews">
<div id="reviews" class="tab-pane" role="tabpanel" aria-labelledby="tab_reviews-tab">
<div class="content_set">
<h2>Reviews provided by Syndetics</h2>
[% FOREACH SYNDETICS_REVIEW IN SYNDETICS_REVIEWS %]
@ -650,7 +676,7 @@
[% END # / IF SyndeticsReviews && SYNDETICS_REVIEWS %]
[% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %]
<div id="anotes">
<div id="anotes" class="tab-pane" role="tabpanel" aria-labelledby="tab_anotes-tab">
<div class="content_set">
<h2>Author notes provided by Syndetics</h2>
[% FOREACH SYNDETICS_ANOTE IN SYNDETICS_ANOTES %]
@ -664,13 +690,13 @@
[% END # / IF SyndeticsEnabled %]
[% IF ( NovelistSelectProfile && NovelistSelectView == 'tab' && (normalized_isbn || normalized_upc) ) %]
<div id="NovelistSelect" >
<div id="NovelistSelect" class="tab-pane" role="tabpanel" aria-labelledby="tab_NovelistSelect-tab">
<div data-novelist-novelistselect=[% IF normalized_isbn %][% normalized_isbn | html %][% ELSE %][% normalized_upc | html %][% END %]></div>
</div>
[% END # / IF NovelistSelectProfile && NovelistSelectView == 'tab' %]
[% IF ( subscriptionsnumber ) %]
<div id="subscriptions">
<div id="subscriptions" class="tab-pane" role="tabpanel" aria-labelledby="tab_subscriptions-tab">
<h2>This is a serial</h2>
<p class="subscription_count">There are [% subscriptionsnumber | html %] subscription(s) associated with this title.</p>
[% FOREACH subscription IN subscriptions %]
@ -761,7 +787,7 @@
[% IF ( LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView ) %]
<!-- Library Thing for Libraries Content -->
<div id="LFTLSimilarItems">
<div id="LFTLSimilarItems" class="tab-pane" role="tabpanel" aria-labelledby="tab_LFTLSimilarItems-tab">
<div class="content_set">
<!-- Uncommenting this span makes the font smaller in the tab for LTFL -->
<!-- but breaks Xhtml validation -->
@ -771,7 +797,7 @@
<!-- </span>-->
</div>
</div>
<div id="LTFLTagBrowse">
<div id="LTFLTagBrowse" class="tab-pane" role="tabpanel" aria-labelledby="tab_LTFLTagBrowse-tab">
<div class="content_set">
<!-- <span class="results_summary"> -->
<div id="ltfl_tagbrowse" class="ltfl"></div>
@ -781,7 +807,7 @@
[% END # / IF LibraryThingForLibrariesID && LibraryThingForLibrariesTabbedView %]
[% IF Koha.Preference( 'OPACComments' ) == 1 %]
<div id="comments">
<div id="comments" class="tab-pane" role="tabpanel" aria-labelledby="tab_comments-tab">
<div id="newcomment"></div>
[% IF ( reviews ) %]
[% FOREACH review IN reviews %]
@ -856,7 +882,7 @@
[% END # / IF OPACComments %]
[% IF ( OPACFRBRizeEditions && XISBNS ) %]
<div id="editions">
<div id="editions" class="tab-pane" role="tabpanel" aria-labelledby="tab_editions-tab">
<h2>Other editions of this work</h2>
<table class="table table-bordered table-striped">
<caption class="sr-only">Other editions</caption>
@ -898,7 +924,7 @@
[% END # / IF OPACFRBRizeEditions && XISBNS %]
[% IF ( HTML5MediaEnabled ) %]
<div id="html5media">
<div id="html5media" class="tab-pane" role="tabpanel" aria-labelledby="tab_html5media-tab">
[% FOREACH HTML5MediaSet IN HTML5MediaSets %]
<p>
[% IF HTML5MediaSet.is_youtube %]
@ -917,7 +943,7 @@
[% END # / IF HTML5MediaEnabled %]
[% IF ( OPACLocalCoverImages && localimages.count ) %]
<div id="images">
<div id="images" class="tab-pane" role="tabpanel" aria-labelledby="tab_images-tab">
<p>Click on an image to view it in the image viewer</p>
[% FOREACH image IN localimages %]
<a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblio.biblionumber | uri %]&amp;imagenumber=[% image.imagenumber | uri %]" title="Local cover image">
@ -930,7 +956,7 @@
</div> <!-- / #bibliodescriptions -->
[% IF ( NovelistSelectProfile && NovelistSelectView == 'below' && ( normalized_isbn || normalized_upc ) ) %]
<div id="NovelistSelect">
<div id="NovelistSelect" class="tab-pane" role="tabpanel" aria-labelledby="tab_NovelistSelect-tab">
<h2>Novelist Select</h2>
<div data-novelist-novelistselect="[% IF normalized_isbn %][% normalized_isbn | html %][% ELSE %][% normalized_upc | html %][% END %]"></div>
</div>
@ -950,6 +976,7 @@
<div id="BW_videos"></div>
</div>
[% END # / IF Babeltheque %]
</div> <!-- /.tab-content -->
</div> <!-- /.col-lg-10 -->
@ -1624,7 +1651,20 @@
});
[% END # /IF OPACDetailQRCode %]
$('#bibliodescriptions').tabs();
[% SWITCH defaulttab -%]
[% CASE 'holdings' -%]
showBsTab("bibliodescriptions", "holdings");
[% CASE 'components' -%]
showBsTab("bibliodescriptions", "components");
[% CASE 'subscriptions' -%]
showBsTab("bibliodescriptions", "subscriptions");
[% CASE 'serialcollection' -%]
showBsTab("bibliodescriptions", "serialcollection");
[% CASE 'media' -%]
showBsTab("bibliodescriptions", "html5media");
[% CASE -%]
showBsTab("bibliodescriptions", "holdings");
[% END -%]
[% IF ( Koha.Preference('OpacBrowseResults') && busc ) %]
$(".l_Results").show();
@ -1961,6 +2001,14 @@
});
});
function showBsTab( container, panelid ){
if( $( "#" + panelid ).length == 1 ){
$("#" + container + " a[href='#" + panelid + "']").tab("show");
} else {
$("#" + container + " a:first").tab("show");
}
}
function multiSearchRequest(){
var values = [];
$(".select_term").each(function(){

25
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
View file

@ -3,6 +3,7 @@
[% USE KohaDates %]
[% USE TablesSettings %]
[% USE AdditionalContents %]
[% USE Asset %]
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
[% INCLUDE 'doc-head-open.inc' %]
@ -77,13 +78,20 @@
[% IF Koha.Preference( 'OnSiteCheckouts' ) == 1 %]
<div id="tabs" class="toptabs">
<ul class="js-show">
<li id="tab_all"><a href="#tabs-container">All</a></li>
<li id="tab_checkout"><a href="#tabs-container">Checkouts</a></li>
<li id="tab_onsite_checkout"><a href="#tabs-container">On-site checkouts</a></li>
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation">
<a id="tab_all" class="nav-link active" data-toggle="tab" role="tab" aria-controls="tabs-container" aria-selected="true" href="#tabs-container">All</a>
</li>
<li class="nav-item" role="presentation">
<a id="tab_checkout" class="nav-link" data-toggle="tab" role="tab" aria-controls="tabs-container" aria-selected="false" href="#tabs-container">Checkouts</a>
</li>
<li class="nav-item" role="presentation">
<a id="tab_onsite_checkout" class="nav-link" data-toggle="tab" role="tab" aria-controls="tabs-container" aria-selected="false" href="#tabs-container">On-site checkouts</a>
</li>
</ul>
<div class="tab-content">
[% END %]
<div id="tabs-container" style="overflow:hidden">
<div class="tab-pane active" role="tabpanel" id="tabs-container">
<table id="readingrec" class="table table-bordered table-striped">
<caption class="sr-only">Checkout history</caption>
<thead>
@ -177,6 +185,7 @@
</table>
</div> <!-- / .tabs-container -->
[% IF ( Koha.Preference( 'OnSiteCheckouts' ) == 1 ) %]
</div> <!-- /.tab-content -->
</div> <!-- /#tabs -->
[% END %]
</div> <!-- / .opac-user-readingrec -->
@ -208,9 +217,8 @@
}
}, columns_settings);
var tabs = $("#tabs").tabs({
activate: function(e, ui) {
var id = $(ui.newTab).attr("id");
$("#tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) {
var id = e.target.id;
if ( id == "tab_checkout" ) {
table.fnFilter("standard_checkout", 0);
} else if ( id == "tab_onsite_checkout" ) {
@ -218,7 +226,6 @@
} else { // all
table.fnFilter('', 0);
}
}
});
});
var borrowernumber = "[% logged_in_user.borrowernumber | html %]";

24
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
View file

@ -51,12 +51,17 @@
<h1>Search history</h1>
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
<div id="tabs" class="toptabs">
<ul>
<li><a href="#biblio_tab">Catalog</a></li>
<li><a href="#authority_tab">Authority</a></li>
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation">
<a class="nav-link active" id="biblio-tab-link" href="#biblio_tab" aria-controls="biblio_tab" role="tab" data-toggle="tab" aria-selected="true">Catalog</a>
</li>
<li class="nav-item" role="presentation">
<a class="nav-link" id="authority-tab-link" href="#authority_tab" aria-controls="authority_tab" role="tab" data-toggle="tab" aria-selected="false">Authority</a>
</li>
</ul>
<div class="tab-content">
[% END %]
<div id="biblio_tab">
<div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
<div id="current_biblio">
[% IF ( current_biblio_searches ) %]
<h2>Current session</h2>
@ -155,7 +160,8 @@
</div> <!-- / #biblio_tab -->
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
<div id="authority_tab">
<div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
<div id="current_authority">
[% IF ( current_authority_searches ) %]
<h2>Current session</h2>
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
@ -192,7 +198,9 @@
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
</form>
[% END # / IF ( current_authority_searches ) %]
</div> <!-- / #current_authority -->
<hr />
<div id="previous_authority">
[% IF ( previous_authority_searches ) %]
<h2>Previous sessions</h2>
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
@ -229,11 +237,13 @@
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
</form>
[% END # / IF ( previous_authority_searches )%]
</div>
[% IF !current_authority_searches && !previous_authority_searches %]
<p>Your authority search history is empty.</p>
[% END %]
</div> <!-- / #authority_tab -->
</div> <!-- /.tab-content -->
[% END # / IF Koha.Preference( 'OpacAuthorities' ) %]
</div> <!-- / #tabs -->
</div> <!-- / #searchhistory -->
@ -278,8 +288,6 @@
}
}));
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]$('#tabs').tabs();[% END %]
$(".CheckNone").click(function(e){
e.preventDefault();
var form = $(this).parents("form").get(0);

114
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View file

@ -200,40 +200,79 @@
[% END %]
<div id="opac-user-views" class="toptabs">
<ul>
<li><a href="#opac-user-checkouts">Checked out ([% issues_count | html %])</a></li>
[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count | html %])</a></li>[% END %]
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item" role="presentation">
<a class="nav-link active" id="opac-user-checkouts-tab" data-toggle="tab" role="tab" aria-controls="opac-user-checkouts" aria-selected="true" href="#opac-user-checkouts">Checked out ([% issues_count | html %])</a>
</li>
[% IF relatives %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-relative-issues-tab" data-toggle="tab" role="tab" aria-controls="opac-user-relative-issues" aria-selected="false" href="#opac-user-relative-issues">Relatives' checkouts</a>
</li>
[% END %]
[% IF ( overdues_count ) %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-overdues-tab" data-toggle="tab" role="tab" aria-controls="opac-user-overdues" aria-selected="false" href="#opac-user-overdues">Overdue ([% overdues_count | html %])</a>
</li>
[% END %]
[% IF ( OPACFinesTab ) %]
[% IF ( amountoutstanding > 0 ) %]<li><a href="#opac-user-fines">Charges ([% amountoutstanding | $Price %])</a></li>[% END %]
[% IF ( amountoutstanding < 0 ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding * -1 | $Price %])</a></li>[% END %]
[% IF relatives_with_fines %]<li><a href="#opac-user-relative-fines">Relatives' charges</a></li>[% END %]
[% IF ( amountoutstanding > 0 ) %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-fines-tab" data-toggle="tab" role="tab" aria-controls="opac-user-fines" aria-selected="false" href="#opac-user-fines">Charges ([% amountoutstanding | $Price %])</a>
</li>
[% END %]
[% IF ( amountoutstanding < 0 ) %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-fines-tab" data-toggle="tab" role="tab" aria-controls="opac-user-fines" aria-selected="false" href="#opac-user-fines">Credits ([% amountoutstanding * -1 | $Price %])</a>
</li>
[% END %]
[% IF relatives_with_fines %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-relative-fines-tab" data-toggle="tab" role="tab" aria-controls="opac-user-relative-fines" aria-selected="false" href="#opac-user-relative-fines">Relatives' charges</a>
</li>
[% END %]
[% END %]
[% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
<li>
<a id="opac-user-clubs-tab-link" href="#opac-user-clubs">
<li class="nav-item" role="presentation">
<a class="nav-link" data-toggle="tab" role="tab" aria-controls="opac-user-clubs" aria-selected="false" id="opac-user-clubs-tab-link" href="#opac-user-clubs">
Clubs ([% borrower_club_enrollments.count || 0 | html %]/[% borrower_enrollable_clubs.count || 0 | html %])
</a>
</li>
[% END %]
[% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a></li>[% END %]
[% IF Koha.Preference('UseRecalls') && RECALLS.count %]<li><a href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a></li>[% END %]
[% IF Koha.Preference('ArticleRequests') %]<li><a href="#opac-user-article-requests">Article requests ([% current_article_requests.size || 0 | html %])</a></li>[% END %]
[% IF ( RESERVES.count ) %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-holds-tab" data-toggle="tab" role="tab" aria-controls="opac-user-holds" aria-selected="false" href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a>
</li>
[% END %]
[% IF Koha.Preference('UseRecalls') && RECALLS.count %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-recalls-tab" data-toggle="tab" role="tab" aria-controls="opac-user-recalls" aria-selected="false" href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a>
</li>
[% END %]
[% IF Koha.Preference('ArticleRequests') %]
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-article-requests-tab" data-toggle="tab" role="tab" aria-controls="opac-user-article-requests" aria-selected="false" href="#opac-user-article-requests">Article requests ([% current_article_requests.size || 0 | html %])</a>
</li>
[% END %]
[% IF ( OverDriveCirculation ) %]
<li><a href="#opac-user-overdrive">OverDrive account</a></li>
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-overdrive-tab" data-toggle="tab" role="tab" aria-controls="opac-user-overdrive" aria-selected="false" href="#opac-user-overdrive">OverDrive account</a>
</li>
[% END %]
[% IF ( RecordedBooksCirculation ) %]
<li><a href="#opac-user-recordedbooks">RecordedBooks account</a></li>
<li class="nav-item" role="presentation">
<a class="nav-link" id="opac-user-recordedbooks-tab" data-toggle="tab" role="tab" aria-controls="opac-user-recordedbooks" aria-selected="false" href="#opac-user-recordedbooks">RecordedBooks account</a>
</li>
[% END %]
</ul>
<div class="tab-content">
<div id="opac-user-overdrive">
<div id="opac-user-overdrive" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-overdrive-tab">
</div>
<div id="opac-user-recordedbooks">
<div id="opac-user-recordedbooks" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-recordedbooks-tab">
</div>
<div id="opac-user-checkouts">
<div id="opac-user-checkouts" class="tab-pane active" role="tabpanel" aria-labelledby="opac-user-checkouts-tab">
[% IF ( issues_count ) %]
<form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
<legend class="sr-only">Renew selected</legend>
@ -272,7 +311,8 @@
<tbody>
[% FOREACH ISSUE IN ISSUES %]
[% IF ( ISSUE.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
[% IF ( JacketImages ) %]<td class="jacketcell">
[% IF ( JacketImages ) %]
<td class="jacketcell">
[% IF ( OPACAmazonCoverImages ) %]
[% IF ( ISSUE.normalized_isbn ) %]
<a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a>
@ -308,8 +348,8 @@
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
<img src="https://secure.syndetics.com/index.aspx?isbn=[% ISSUE.normalized_isbn | html %]/SC.GIF&amp;client=[% SyndeticsClientCode | html %]&amp;type=xw10&amp;upc=[% ISSUE.normalized_upc | html %]&amp;oclc=[% ISSUE.normalized_oclc | html %]" alt="" class="item-thumbnail" />
[% END %]
</td>[% END # / IF JacketImages %]
</td>
[% END # / IF JacketImages %]
<td class="title">
[% INCLUDE 'biblio-title.inc' biblio=ISSUE link=> 1 %]
@ -519,7 +559,7 @@
</div> <!-- / .opac-user-checkouts -->
[% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
<div id="opac-user-clubs">
<div id="opac-user-clubs" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-clubs-tab-link">
Loading...
</div>
[% END %]
@ -527,7 +567,7 @@
[% IF ( OPACFinesTab ) %]
<!-- FINES BOX -->
[% IF ( amountoutstanding > 0 ) %]
<div id="opac-user-fines">
<div id="opac-user-fines" class="tab-pane" id="home" role="tabpanel" aria-labelledby="opac-user-fines-tab">
<table class="table table-bordered table-striped">
<caption>Charges</caption>
<thead><tr><th colspan="2">Amount</th></tr></thead>
@ -542,7 +582,7 @@
[% END %]
[% IF ( amountoutstanding < 0 ) %]
<div id="opac-user-fines">
<div id="opac-user-fines" class="tab-pane" id="home" role="tabpanel" aria-labelledby="opac-user-fines-tab">
<table class="table table-bordered table-striped">
<caption>Credits</caption>
<thead><tr><th colspan="2">Amount</th></tr></thead>
@ -556,7 +596,7 @@
[% END %]
[% IF relatives_with_fines %]
<div id="opac-user-relative-fines">
<div id="opac-user-relative-fines" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-relative-fines-tab">
<table class="table table-bordered table-striped">
<caption>Fines and charges</caption>
<thead>
@ -578,7 +618,7 @@
[% END # / OPACFinesTab %]
[% IF relatives %]
<div id="opac-user-relative-issues">
<div id="opac-user-relative-issues" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-relative-issues-tab">
<table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
<caption class="sr-only">Relative issues</caption>
<thead>
@ -625,7 +665,7 @@
[% END %]
[% IF ( overdues_count ) %]
<div id="opac-user-overdues">
<div id="opac-user-overdues" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-overdues-tab">
<table id="overduest" class="table table-bordered table-striped">
<caption>Overdues <span class="count">([% overdues_count | html %] total)</span></caption>
<!-- OVERDUES TABLE ROWS -->
@ -734,9 +774,9 @@
<td>
<span class="tdlabel">Fines:</span>
[% IF ( OVERDUE.charges ) %]
Yes
<span>Yes</span>
[% ELSE %]
No
<span>No</span>
[% END %]
</td>
[% END %]
@ -750,7 +790,7 @@
[% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %]
[% IF Koha.Preference('UseRecalls') && RECALLS.count %]
<div id="opac-user-recalls">
<div id="opac-user-recalls" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-recalls-tab">
<table id="recalls-table" class="table table-bordered table-striped">
<caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
<thead>
@ -767,7 +807,8 @@
[% FOREACH RECALL IN RECALLS %]
<tr>
<td class="title">
[% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio link=> 1 %] [% IF RECALL.item_level %]<p class="hint">Item recalled: [% RECALL.item.barcode | html %]</p>[% END %]
[% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio link=> 1 %]
[% IF RECALL.item_level %]<p class="hint">Item recalled: [% RECALL.item.barcode | html %]</p>[% END %]
</td>
<td class="recalldate" data-order="[% RECALL.created_date | html %]">
<span title="[% RECALL.created_date | html %]">
@ -822,7 +863,7 @@
[% END # / # RECALLS.count %]
[% IF Koha.Preference('ArticleRequests') %]
<div id="opac-user-article-requests">
<div id="opac-user-article-requests" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-article-requests-tab">
[% IF current_article_requests.size %]
<table id="article-requests-table" class="table table-bordered table-striped">
<caption>Article requests <span class="count"></span></caption>
@ -847,6 +888,7 @@
</thead>
<tbody>
<tr>
[% FOREACH ar IN current_article_requests %]
<td class="article-request-record-title">
[% INCLUDE 'biblio-title.inc' biblio=ar.biblio link=> 1 %]
@ -918,8 +960,8 @@
<td class="article-request-cancel">
<button data-title="[% ar.biblio.title | html %] [% ar.item.enumchron | html %]" data-article-request_id="[% ar.id | html %]" class="btn btn-sm btn-danger btn-delete-article-request"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
</td>
</tr>
[% END %]
</tr>
</tbody>
</table>
[% ELSE %]
@ -930,7 +972,7 @@
[% END # IF current_article_requests.size %]
</div> <!-- / #opac-user-article-requests -->
[% END %]
</div> <!-- /.tab-content -->
</div> <!-- /#opac-user-views -->
</div> <!-- /#userdetails -->
</div> <!-- /.col-10 -->
@ -998,7 +1040,7 @@
}
$(document).ready(function(){
$('#opac-user-article-requests caption .count').html(AR_CAPTION_COUNT.format('[% current_article_requests_count | html %]'));
$('#opac-user-views').tabs();
$(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");
$(".btn-delete-hold").on("click", function(e){
@ -1313,7 +1355,7 @@
[% END %]
[% IF ( overdrive_tab ) %]
$("#opac-user-views").tabs("select", "#opac-user-overdrive");
$("#opac-user-views a[href='#opac-user-overdrive']").tab("show");
[% END %]
$("#opac-user-overdrive").each( function() {
@ -1330,7 +1372,7 @@
KOHA.RecordedBooks.display_error("#opac-user-recordedbooks", "[% recordedbooks_error.dquote | html %]");
[% END %]
[% IF ( recordedbooks_tab ) %]
$("#opac-user-views").tabs("select", "#opac-user-recordedbooks");
$("#opac-user-views a[href='#opac-user-recordedbooks']").tab("show");
[% END %]
$("#opac-user-recordedbooks").each( function() {
KOHA.RecordedBooks.display_account_details(this);