Attachment #37410 for bug #9580

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

Lines 86-93 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +2 lines)
86	('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),	86	('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
87	('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),	87	('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
88	('CircControl','ItemHomeLibrary','PickupLibrary\|PatronLibrary\|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),	88	('CircControl','ItemHomeLibrary','PickupLibrary\|PatronLibrary\|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
		89	('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
89	('CoceHost', NULL, NULL, 'Coce server URL', 'Free'),	90	('CoceHost', NULL, NULL, 'Coce server URL', 'Free'),
90	('CoceProviders', NULL, NULL, 'Coce providers, for example aws,gb', 'Free'),	91	('CoceProviders', NULL, 'aws,gb,ol', 'Coce providers', 'multiple'),
91	('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page. NOTE: this can slow down search response time significantly','YesNo'),	92	('COinSinOPACResults','1','','If ON, use COinS in OPAC search results page. NOTE: this can slow down search response time significantly','YesNo'),
92	('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),	93	('ConfirmFutureHolds','0','','Number of days for confirming future holds','Integer'),
93	('CurrencyFormat','US','US\|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\' in \'FR\' or \'360,000.00\' in \'US\'.','Choice'),	94	('CurrencyFormat','US','US\|FR','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\' in \'FR\' or \'360,000.00\' in \'US\'.','Choice'),




if ( CheckVersion($DBversion) ) {
    $dbh->do(q{
        INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
        VALUES('Coce','0', 'If on, enables cover retrieval from the configured Coce server', NULL, 'YesNo')
    });
    $dbh->do(q{
        INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
        VALUES('CoceHost', NULL, 'Coce server URL', NULL,'Free')
    });
    $dbh->do(q{
        INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
        VALUES('CoceProviders', NULL, 'Coce providers', 'aws,gb,ol', 'multiple')
    });
    print "Upgrade to $DBversion done (Bug 9580: Cover image from Coce, a remote image URL cache)\n";
    SetVersion($DBversion);
}


Lines 339-348 Enhanced Content: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref (-2 / +11 lines)
339	- .	339	- .
340	Coce Cover images cache:	340	Coce Cover images cache:
341	-	341	-
		342	- pref: Coce
		343	choices:
		344	yes: Enable
		345	no: "Don't enable"
		346	- a Coce image cache service.
		347	-
342	- Coce server URL	348	- Coce server URL
343	- pref: CoceHost	349	- pref: CoceHost
344	class: url	350	class: url
345	-	351	-
346	- Providers	352	- Use the following providers to fetch the covers
347	- pref: CoceProviders	353	- pref: CoceProviders
348	- 'separated by comma, for example: aws,gb. Leave empty not to activate this service.'	354	multiple:
		355	aws: Amazon Web Services
		356	gb: Google Books
		357	ol: Open Library

Lines 165-171 $.widget.bridge('uitooltip', $.ui.tooltip); Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc (-1 / +1 lines)
165	//]]>	165	//]]>
166	</script>	166	</script>
167	[% END %]	167	[% END %]
168	[% IF Koha.Preference('CoceProviders') %]	168	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
169	<script type="text/javascript" src="[% interface %]/[% theme %]/js/coce.js"></script>	169	<script type="text/javascript" src="[% interface %]/[% theme %]/js/coce.js"></script>
170	<script type="text/javascript">	170	<script type="text/javascript">
171	//<![CDATA[	171	//<![CDATA[

Lines 53-59 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc (-1 / +1 lines)
53	<span class="no-image">No cover image available</span>	53	<span class="no-image">No cover image available</span>
54	[% END %]	54	[% END %]
55	[% END %]	55	[% END %]
56	[% IF ( Koha.Preference('CoceProviders') ) %]	56	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
57	[% coce_id = item.browser_normalized_ean \|\| item.browser_normalized_isbn %]	57	[% coce_id = item.browser_normalized_ean \|\| item.browser_normalized_isbn %]
58	<div title="[% item.biblionumber \|url %]" class="[% coce_id %]" id="coce-thumbnail-preview-[% coce_id %]"></div>	58	<div title="[% item.biblionumber \|url %]" class="[% coce_id %]" id="coce-thumbnail-preview-[% coce_id %]"></div>
59	[% END %]	59	[% END %]




                    [% IF ( GoogleJackets ) %]
                        <div title="[% biblionumber |url %]" class="[% normalized_isbn %]" id="gbs-thumbnail-preview"></div>
                    [% END %]
                    [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
                      [% coce_id = normalized_ean || normalized_isbn %]
                      <div style="block" title="[% biblionumber |url %]" class="[% coce_id %]" id="coce-thumbnail-preview"></div>
                    [% END %]

    [% IF ( GoogleJackets ) %]
        KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
    [% END %]
    [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
        KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);
    [% END %]


                    [% IF ( GoogleJackets ) %]
                      KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
                    [% END %]
                    [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
                      KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);
                    [% END %]
                    [% IF OpenLibraryCovers %]

                    [% IF ( GoogleJackets ) %]
                      KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
                    [% END %]
                    [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
                      KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);
                    [% END %]
                    [% IF OpenLibraryCovers %]

Lines 257-263 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-3 / +4 lines)
257	[% END %]	257	[% END %]
258	[% END %]	258	[% END %]
259		259
260	[% IF ( Koha.Preference('CoceProviders') ) %]	260	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
261	[% coce_id = SEARCH_RESULT.normalized_ean \|\| SEARCH_RESULT.normalized_isbn %]	261	[% coce_id = SEARCH_RESULT.normalized_ean \|\| SEARCH_RESULT.normalized_isbn %]
262	[% IF ( coce_id ) %]	262	[% IF ( coce_id ) %]
263	<span style="block" title="[% SEARCH_RESULT.biblionumber \|url %]" class="[% coce_id %]" id="coce-thumbnail[% loop.count %]"></span>	263	<span style="block" title="[% SEARCH_RESULT.biblionumber \|url %]" class="[% coce_id %]" id="coce-thumbnail[% loop.count %]"></span>
Lines 913-919 $(document).ready(function(){ Link Here
913	[% IF OpenLibraryCovers %]KOHA.OpenLibrary.GetCoverFromIsbn();[% END %]	913	[% IF OpenLibraryCovers %]KOHA.OpenLibrary.GetCoverFromIsbn();[% END %]
914	[% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]	914	[% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %]
915	[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]	915	[% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %]
916	[% IF ( Koha.Preference('CoceProviders') ) %]KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]');[% END %]	916	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
		917	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]');
		918	[% END %]
917		919
918	[% IF ( DidYouMean ) %]	920	[% IF ( DidYouMean ) %]
919	$("#didyoumean").load("/cgi-bin/koha/svc/suggestion?render=stub&q=[% querystring \|uri %]",	921	$("#didyoumean").load("/cgi-bin/koha/svc/suggestion?render=stub&q=[% querystring \|uri %]",
920	-

Return to bug 9580

Lines 9958-9970 $DBversion = "3.19.00.XXX"; Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-2 / +6 lines)
9958	if ( CheckVersion($DBversion) ) {	9958	if ( CheckVersion($DBversion) ) {
9959	$dbh->do(q{	9959	$dbh->do(q{
9960	INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)	9960	INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
		9961	VALUES('Coce','0', 'If on, enables cover retrieval from the configured Coce server', NULL, 'YesNo')
		9962	});
		9963	$dbh->do(q{
		9964	INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
9961	VALUES('CoceHost', NULL, 'Coce server URL', NULL,'Free')	9965	VALUES('CoceHost', NULL, 'Coce server URL', NULL,'Free')
9962	});	9966	});
9963	$dbh->do(q{	9967	$dbh->do(q{
9964	INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)	9968	INSERT IGNORE INTO systempreferences (variable, value, explanation, options, type)
9965	VALUES('CoceProviders', NULL, 'Coce Providers, for example: aws,gb', NULL,'Free')	9969	VALUES('CoceProviders', NULL, 'Coce providers', 'aws,gb,ol', 'multiple')
9966	});	9970	});
9967	print "Upgrade to $DBversion done (Bug 9580 - Cover image from Coce, a remote image URL cache)\n";	9971	print "Upgrade to $DBversion done (Bug 9580: Cover image from Coce, a remote image URL cache)\n";
9968	SetVersion($DBversion);	9972	SetVersion($DBversion);
9969	}	9973	}
9970		9974

Lines 79-85 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-4 / +4 lines)
79	[% IF ( GoogleJackets ) %]	79	[% IF ( GoogleJackets ) %]
80	<div title="[% biblionumber \|url %]" class="[% normalized_isbn %]" id="gbs-thumbnail-preview"></div>	80	<div title="[% biblionumber \|url %]" class="[% normalized_isbn %]" id="gbs-thumbnail-preview"></div>
81	[% END %]	81	[% END %]
82	[% IF ( Koha.Preference('CoceProviders') ) %]	82	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
83	[% coce_id = normalized_ean \|\| normalized_isbn %]	83	[% coce_id = normalized_ean \|\| normalized_isbn %]
84	<div style="block" title="[% biblionumber \|url %]" class="[% coce_id %]" id="coce-thumbnail-preview"></div>	84	<div style="block" title="[% biblionumber \|url %]" class="[% coce_id %]" id="coce-thumbnail-preview"></div>
85	[% END %]	85	[% END %]
Lines 1445-1451 Link Here
1445	[% IF ( GoogleJackets ) %]	1445	[% IF ( GoogleJackets ) %]
1446	KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);	1446	KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
1447	[% END %]	1447	[% END %]
1448	[% IF ( Koha.Preference('CoceProviders') ) %]	1448	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
1449	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);	1449	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);
1450	[% END %]	1450	[% END %]
1451		1451
Lines 1506-1512 Link Here
1506	[% IF ( GoogleJackets ) %]	1506	[% IF ( GoogleJackets ) %]
1507	KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);	1507	KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
1508	[% END %]	1508	[% END %]
1509	[% IF ( Koha.Preference('CoceProviders') ) %]	1509	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
1510	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);	1510	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);
1511	[% END %]	1511	[% END %]
1512	[% IF OpenLibraryCovers %]	1512	[% IF OpenLibraryCovers %]
Lines 1532-1538 Link Here
1532	[% IF ( GoogleJackets ) %]	1532	[% IF ( GoogleJackets ) %]
1533	KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);	1533	KOHA.Google.GetCoverFromIsbn([% covernewwindow %]);
1534	[% END %]	1534	[% END %]
1535	[% IF ( Koha.Preference('CoceProviders') ) %]	1535	[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
1536	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);	1536	KOHA.coce.getURL('[% Koha.Preference('CoceHost') %]', '[% Koha.Preference('CoceProviders') %]',[% covernewwindow %]);
1537	[% END %]	1537	[% END %]
1538	[% IF OpenLibraryCovers %]	1538	[% IF OpenLibraryCovers %]