From b7c81e5de19a28c8d71a8061cfd1a8d9cab35e2e Mon Sep 17 00:00:00 2001 From: Jenny Way Date: Thu, 18 Jan 2018 21:04:23 +0000 Subject: [PATCH] Bug-15595: Google cover staff search and detail Test plan: 1. Apply patch 2. In system preferences enable GoogleJacketsIntra 3. Cover images from Google should show in results page and detail page 4. If the record doesn't have a cover, it should display "No cover image available" 4. Disabling the GoogleJacketIntra will cause the cover images not to show 5. Without patch there is no GoogleJacketsIntra syspref --- .../bug_15595_GoogleJacketsIntra_syspref.sql | 1 + installer/data/mysql/sysprefs.sql | 1 + .../admin/preferences/enhanced_content.pref | 9 +++ .../prog/en/modules/catalogue/.detail.tt.swo | Bin 0 -> 16384 bytes .../prog/en/modules/catalogue/.results.tt.swp | Bin 0 -> 16384 bytes .../prog/en/modules/catalogue/detail.tt | 13 +++- .../prog/en/modules/catalogue/results.tt | 13 +++- koha-tmpl/intranet-tmpl/prog/js/google-jackets.js | 76 +++++++++++++++++++++ .../bootstrap/en/modules/.opac-detail.tt.swp | Bin 0 -> 16384 bytes 9 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_15595_GoogleJacketsIntra_syspref.sql create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/.detail.tt.swo create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/.results.tt.swp create mode 100644 koha-tmpl/intranet-tmpl/prog/js/google-jackets.js create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/.opac-detail.tt.swp diff --git a/installer/data/mysql/atomicupdate/bug_15595_GoogleJacketsIntra_syspref.sql b/installer/data/mysql/atomicupdate/bug_15595_GoogleJacketsIntra_syspref.sql new file mode 100644 index 0000000..f65bd9c --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_15595_GoogleJacketsIntra_syspref.sql @@ -0,0 +1 @@ +INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('GoogleJacketsIntra', '0', NULL, 'Add cover images from Google Books to search results and item detail pages in the staff client.','YesNo'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 23cefb8..f407474 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -175,6 +175,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('gist','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'), ('GoogleIndicTransliteration','0','','GoogleIndicTransliteration on the OPAC.','YesNo'), ('GoogleJackets','0',NULL,'if ON, displays jacket covers from Google Books API','YesNo'), +('GoogleJacketsIntra', '0', NULL, 'Add cover images from Google Books to search results and item detail pages in the staff client.','YesNo'), ('GoogleOpenIDConnect', '0', NULL, 'if ON, allows the use of Google OpenID Connect for login', 'YesNo'), ('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with Google', 'Free'), ('GoogleOAuth2ClientSecret', '', NULL, 'Client Secret for the web app registered with Google', 'Free'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref index f62882d..a57272d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -123,6 +123,15 @@ Enhanced Content: yes: Add no: "Don't add" - cover images from Google Books to search results and item detail pages on the OPAC. + + Google: + - + - pref: GoogleJacketsIntra + choices: + yes: Add + no: "Don't add" + - cover images from Google Books to search results and item detail pages on the staff client. + Open Library: - - pref: OpenLibraryCovers diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/.detail.tt.swo b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/.detail.tt.swo new file mode 100644 index 0000000000000000000000000000000000000000..57462c8e786c73f7e85ee344fa643e774b356e2d GIT binary patch literal 16384 zcmeHNTZ|k>73~;8fFw8yKM3)t42jnUW_leXVeFZWH@o9xlgZlgdPC$8je5FkXBzi( zO}eUgJ!pA-@WDfT8H6Ap1PBB_$p`;Ipn&*ByyBRL32_Jzh%f>P5S;41-8)k|voXjZ zAy-RhXZoJ1x>fhydfeIS%s#MmAA4u*9S)wG9EV-&o%-Ufj&tNSjNPfxSUohIg!?6GFiJzl-A2Rsg5nuTC34{MF@%K`F)4$IX zze4<7hJSuT{0ZVeXYkJv{~+-%82m-z?(|4}2SV4EO@@ zc_0Da1~6b3@K@Xu_zUn9@C5KEumLOrHv<=Lbe!)4-vqt{oCQ7xd=yB4i>wrr) zIL<|26BqzpU=eucddGPhI0rlqJO-QvQa}OEzS?oV13V6V8JGob1>Oj}0rXZU8R5(s6zOd=~fw@NwV(a6Rz+b&m5j;4C14S>R2;Zs6i89Orw$ zXMm3Y9H;;{0lR=}fb-Wn&Ub+)fv*Dd!0UleBTs(_Xaf6zHv{L9`+X8P1-uUU3Vicn z;C?{+N&hzSWRbXQ&$1~`T@JjM`H?4Oqq4!nZckO__C9nQJLz>>Lez3mTM1mQV7EQI zukPv!b11NMljE4B|Tq|Me8MNE^+izqdK^MQe63M&{cc$8gmHGA#8qBbx=|=qZ4ljomxif2O|<5U9w!-MtV?y*o7<^dnQa#4 zm)oi235+Kq*~UE;o_LD4werkd6I+1BqsLA(=NIlK&1`9zz6~agbj*PXmuaMATc-WK zmkcX&V{GJgcvP9gfaD?aW7!3$%{r~gX6$t$9Gd#CsTau}kJfQXh(5L3#h|es@{K)Se{fif*W$F_ z;fW3fSsM`)aZm`oK8I*q1fW{sH>q7lnoO6CIpnh3)k2s`rh1-YVeCg~!0{475~_$F zVy1!7516nRr!Uf2={}4)`oWdf$vY$A7k$gC>}6V>ds!}qau9jL+{0O26f)eqU7}rB z55jd828~L2AFG|;$7*-NP85ntvDggLu$r>9Fp*es%I=j-(2}G}bw_xubi$l}Nv;2u zhAalBSwr`5LNESz*63UTbNmNR@W<6&j*YT1^L_7qB3=;dJXz{{T`n2h++;1`d(o&6 zvU_pouXY^EHBWf#^Sv{73DJ%CJ)VD>D><`|qIkQd$0pUO1MfO`u#!)YMg@h1FTz+N z*s&buyH^=)^;@b{ws0(rSD4F=4S2kIqQ$D!JXlaQ8vxbU8=RwM%L}d5#U`6UfLHa> z-tm$eX68&e&9Yz|iQmFuWsvHi?t5XJTeK8+0tocz$^aj2DG2rTM%L$2!ireNdz>ZQ z7fHZ|BE{E7QZ5yi?LffBu~3Yk!P3F>W}Z*Ie1StZ_tokyrfH@u8)6!tj>SeiRxBH@ zQ+6&8{(-T%t8Pbc9csv2)M*)EYa(IwP;aBza#il>S^09kOgoy*R?YmYUSahlllf~6 zpKBqH0=CKMP@v6}ohIsTsNJRCOS3Vynh%H!l=C}}v>a$B;a=b;*bF2BX7c$#J8u9l zU>~W>-7WfDZwG8oBE3gaahOf1Rj!Dxxgv3NMPeu)fnLW-S2A*NDHwBYX$yhHr!)n|w9-6@$s=Ip_e$1a z`?JLb@{v7w{Egw+E}15rT3QqO(Otl?Z$YGq_eu{b^z9m$K7e^C~5E2-hIfxA~yvf?1L=!`j>TxbdSEa zXLh)v@n!;CmG^t_Sw2oJnom_vB%$QN173v9VuaEmyNKk(l<6Wi|F`+S&HruwZ}b1` zR|1>=(`K&sy{%JPvBQ_==<>8{^ZzURYe6J>@c*3u{|o6yoA>|# literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/.results.tt.swp b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/.results.tt.swp new file mode 100644 index 0000000000000000000000000000000000000000..767950c1ea3560c501ce88bb3b70e05c6bb0701a GIT binary patch literal 16384 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 [% END %] - [% IF ( AmazonCoverImages || LocalCoverImages ) %] + [% IF ( AmazonCoverImages || LocalCoverImages || Koha.Preference('GoogleJacketsIntra') ) %] [% IF ( XSLTDetailsDisplay ) %]
@@ -125,8 +125,15 @@ [% END %] - [% IF ( AmazonCoverImages || LocalCoverImages ) %] + [% IF ( AmazonCoverImages || LocalCoverImages || Koha.Preference('GoogleJacketsIntra') ) %]
+ [% IF ( Koha.Preference('GoogleJacketsIntra') ) %] + [% IF ( normalized_isbn ) %] +
+ [% ELSE %] + No cover image available + [% END %] + [% END %] [% IF ( LocalCoverImages ) %]
[% END %] @@ -849,6 +856,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] + [% INCLUDE 'greybox.inc' %] [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 87ed564..0ea1e4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -356,7 +356,7 @@ [% SET MaxSearchResultsItemsPerRecordStatusCheck = Koha.Preference('MaxSearchResultsItemsPerRecordStatusCheck') %] [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] - [% IF ( AmazonCoverImages || LocalCoverImages ) %] + [% IF AmazonCoverImages || LocalCoverImages || Koha.Preference('GoogleJacketsIntra') %] [% IF ( LocalCoverImages) %] @@ -373,6 +373,14 @@ [% END %] [% END %] + [% IF ( Koha.Preference('GoogleJacketsIntra') ) %] + [% IF ( SEARCH_RESULT.normalized_isbn ) %] +
+ [% ELSE %] + No cover image available + [% END %] + [% END %] + [% END %] @@ -624,6 +632,7 @@ +