From 48ecbe6440368831fbb685561bf2c98b94e54a30 Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 27 Jun 2014 12:21:09 +0200 Subject: [PATCH] =?UTF-8?q?Les=20liens=20sur=20wikipedia=20sont=20url=5Fen?= =?UTF-8?q?cod=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/events/index.rss.builder | 6 +----- app/views/events/show.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder index 0c62f05b..2a5ca6d4 100644 --- a/app/views/events/index.rss.builder +++ b/app/views/events/index.rss.builder @@ -34,11 +34,7 @@ xml.rdf :RDF, 'xmlns:rdf' => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", content = render file: '/events/show.html', locals: { rss: true } xml.description strip_tags content - xml.content(:encoded) { - xml.cdata! sanitize content, - tags: %w(p br table tr td ul ol li a strong b em i img), - attributes: %w(href src width height) - } + xml.content(:encoded) { xml.cdata! content } end end end diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index 8fba6d92..72533877 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -29,8 +29,8 @@ %p =t '.at' - %em= link_to(@event.city, "http://fr.wikipedia.org/wiki/#{@event.city}") + ',' - = link_to @event.region.name, "http://fr.wikipedia.org/wiki/#{@event.region.name}" rescue nil + %em= link_to(@event.city, "http://fr.wikipedia.org/wiki/#{url_encode @event.city}") + ',' + = link_to @event.region.name, "http://fr.wikipedia.org/wiki/#{url_encode @event.region.name}" rescue nil %h3 Description .description