From e33f91d3bd38f14b2bbb034adf71b7ab4b4ef777 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 21 May 2019 15:04:33 +0000 Subject: [PATCH] Bug 22950: Markup error in OPAC recent comment template This patch makes minor corrections to the template for the OPAC's recent comments view. These corrections fix errors returned by the HTML validator. The patch moves some inline CSS into a class in the global OPAC CSS. Some minor reindentation has also been done, so use diff with the '-w' flag. To reproduce the problem you should have the 'reviewson' system preference turned on, and your system should have one or more approved comments. View the "Recent comments" page in the OPAC. Run the page through the W3C validation service: https://validator.w3.org. Either by pasting in the URL for the search results (if web accessible) or by viewing source, copying, and pasting into "Validate by Direct Input." This patch addresses one specific error: - "CSS: font-color: Property font-color doesn't exist." To test, apply the patch and rebuild the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Try again to reproduce the validation errors. Those errors should no longer be present. There should be no visible change to the page. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 457000102e7e2228c6bd834283a9e58f32bb2104) Signed-off-by: Fridolin Somers (cherry picked from commit 43e16861da807876e2b041c6a5bc78fdebefbbee) Signed-off-by: Lucas Gass --- .../opac-tmpl/bootstrap/css/src/opac.scss | 5 +++ .../bootstrap/en/modules/opac-showreviews.tt | 41 ++++++++++--------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index 85ec0bcf92..b629e913b8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -2425,6 +2425,11 @@ input { background-color: rgba( 239, 254, 213, .4 ); } } + + .commenter { + color: #666; + font-size: 85%; + } } .commentline .avatar { 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 80d55effde..d02152439c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -88,25 +88,28 @@ [% FILTER html_break %] [% review.review | html %] [% END %] - - [% IF review.your_comment %] - Added [% review.datereviewed | $KohaDates %] by you - [% ELSE %] - [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] - Added [% review.datereviewed | $KohaDates %] by - [% SWITCH ShowReviewer %] - [% CASE 'full' %] - [% review.borrtitle | html %] [% review.firstname | html %] [% review.surname | html %] - [% CASE 'first' %] - [% review.firstname | html %] - [% CASE 'surname' %] - [% review.surname | html %] - [% CASE 'firstandinitial' %] - [% review.firstname | html %] [% review.surname|truncate(2,'.') | html %] - [% CASE 'username' %] - [% review.userid | html %] - [% END %] - [% END %][% END %]

+ + [% IF review.your_comment %] + Added [% review.datereviewed | $KohaDates %] by you + [% ELSE %] + [% IF ( review.borrowernumber && ShowReviewer != "none" ) %] + Added [% review.datereviewed | $KohaDates %] by + [% SWITCH ShowReviewer %] + [% CASE 'full' %] + [% review.borrtitle | html %] [% review.firstname | html %] [% review.surname | html %] + [% CASE 'first' %] + [% review.firstname | html %] + [% CASE 'surname' %] + [% review.surname | html %] + [% CASE 'firstandinitial' %] + [% review.firstname | html %] [% review.surname|truncate(2,'.') | html %] + [% CASE 'username' %] + [% review.userid | html %] + [% END %] + [% END %] + [% END %] + +

[% IF ( review.BiblioDefaultViewmarc ) %] -- 2.39.5