Skip to content

Commit 6cd484b

Browse files
mmabrahamsonmmabrahamson
authored
Merge pull request #114 from ebsco/research-starter-fix-2105
Corrects issues with Research Starter display
2 parents 39056cc + c434db9 commit 6cd484b

6 files changed

Lines changed: 58 additions & 116 deletions

File tree

‎Koha/Plugin/EDS.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
3131

3232
################# DO NOT TOUCH - CONTROLLED BY build.py
3333
our $MAJOR_VERSION = "21.05";
34-
our $SUB_VERSION = "002";
34+
our $SUB_VERSION = "003";
3535
our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
3636
our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
37-
our $DATE_UPDATE = '2021-10-12';
37+
our $DATE_UPDATE = '2022-02-21';
3838
######################################################
3939

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

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

Lines changed: 4 additions & 4 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>21.05.002</latestversion>
4+
<latestversion>21.05.003</latestversion>
55
<download>https://github.com/ebsco/edsapi-koha-plugin</download>
6-
<lastupdated>2021/10/12</lastupdated>
6+
<lastupdated>2022/02/21</lastupdated>
77
<releasenotes>
8-
<release version="21.05.002" date="2021/10/12">
9-
<note id="1" author="mabrahamson@ebsco.com">Fixes issues with link generation.</note>
8+
<release version="21.05.003" date="2022/02/21">
9+
<note id="1" author="mabrahamson@ebsco.com">Fixes issues with Research Starter Display.</note>
1010
</release>
1111
</releasenotes>
1212
</kohaplugin>

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

Lines changed: 49 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,56 @@
11
[% IF researchstarters.size %]
2-
<script>
3-
var researchStartersInc='';
4-
// <!-- Indicators -->\
5-
// <ol class="carousel-indicators">\
6-
// <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>\
7-
// <li data-target="#carousel-example-generic" data-slide-to="1"></li>\
8-
// <li data-target="#carousel-example-generic" data-slide-to="2"></li>\
9-
// </ol>\
10-
11-
researchStartersInc +='<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">\
12-
<ol class="carousel-indicators">\
13-
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>\
14-
';
15-
// [% rsitemscount=1 %]
16-
// [% WHILE rsitemscount < researchstarters.0.Records.size %]
17-
researchStartersInc +='<li data-target="#carousel-example-generic" data-slide-to="[% rsitemscount %]"></li>';
18-
// [% rsitemscount = rsitemscount+1 %]
19-
// [% END %]
20-
21-
researchStartersInc+=' </ol>\
22-
<!-- Wrapper for slides -->\
23-
<div class="carousel-inner" role="listbox">\
24-
';
25-
// [% rsitemdata = '' %]
26-
// [% rsitemtitle = '' %]
27-
// [% FOR researchStarter IN researchstarters.0.Records %]
28-
29-
// [% rsactive = '' %]
30-
// [% rsheading = 'Related' %]
31-
// [% IF researchStarter.ResultId==1 %]
32-
// [% rsactive = 'active' %]
33-
// [% rsheading = 'Research Starter' %]
34-
// [% END %]
2+
[% rsitemdata = '' %]
3+
[% rsitemtitle = '' %]
4+
[% researchStarter = researchstarters.0.Records.0 %]
5+
[% rsactive = '' %]
6+
[% rsheading = 'Related' %]
7+
[% IF researchStarter.ResultId==1 %]
8+
[% rsactive = 'active' %]
9+
[% rsheading = 'Research Starter' %]
10+
[% END %]
11+
[% rsImage = researchStarter.ImageInfo.0.Target %]
12+
[% FOR rsItem IN researchStarter.Items %]
13+
14+
[% IF rsItem.Group == 'Ab' %]
15+
[% rsitemdata = rsItem.Data %]
16+
[% END %]
17+
18+
[% IF rsItem.Label == 'Title' %]
19+
[% rsitemtitle = rsItem.Data %]
20+
[% END %]
21+
22+
[% IF rsItem.Group == 'Src' %]
23+
[% rsitemsrc = rsItem.Data %]
24+
[% END %]
25+
[% END %]
26+
27+
[% IF rsitemtitle == '' %]
28+
[% rsitemtitle = 'Login to gain access to this result.' %]
29+
[% END %]
30+
31+
<script>
32+
var researchStartersInc='';
33+
researchStartersInc+='<div class="item empcontainer" style="min-height:175px">\
34+
<div class="span1">\</div>\
35+
<div class="span10">\
36+
<img style="height:130px;float:left;margin-right:10px;" src="[% rsImage %]">\
37+
<h4><a href="/plugin/Koha/Plugin/EDS/opac/eds-detail.pl?q=Retrieve?an=[% researchStarter.Header.An %]|dbid=[%researchStarter.Header.DbId%]&resultid=1&fulltext=html" target="_blank">[% rsheading %]: [% rsitemtitle %]</a></h4>\
38+
<small> [% rsitemdata %]</small> <a href="/plugin/Koha/Plugin/EDS/opac/eds-detail.pl?q=Retrieve?an=[% researchStarter.Header.An %]|dbid=[%researchStarter.Header.DbId%]&resultid=1&fulltext=html" target="_blank">[% EDSLANG.eds_researchstarters_INC_more %]</a>\
39+
<sub>[% rsitemsrc %]</sub>\
40+
</div>\
41+
<div class="span1">\</div>\
42+
</div>';
43+
3544

