From 74694bcdcd7682259cf979d355e077438f0d4741 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=A0tefan=20Baebler?= Date: Mon, 19 Mar 2018 10:51:21 +0100 Subject: [PATCH] Using ruby helpers to construct html, changed div to span --- app/helpers/browse_helper.rb | 2 +- test/helpers/browse_helper_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 1fce5f0b3..2f07fd2eb 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -77,7 +77,7 @@ module BrowseHelper elsif url = telephone_link(key, value) link_to h(value), url, :title => t("browse.tag_details.telephone_link", :phone_number => value) elsif colour_value = colour_preview(key, value) - %(
#{h(value)} ).html_safe # rubocop:disable Rails/OutputSafety + content_tag(:span, "", :class => "colour-preview-box", :style => "background-color:#{colour_value}", :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value else linkify h(value) end diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index 4cb7c4853..2bfdf5cb1 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -136,7 +136,7 @@ class BrowseHelperTest < ActionView::TestCase assert_dom_equal "Q123", html html = format_value("colour", "#f00") - assert_dom_equal %(
#f00 ), html + assert_dom_equal %(#f00), html end def test_icon_tags -- 2.43.2