Merge branch 'bug_9554' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-19 21:02:01 -04:00
commit 01cfb6218b
3 changed files with 17 additions and 13 deletions

View File

@ -17,7 +17,7 @@ var q_array = new Array(); // will hold the search terms, if possible
$(document).ready(function(){
[% IF ( OpacHighlightedWords ) %]
$('a.title').each(function() {
$(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]');
$(this).attr("href", $(this).attr("href") + "&query_desc=[% query_desc | uri %]");
});
[% END %]

View File

@ -105,7 +105,7 @@ function highlightOn() {
$(document).ready(function(){
[% IF ( OpacHighlightedWords ) %]
$('a.title').each(function() {
$(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]');
$(this).attr("href", $(this).attr("href") + "&query_desc=[% query_desc | uri %]");
});
[% END %]
@ -303,12 +303,16 @@ $(document).ready(function(){
[% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
$('#didyoumean').load('/cgi-bin/koha/svc/suggestion?render=stub&q=[% querystring | uri %]',
[% IF ( DidYouMean ) %]
$("#didyoumean").load("/cgi-bin/koha/svc/suggestion?render=stub&q=[% querystring |uri %]",
function() {
$('.searchsuggestion').parent().parent().css({
'border-color': '#F4ECBE',
'background-color': '#FFFBEA'});
} );
$(".searchsuggestion").parent().parent().css({
"border-color": "#F4ECBE",
"background-color": "#FFFBEA"
});
});
[% END %]
});
//]]>
@ -325,7 +329,7 @@ $(document).ready(function(){
<div class="yui-b">
<div id="userresults" class="container">
[% IF ( DidYouMean ) %]
<div id='didyoumean'>Not what you expected? Check for <a href='/cgi-bin/koha/svc/suggestion?render=standalone&amp;q=[% querystring | uri %]'>suggestions</a></div>
<div id="didyoumean">Not what you expected? Check for <a href="/cgi-bin/koha/svc/suggestion?render=standalone&amp;q=[% querystring |uri %]">suggestions</a></div>
[% END %]
<div id="top-pages">[% INCLUDE 'page-numbers.inc' %]</div>
[% IF ( koha_spsuggest ) %]
@ -607,8 +611,8 @@ $(document).ready(function(){
[% END %]
[% END %]
<input type="hidden" name='biblionumber' value="[% SEARCH_RESULT.biblionumber %]" />
<input type="hidden" name='loggedinuser' value="[% loggedinuser %]" />
<input type="hidden" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" />
<input type="hidden" name="loggedinuser" value="[% loggedinuser %]" />
[% IF ( SEARCH_RESULT.rating_total ) > 0 %]
<span id="rating_total_[% SEARCH_RESULT.biblionumber %]">&nbsp;&nbsp;([% SEARCH_RESULT.rating_total %] votes)</span>

View File

@ -14,13 +14,13 @@
[% END %]
[% IF suggestions && suggestions.size %]
<div>
<span class='suggestionlabel'>Did you mean:</span>
<span class="suggestionlabel">Did you mean:</span>
[% FOREACH suggestion IN suggestions %]
<span class='searchsuggestion'><a href='/cgi-bin/koha/opac-search.pl?q=[% suggestion.search | uri %]'>[% suggestion.label %]</a></span>
<span class="searchsuggestion"><a href="/cgi-bin/koha/opac-search.pl?q=[% suggestion.search |uri %]">[% suggestion.label |html %]</a></span>
[% END %]
</div>
[% ELSE %]
<span class='nosuggestions'>Sorry, no suggestions.</span>
<span class="nosuggestions">Sorry, no suggestions.</span>
[% END %]
[% IF (render=='standalone') %]
</div>