36-
// [% rsImage = researchStarter.ImageInfo.0.Target %]
45+
</script>
3746

38-
researchStartersInc+='<div class="item [% rsactive %]">';
39-
// [% FOR rsItem IN researchStarter.Items %]
4047

41-
// [% IF rsItem.Group == 'Ab' %]
42-
// [% rsitemdata = rsItem.Data %]
43-
// [% END %]
48+
<div class="placardtab" style="display:none;"><div><div id="research-starters" width="100%" data-heading="[% researchstarters.0.Label %]"></div></div></div>
49+
<script>
4450

45-
// [% IF rsItem.Label == 'Title' %]
46-
// [% rsitemtitle = rsItem.Data %]
47-
// [% END %]
51+
var rsTrackJQuery = setInterval(function(){try{PlacardTabs('research-starters');clearInterval(rsTrackJQuery);
52+
jQuery('#research-starters').html(researchStartersInc);
53+
}catch (err) {}}, 10);
4854

49-
// [% IF rsItem.Group == 'Src' %]
50-
// [% rsitemsrc = rsItem.Data %]
51-
// [% END %]
52-
// [% END %]
53-
// [% IF rsitemtitle == '' %]
54-
// [% rsitemtitle = 'Login to gain access to this result.' %]
55-
// [% END %]
56-
researchStartersInc+=' <div class="slidecontainer row">\
57-
<div class="span1">\</div>\
58-
<div class="span10">\
59-
<img style="height:130px;float:left;margin-right:10px;" src="[% rsImage %]">\
60-
<h4><a href="/plugin/Koha/Plugin/EDS/opac/eds-detail.pl?q=Retrieve?an=[% researchStarter.Header.An %]|dbid=[%researchStarter.Header.DbId%]&resultid=1&fulltext=html" target="_blank">[% rsheading %]: [% rsitemtitle %]</a></h4>\
61-
<small> [% rsitemdata %]</small> <a href="/plugin/Koha/Plugin/EDS/opac/eds-detail.pl?q=Retrieve?an=[% researchStarter.Header.An %]|dbid=[%researchStarter.Header.DbId%]&resultid=1&fulltext=html" target="_blank">[% EDSLANG.eds_researchstarters_INC_more %]</a>\
62-
<sub>[% rsitemsrc %]</sub>\
63-
</div>\
64-
<div class="span1">\</div>\
65-
</div>';
66-
//researchStartersInc+=' <div class="carousel-caption"> </div>';
67-
researchStartersInc+='</div>';
68-
// [% END %]
69-
70-
71-
72-
researchStartersInc+=' </div>\
73-
<!-- Controls -->\
74-
<a class="left carousel-control" role="button" href="javascript:void(0)" onClick="$(\'.carousel\').carousel(\'prev\')" data-slide="prev">\
75-
&lsaquo;</a>\
76-
<a class="right carousel-control" role="button" href="javascript:void(0)" onClick="$(\'.carousel\').carousel(\'next\')" data-slide="next">\
77-
&rsaquo;</a>\
78-
</div>\
79-
<style>\
80-
.carousel-control.left, .carousel-control.right{ \
81-
background-image: none !important; \
82-
filter: progid:none !important; \
83-
color:#444!important;\
84-
}\
85-
.slidecontainer{\
86-
border: 1px solid #ccc;\
87-
padding:15px;\
88-
margin-left:0px;\
89-
}\
90-
.carousel-indicators li{\
91-
border: 1px solid #999 !important;\
92-
}\
93-
.carousel-indicators .active{\
94-
background-color: #ccc !important;\
95-
}\
96-
.carousel-indicators{\
97-
bottom:inherit!important;\
98-
margin-top:5px;\
99-
}\
100-
</style>\
101-
';
102-
103-
</script>
104-
105-
106-
<div class="placardtab" style="display:none;"><div><div id="research-starters" width="100%" data-heading="[% researchstarters.0.Label %]"></div></div></div>
107-
<script>
108-
109-
var rsTrackJQuery = setInterval(function(){try{PlacardTabs('research-starters');clearInterval(rsTrackJQuery);
110-
jQuery('#research-starters').html(researchStartersInc);
111-
}catch (err) {}}, 10);
112-
113-
</script>
55+
</script>
11456
[% END %]

‎Koha/Plugin/EDS/js/EDSScript.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ edsConfig.pluginhttppath = "[% PLUGIN_HTTP_PATH %]";
4141
var searchBlockCount = 3;
4242

4343
// DO NOT TOUCH - controlled by build.py
44-
var versionEDSKoha = "21.05002";
44+
var versionEDSKoha = "21.05003";
4545
///////////////////////////////////////
4646

4747
if (document.title == "") {

eds_plugin_21.05002.kpz renamed to eds_plugin_21.05003.kpz

303 KB
Binary file not shown.

‎version.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"MajorVersion": "21.05",
3-
"MinorVersion": "002",
3+
"MinorVersion": "003",
44
"ReleaseNotes": [
55
{
66
"author": "mabrahamson@ebsco.com",
7-
"note": "Fixes issues with link generation."
7+
"note": "Fixes issues with Research Starter Display."
88
}
99
],
1010
"ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"

0 commit comments

Comments
 (0)