Skip to content

Commit 8c2f534

Browse files
amitebscoamitebsco
authored
Merge pull request #103 from ebsco/20.11
20.11
2 parents adf930b + ab743b7 commit 8c2f534

15 files changed

Lines changed: 1079 additions & 1816 deletions

‎Koha/Plugin/EDS.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ my ($PluginDir) = grep { -f $_ . "/Koha/Plugin/EDS.pm" } @pluginsdir;
2929
$PluginDir = $PluginDir.'/Koha/Plugin/EDS';
3030

3131
################# DO NOT TOUCH - CONTROLLED BY build.py
32-
our $MAJOR_VERSION = "20.05";
33-
our $SUB_VERSION = "003";
32+
our $MAJOR_VERSION = "20.11";
33+
our $SUB_VERSION = "007";
3434
our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
3535
our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
36-
our $DATE_UPDATE = '2021-05-11';
36+
our $DATE_UPDATE = '2021-06-11';
3737
######################################################
3838

3939
## Here is our metadata, some keys are required, some are optional

‎Koha/Plugin/EDS/admin/release_notes.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- DO NOT TOUCH THIS FILE - controlled by build.py -->
33
<kohaplugin>
4-
<latestversion>20.05.003</latestversion>
4+
<latestversion>20.11.007</latestversion>
55
<download>https://github.com/ebsco/edsapi-koha-plugin</download>
6-
<lastupdated>2021/05/11</lastupdated>
6+
<lastupdated>2021/06/11</lastupdated>
77
<releasenotes>
8-
<release version="20.05.003" date="2021/05/11">
9-
<note id="1" author="mabrahamson@ebsco.com">Addresses issues with dropdown being delayed in opening.</note>
8+
<release version="20.11.007" date="2021/06/11">
9+
<note id="1" author="agupta@ebsco.com">Addresses issues with Koha 20.11. Removed EDSScript.js file.</note>
1010
</release>
1111
</releasenotes>
12-
</kohaplugin>
12+
</kohaplugin>

‎Koha/Plugin/EDS/bootstrap/includes/eds-facets.inc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="search-facets">
2-
<h4><a href="#" class="menu-collapse-toggle">[% EDSLANG.eds_facets_INC_refine_search %]</a></h4>
3-
<ul class="menu-collapse">
2+
<h2><a href="#" class="menu-collapse-toggle">[% EDSLANG.eds_facets_INC_refine_search %]</a></h2>
3+
<ul class="menu-collapse">
44
<li id="availability_facet">
55
[% EDSLANG.eds_facets_INC_current_search %]
66

@@ -104,4 +104,4 @@
104104
<div id="opacresultssidebar">
105105
[% OPACResultsSidebar %]
106106
</div>
107-
[% END %]
107+
[% END %]

‎Koha/Plugin/EDS/bootstrap/includes/eds-page-numbers.inc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1+
[% USE raw %]
12
[% IF total %]
23
[% IF ( PAGE_NUMBERS ) %]
4+
<nav class="pagination pagination-sm noprint" aria-label="Search results pagination">
35
[% PAGE_NUMBERS.PageCounter = PAGE_NUMBERS.MinPageNo %]
4-
<div class="pagination pagination-small">
5-
<ul>
6+
<ul class="pagination">
67
[% IF ( PAGE_NUMBERS.PagePrevious ) %]
7-
<li><a href="?q=Search?[%PAGE_NUMBERS.URL%]|pagenumber=[%PAGE_NUMBERS.PagePrevious%]">&lt;&lt; [% EDSLANG.eds_page_numbers_INC_previous %]</a></li>
8+
<li class="page-item"><a class="page-link" href="?q=Search?[%PAGE_NUMBERS.URL%]|pagenumber=[%PAGE_NUMBERS.PagePrevious%]"><i class="fa fa-fw fa-angle-left" aria-hidden="true"></i>[% EDSLANG.eds_page_numbers_INC_previous %]</a></li>
89
[% END %]
910
[% WHILE PAGE_NUMBERS.PageCounter <= PAGE_NUMBERS.MaxPageNo %]
1011
[% IF ( PAGE_NUMBERS.PageCounter == PAGE_NUMBERS.PageNumber ) %]
11-
<li class="active"><a href="#">[% PAGE_NUMBERS.PageNumber %]</a></li>
12+
<li class="active"><a class="page-link" href="#">[% PAGE_NUMBERS.PageNumber %]</a></li>
1213
[% ELSE %]
13-
<li><a href="?q=Search?[%PAGE_NUMBERS.URL%]|pagenumber=[%PAGE_NUMBERS.PageCounter%]">[% PAGE_NUMBERS.PageCounter %]</a></li>
14+
<li class="page-item"><a class="page-link" href="?q=Search?[%PAGE_NUMBERS.URL%]|pagenumber=[%PAGE_NUMBERS.PageCounter%]">[% PAGE_NUMBERS.PageCounter %]</a></li>
1415
[% END %]
1516
[% PAGE_NUMBERS.PageCounter = PAGE_NUMBERS.PageCounter+1 %]
1617
[% END %]
1718
[% IF ( PAGE_NUMBERS.PageNext ) %]
18-
<li> <a href="?q=Search?[%PAGE_NUMBERS.URL%]|pagenumber=[%PAGE_NUMBERS.PageNext%]">[% EDSLANG.eds_page_numbers_INC_next %] &gt;&gt;</a></li>
19+
<li class="page-item"> <a class="page-link" href="?q=Search?[%PAGE_NUMBERS.URL%]|pagenumber=[%PAGE_NUMBERS.PageNext%]">[% EDSLANG.eds_page_numbers_INC_next %] <i class="fa fa-fw fa-angle-double-right" aria-hidden="true"></i></a></li>
1920
[% END %]
2021
</ul>
21-
</div>
22+
</nav>
2223
[% END %]
23-
[% END %]
24+
[% END %]

