From 8f58517137dd1bc4f9ae2224f55bf4b7a33bf4fa Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 22 Mar 2019 16:43:51 +0000 Subject: [PATCH] Bug 22568: Replace RSS icon in the OPAC with Font Awesome This patch removes the RSS icon image (feed-icon-16x16.png) from the OPAC and replaces it with Font Awesome icons styled to match. To test, apply the patch and regenerate the OPAC CSS. View the following pages, confirming that the RSS icon looks correct: - OPAC home page (RSS news icon) - Search results page (Subscribe to search) - Recent comments - Search history - Lists -> View list --- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 25 +++++++++++++++++++++ .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 9 ++++++-- .../bootstrap/en/modules/opac-search-history.tt | 16 +++++++++++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- .../bootstrap/en/modules/opac-showreviews.tt | 2 +- .../opac-tmpl/bootstrap/images/feed-icon-16x16.png | Bin 764 -> 0 bytes 7 files changed, 50 insertions(+), 7 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/images/feed-icon-16x16.png diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 0b26283..a4c135f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -540,6 +540,31 @@ th { padding: 4px 8px; } +#rssnews-container { + font-size: 90%; + padding: .5em 0; +} + +.rsssearchlink { + &:hover { + text-decoration: none; + } +} + +.fa { + &.fa-rss { + background: linear-gradient(135deg, #DA5E2A 0%, #FA9C39 50%, #DA5E2A 100%); + border-radius: 3px; + color: #FFF; + padding: 2px 3px; + text-shadow: 1px 0 1px rgba(0, 0, 0, .25); + + &.rsssearchicon { + font-size: 90%; + } + } +} + #opacheader { background-color: #fcf9fc; } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index 82b0240..e02635f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -90,7 +90,7 @@
- + [% IF Branches.all.size == 1 %] [% IF branchcode %] RSS feed for [% Branches.GetName( branchcode ) | html %] library news. @@ -104,6 +104,7 @@ RSS feed for system-wide library news. [% END %] [% END %] +
[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 501ceb2..2e233f1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -55,7 +55,10 @@ No results found!

[% IF ( searchdesc ) %] - No results found for that in [% LibraryName | html %] catalog. Subscribe to this search + No results found for that in [% LibraryName | html %] catalog. + + + [% ELSE %] You did not specify any search criteria. [% END %] @@ -99,7 +102,9 @@ [% END %] ). [% END %] - Subscribe to this search + + + [% END # / IF total %]

[% END # / IF searchdesc %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index ff9f72d..098f532 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -71,7 +71,12 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc | html %] + + + + + [% s.query_desc | html %] + [% s.total | html %] [% END %] @@ -111,7 +116,14 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc | html %] + + + + + + [% s.query_desc | html %] + + [% s.total | html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 3f97aa6..10d452d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -154,7 +154,7 @@

[% shelf.shelfname | html %] - Subscribe to this list +

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index 80d55ef..e510e1a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -29,7 +29,7 @@
[% END %]
-

Recent comments Subscribe to recent comments

+

Recent comments

[% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %] [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/images/feed-icon-16x16.png b/koha-tmpl/opac-tmpl/bootstrap/images/feed-icon-16x16.png deleted file mode 100644 index 1679ab05b016ab3eb7556d6eaa869795bf457aa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 764 zcmVycK`yFAWD;1ET2aX4PeS5VXXgH#(|69jGm_GU@1D8vz3+LxpJ8L?l8MS>?e&-y z%WwuTdNIE7EdHio488!C7VH80_u>sxi4*Ze##>tjHyI4h^~p_yXBY;V7~x4qiDX^o z$0suUd9_8Fo{vZ}h4R*ulmz%Q;}E~b|0~uMp2X6k2UB6Iq)2TF6^AaO_{f3{_rnnU zi6Jm=Ws}%12#^$9)n`OF)-{H^$f#o?Aj#uD5NjJvVCb8 z-B>S$xnn=9j>}+Mn>CUD>NdR3&q`w7k;qeM0wu6^wW8|MOO&6!4=ddb{F#RP_&mh) zh&C`ft^uj`lGt|w0g0yETI}Y>sAY^qD3eRt@_a%KM5W6LU^-*DM4)W^=yeGW@x-vP^51&;a z_u{UmC~NE1Vr3#lv4n8W*3mnNoEQXe=!ExXK$Ebldhnf{$W4qw=54T8C6%^EPa`Y= zTC8eULRQ}bw)+@7dl}CANBY)CbCDGr>2aaR?%ik}jX`KOnc%8hS}Ytd3$EobO|$Q5mVUPR@OK7nDP0&O#Q>d=_Sn z1vYtQ@4be7bs6d9|5=jKsKSQnnh9Iz+9hH&apbr?VDvVzx4Bgj1I#v;5_PC`r3U$u usA%IQS3%99X~E(!%1spbn*KZg6<`2SHB&n2#K$=R0000