agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Les mails ne sont plus encodés dans les flux rss et ical

Browse Source
This commit is contained in:
echarp 2014-07-18 23:42:33 +02:00
parent c63e30a18d
commit 2c6080abc0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/dashboard.rb
View File

@ -24,7 +24,7 @@ ActiveAdmin.register_page 'Dashboard' do
end end
end end
panel "ActiveAdmin" do 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 end
end end

4
app/views/events/show.html.haml
View File

@ -55,7 +55,9 @@
= link_to @event.url, @event.url = link_to @event.url, @event.url
%p %p
%span.label= Event.human_attribute_name :contact %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? - if @event.tags && @event.tags.present?
%p.tags %p.tags