@@ -, +, @@ --- .../data/mysql/atomicupdate/bug_18421_add_coce_intranet.perl | 2 +- installer/data/mysql/sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/{prog => }/js/coce.js | 0 .../prog/en/modules/admin/preferences/enhanced_content.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 10 ++++------ koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 10 ++++------ 6 files changed, 11 insertions(+), 15 deletions(-) rename koha-tmpl/intranet-tmpl/{prog => }/js/coce.js (100%) --- a/installer/data/mysql/atomicupdate/bug_18421_add_coce_intranet.perl +++ a/installer/data/mysql/atomicupdate/bug_18421_add_coce_intranet.perl @@ -14,7 +14,7 @@ my $current_coce_pref = C4::Context->preference('Coce') || 0; # add two new systempreferences in order to have distinct behavior between intranet and OPAC $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES - ('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff intranet', 'YesNo'), + ('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'), ('OpacCoce','$current_coce_pref', NULL, 'If on, enables cover retrieval from the configured Coce server in the OPAC', 'YesNo') ;") or die "Error applying Bug 18421: error inserting new values into database: ". $dbh->errstr . "\n"; --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -227,7 +227,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'), ('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'), ('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'), -('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff intranet', 'YesNo'), +('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff client', 'YesNo'), ('intranetcolorstylesheet','','50','Define the color stylesheet to use in the Staff Client','free'), ('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','free'), ('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -387,7 +387,7 @@ Enhanced Content: choices: yes: Enable no: "Don't enable" - - a Coce image cache service in the staff intranet. + - a Coce image cache service in the staff client. - - Coce server URL - pref: CoceHost --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -61,11 +61,9 @@
-[% - IntranetCoce = Koha.Preference('IntranetCoce') - CoceProviders = Koha.Preference('CoceProviders') - CoceHost = Koha.Preference('CoceHost') -%] +[% IntranetCoce = Koha.Preference('IntranetCoce') %] +[% CoceProviders = Koha.Preference('CoceProviders') %] +[% CoceHost = Koha.Preference('CoceHost') %] [% INCLUDE 'cat-toolbar.inc' %] [% IF ( ocoins ) %] @@ -920,7 +918,7 @@ [% INCLUDE 'catalog-strings.inc' %] [% Asset.js("js/catalog.js") | $raw %] [% INCLUDE 'greybox.inc' %] - + [% Asset.js("js/coce.js") %]