From 7ccecf97abb7438aced889c8f7d89b7fe7a647c8 Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Thu, 18 Jul 2013 09:48:19 -0600 Subject: [PATCH] Followup for bug 10320: minor bugfixes and style improvements Switch to the new method of showing star ratings. Also, fix some translation bugs, an error that occurred when caching was disabled and add a stub unit test. --- C4/External/OverDrive.pm | 2 +- koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 16 ++++++- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 +++ .../prog/en/modules/opac-overdrive-search.tt | 44 ++++++++++++-------- .../opac-tmpl/prog/en/modules/opac-results.tt | 6 +-- koha-tmpl/opac-tmpl/prog/images/Star0.gif | Bin 1360 -> 0 bytes koha-tmpl/opac-tmpl/prog/images/Star1.gif | Bin 1395 -> 0 bytes koha-tmpl/opac-tmpl/prog/images/Star2.gif | Bin 1410 -> 0 bytes koha-tmpl/opac-tmpl/prog/images/Star3.gif | Bin 1391 -> 0 bytes koha-tmpl/opac-tmpl/prog/images/Star4.gif | Bin 1380 -> 0 bytes koha-tmpl/opac-tmpl/prog/images/Star5.gif | Bin 1284 -> 0 bytes t/External_Overdrive.t | 13 ++++++ 12 files changed, 64 insertions(+), 22 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/prog/images/Star0.gif delete mode 100644 koha-tmpl/opac-tmpl/prog/images/Star1.gif delete mode 100644 koha-tmpl/opac-tmpl/prog/images/Star2.gif delete mode 100644 koha-tmpl/opac-tmpl/prog/images/Star3.gif delete mode 100644 koha-tmpl/opac-tmpl/prog/images/Star4.gif delete mode 100644 koha-tmpl/opac-tmpl/prog/images/Star5.gif create mode 100755 t/External_Overdrive.t diff --git a/C4/External/OverDrive.pm b/C4/External/OverDrive.pm index 179ffe2..9cec867 100644 --- a/C4/External/OverDrive.pm +++ b/C4/External/OverDrive.pm @@ -122,7 +122,7 @@ sub GetOverDriveToken { $token = $contents->{'token_type'} . ' ' . $contents->{'access_token'}; # Fudge factor to prevent spurious failures - $cache->set_in_cache( 'overdrive_token', $token, $contents->{'expires_in'} - 5 ); + $cache and $cache->set_in_cache( 'overdrive_token', $token, $contents->{'expires_in'} - 5 ); return $token; } diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css index f66e11f..7886a61 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css @@ -2841,4 +2841,18 @@ a.reviewlink,a.reviewlink:visited { .branch-info-tooltip { display: none; -} \ No newline at end of file +} + +#overdrive-results { + font-weight: bold; + padding-left: 1em; +} + +.throbber { + vertical-align: middle; +} + +#overdrive-results-list .star-rating-control { + display: block; + overflow: auto; +} diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 3c2a958..98d4a78 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -2976,3 +2976,8 @@ padding: 0.1em 0; .throbber { vertical-align: middle; } + +#overdrive-results-list .star-rating-control { + display: block; + overflow: auto; +} diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-overdrive-search.tt index 4ba9f8d..086a22b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-overdrive-search.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-overdrive-search.tt @@ -2,6 +2,8 @@ [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]' [% INCLUDE 'doc-head-close.inc' %] + +