‎Koha/Plugin/EDS/bootstrap/modules/eds-advsearch.tt‎

Lines changed: 208 additions & 154 deletions
Large diffs are not rendered by default.

‎Koha/Plugin/EDS/bootstrap/modules/eds-detail.tt‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,21 @@
4343
[% INCLUDE 'masthead.inc' %]
4444

4545
<div class="main">
46-
<ul class="breadcrumb">
47-
<li><a href="/cgi-bin/koha/opac-main.pl">[% EDSLANG.home_breadcrumb %]</a> <span class="divider">&rsaquo;</span></li>
48-
<li><a href="#">[% EDSLANG.eds_detail_TT_details_for %] [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]</a></li>
49-
</ul>
46+
<nav aria-label="breadcrumb">
47+
<ul class="breadcrumb">
48+
<li class="breadcrumb-item">
49+
<a href="/cgi-bin/koha/opac-main.pl">[% EDSLANG.home_breadcrumb %]</a>
50+
</li>
51+
<li class="breadcrumb-item" aria-current="page">
52+
<a href="#">[% EDSLANG.eds_detail_TT_details_for %] [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %]</a>
53+
</li>
54+
</ul>
55+
</nav>
56+
5057

5158
<div class="container-fluid">
52-
<div class="row-fluid">
53-
<div class="span9">
59+
<div class="row">
60+
<div class="col-lg-9">
5461
<div id="catalogue_detail_biblio" class="maincontent">
5562

5663

@@ -61,9 +68,11 @@
6168
[% END %]
6269

6370
<div id="views">
64-
<span class="view"><span id="Normalview">[% EDSLANG.eds_detail_TT_normal_view %]</span></span>
65-
<span style="display:none;" class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber %]">MARC view</a></span>
66-
[% IF ( ISBD ) %]<span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblionumber %]">ISBD view</a></span>[% END %]
71+
<span class="view current-view"><span id="Normalview"><i class="fa fa-file-text-o" aria-hidden="true"></i> [% EDSLANG.eds_detail_TT_normal_view %]</span></span>
72+
<span style="display:none;" class="view"><a id="MARCview" class="btn btn-link" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblio.biblionumber | html %]"><i class="fa fa-list-alt" aria-hidden="true"></i> MARC view</a></span>
73+
[% IF ( ISBD ) %]
74+
<span class="view"><a id="ISBDview" class="btn btn-link" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% biblio.biblionumber | html %]"><i class="fa fa-list-ul" aria-hidden="true"></i> ISBD view</a></span>
75+
[% END %]
6776
</div>
6877
[% IF ( OPACXSLTDetailsDisplay ) %]
6978
[% XSLTBloc %]
@@ -529,7 +538,7 @@
529538

530539

531540

532-
<p>[% INCLUDE "$plugin_dir/includes/eds-detail_customlinks.inc" %]</p>
541+
<p>[% INCLUDE "$plugin_dir/includes/eds-detail_customlinks.inc" %]</p>
533542

534543
<ul style="display:none;">
535544
[% IF ( defaulttab == 'holdings' ) %]

0 commit comments

Comments
 (0)