Attachment #137047 for bug #31040

View | Details | Raw Unified | Return to bug 31040
Collapse All | Expand All

Lines 272-278 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-1 / +1 lines)
272		272
273	[% IF Koha.Preference('RecordedBooksClientSecret') && Koha.Preference('RecordedBooksLibraryID') %]	273	[% IF Koha.Preference('RecordedBooksClientSecret') && Koha.Preference('RecordedBooksLibraryID') %]
274	<script>	274	<script>
275	var SPINNER_THROBBER = "[% interface \| html %]/lib/jquery/plugins/themes/classic/throbber.gif";	275	var SPINNER_THROBBER = "[% interface \| html %]/[% theme \| html %]/images/spinner-small.gif";
276	</script>	276	</script>
277	[% END %]	277	[% END %]
278		278

Lines 113-119 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt (-1 / +1 lines)
113	}	113	}
114		114
115	function search( offset ) {	115	function search( offset ) {
116	$( '#overdrive-status' ).html( _("Searching OverDrive...") + ' <img class="throbber" src="[% interface \| html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );	116	$( '#overdrive-status' ).html( _("Searching OverDrive...") + ' <img class="throbber" src="[% interface \| html %]/[% theme \| html %]/images/spinner-small.gif" /></span>' );
117		117
118	KOHA.OverDrive.Search( "[% Koha.Preference('OverDriveLibraryID') \| html %]", querystring, results_per_page, offset, function( data ) {	118	KOHA.OverDrive.Search( "[% Koha.Preference('OverDriveLibraryID') \| html %]", querystring, results_per_page, offset, function( data ) {
119	if ( data.error ) {	119	if ( data.error ) {

Lines 74-80 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt (-1 / +1 lines)
74	var results_per_page = [% OPACnumSearchResults \|\| 20 \| html %];	74	var results_per_page = [% OPACnumSearchResults \|\| 20 \| html %];
75		75
76	function search( page ) {	76	function search( page ) {
77	$( '#recordedbooks-status' ).html( MSG_SEARCHING.format("RecordedBooks") + ' <img class="throbber" src="[% interface \| html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );	77	$( '#recordedbooks-status' ).html( MSG_SEARCHING.format("RecordedBooks") + ' <img class="throbber" src="[% interface \| html %]/[% theme \| html %]/images/spinner-small.gif" /></span>' );
78		78
79	KOHA.RecordedBooks.search( querystring, results_per_page, page, function( data ) {	79	KOHA.RecordedBooks.search( querystring, results_per_page, page, function( data ) {
80	if ( data.error ) {	80	if ( data.error ) {




                    });
                [% END # /IF OpacHighlightedWords %]
                [% IF ( OverDriveEnabled ) %]
                    var $overdrive_results = $( '<div id="overdrive-results">' + MSG_SEARCHING.format('OverDrive') + ' <img class="throbber" src="[% interface | html %]/[% theme | html %]/images/spinner-small.gif" /></div>' );
                    $( '#numresults' ) .after( $overdrive_results );
                    //Clean querystring, first we remove CCL entities, then decode HTML entities, then swap double quotes for single quotes
                    //as the overdrive API treats double quotes as a search term and returns extra results

                    } );
                [% END # /IF OverDriveEnabled %]
                [% IF ( RecordedBooksEnabled ) %]
                    var $recordedbooks_results = $( '<div id="recordedbooks-results">' + MSG_SEARCHING.format('RecordedBooks') + ' <img class="throbber" src="[% interface | html %]/[% theme | html %]/images/spinner-small.gif" /></div>' );
                    $( '#numresults' ) .after( $recordedbooks_results );
                    KOHA.RecordedBooks.search( querystring, [% OPACnumSearchResults || "null" | html %], null, function( data ) {
                        if ( data.error ) {

                    } );
                [% END # /IF RecordedBooksEnabled %]
                [% IF ( OpenLibrarySearch ) %]
                    var $openlibrary_results = $( '<div id="openlibrary-results">' + MSG_SEARCHING.format('OpenLibrary' ) + ' <img class="throbber" src="[% interface | html %]/[% theme | html %]/images/spinner-small.gif" /></div>' );
                    $( '#numresults' ) .after( $openlibrary_results );
                    KOHA.OpenLibrary.search( querystring, null, function( data ) {
                        if ( data.error ) {

Lines 312-318 KOHA.RecordedBooks = new function() { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/js/recordedbooks.js (-2 / +1 lines)
312	$('<div id="action_'+isbn+'" class="actions-menu">')	312	$('<div id="action_'+isbn+'" class="actions-menu">')
313	.append(actions)	313	.append(actions)
314	.appendTo(el);	314	.appendTo(el);
315	$("#action_"+isbn).before('<span id="waiting_'+isbn+'" style="display:none;"><img class="throbber" src="/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif" /></span>');	315	$("#action_"+isbn).before('<span id="waiting_'+isbn+'" style="display:none;"><img class="throbber" src="' + SPINNER_THROBBER + '" /></span>');
316	};	316	};
317		317
318	this.search = function( q, page_size, page, callback ) {	318	this.search = function( q, page_size, page, callback ) {
319	-

Return to bug 31040

Lines 812-818 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-3 / +3 lines)
812	});	812	});
813	[% END # /IF OpacHighlightedWords %]	813	[% END # /IF OpacHighlightedWords %]
814	[% IF ( OverDriveEnabled ) %]	814	[% IF ( OverDriveEnabled ) %]
815	var $overdrive_results = $( '<div id="overdrive-results">' + MSG_SEARCHING.format('OverDrive') + ' <img class="throbber" src="[% interface \| html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></div>' );	815	var $overdrive_results = $( '<div id="overdrive-results">' + MSG_SEARCHING.format('OverDrive') + ' <img class="throbber" src="[% interface \| html %]/[% theme \| html %]/images/spinner-small.gif" /></div>' );
816	$( '#numresults' ) .after( $overdrive_results );	816	$( '#numresults' ) .after( $overdrive_results );
817	//Clean querystring, first we remove CCL entities, then decode HTML entities, then swap double quotes for single quotes	817	//Clean querystring, first we remove CCL entities, then decode HTML entities, then swap double quotes for single quotes
818	//as the overdrive API treats double quotes as a search term and returns extra results	818	//as the overdrive API treats double quotes as a search term and returns extra results
Lines 833-839 Link Here
833	} );	833	} );
834	[% END # /IF OverDriveEnabled %]	834	[% END # /IF OverDriveEnabled %]
835	[% IF ( RecordedBooksEnabled ) %]	835	[% IF ( RecordedBooksEnabled ) %]
836	var $recordedbooks_results = $( '<div id="recordedbooks-results">' + MSG_SEARCHING.format('RecordedBooks') + ' <img class="throbber" src="[% interface \| html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></div>' );	836	var $recordedbooks_results = $( '<div id="recordedbooks-results">' + MSG_SEARCHING.format('RecordedBooks') + ' <img class="throbber" src="[% interface \| html %]/[% theme \| html %]/images/spinner-small.gif" /></div>' );
837	$( '#numresults' ) .after( $recordedbooks_results );	837	$( '#numresults' ) .after( $recordedbooks_results );
838	KOHA.RecordedBooks.search( querystring, [% OPACnumSearchResults \|\| "null" \| html %], null, function( data ) {	838	KOHA.RecordedBooks.search( querystring, [% OPACnumSearchResults \|\| "null" \| html %], null, function( data ) {
839	if ( data.error ) {	839	if ( data.error ) {
Lines 850-856 Link Here
850	} );	850	} );
851	[% END # /IF RecordedBooksEnabled %]	851	[% END # /IF RecordedBooksEnabled %]
852	[% IF ( OpenLibrarySearch ) %]	852	[% IF ( OpenLibrarySearch ) %]
853	var $openlibrary_results = $( '<div id="openlibrary-results">' + MSG_SEARCHING.format('OpenLibrary' ) + ' <img class="throbber" src="[% interface \| html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></div>' );	853	var $openlibrary_results = $( '<div id="openlibrary-results">' + MSG_SEARCHING.format('OpenLibrary' ) + ' <img class="throbber" src="[% interface \| html %]/[% theme \| html %]/images/spinner-small.gif" /></div>' );
854	$( '#numresults' ) .after( $openlibrary_results );	854	$( '#numresults' ) .after( $openlibrary_results );
855	KOHA.OpenLibrary.search( querystring, null, function( data ) {	855	KOHA.OpenLibrary.search( querystring, null, function( data ) {
856	if ( data.error ) {	856	if ( data.error ) {