From 2c6080abc0b59b57dcf3830eb89d670925f7fc3a Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 18 Jul 2014 23:42:33 +0200 Subject: [PATCH] =?UTF-8?q?Les=20mails=20ne=20sont=20plus=20encod=C3=A9s?= =?UTF-8?q?=20dans=20les=20flux=20rss=20et=20ical?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/dashboard.rb | 2 +- app/views/events/show.html.haml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/admin/dashboard.rb b/app/admin/dashboard.rb index b9a624d7..2b5a6f78 100644 --- a/app/admin/dashboard.rb +++ b/app/admin/dashboard.rb @@ -24,7 +24,7 @@ ActiveAdmin.register_page 'Dashboard' do end end panel "ActiveAdmin" do - para %(Currently deployed: #{`git describe --tags --abbrev=0`}, #{link_to(`git rev-parse --short HEAD`, "https://github.com/gregbell/active_admin/commit/#{`git rev-parse HEAD`}")}).html_safe + para %(Currently deployed: #{`git describe --tags --abbrev=0`}, #{link_to(`git rev-parse --short HEAD`, "https://gitorious.org/agenda-du-libre-rails/agenda-du-libre-rails/commit/#{`git rev-parse HEAD`}")}).html_safe end end end diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index 6951ad00..338a4ae7 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -55,7 +55,9 @@ = link_to @event.url, @event.url %p %span.label= Event.human_attribute_name :contact - = mail_to @event.contact, nil, encode: :javascript, replace_at: ' CHEZ ', replace_dot: ' POINT ' + = mail_to @event.contact, nil, + encode: (request.format == 'text/html' ? :javascript : nil), + replace_at: ' CHEZ ', replace_dot: ' POINT ' - if @event.tags && @event.tags.present? %p.tags