Tidy up message sensitisation a bit more, and add sensitisation of

information in the diary RSS feeds.
This commit is contained in:
Tom Hughes 2008-01-16 10:02:42 +00:00
parent b416597507
commit c3bd1f113b
5 changed files with 51 additions and 17 deletions

View file

@ -1,5 +1,5 @@
<b><%= h(diary_entry.title) %></b><br />
<%= sanitize(auto_link(simple_format(diary_entry.body), :urls)) %>
<%= htmlize(diary_entry.body) %>
<% if diary_entry.latitude and diary_entry.longitude %>
Coordinates: <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
<% end %>

View file

@ -0,0 +1,35 @@
xml.instruct!
xml.rss("version" => "2.0",
"xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
"xmlns:georss" => "http://www.georss.org/georss") do
xml.channel do
xml.title @title
xml.description @description
xml.link url_for(:action => "list", :only_path => false)
xml.image do
xml.url "http://www.openstreetmap.org/images/mag_map-rss2.0.png"
xml.title "OpenStreetMap"
xml.width "100"
xml.height "100"
xml.link url_for(:action => "list", :only_path => false)
end
for entry in @entries
xml.item do
xml.title h(entry.title)
xml.link url_for(:action => "list", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
xml.guid url_for(:action => "list", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
xml.description htmlize(entry.body)
xml.author entry.user.display_name
xml.pubDate entry.created_at.to_s(:rfc822)
if entry.latitude and entry.longitude
xml.geo :lat, entry.latitude.to_s
xml.geo :long, entry.longitude.to_s
xml.georss :point, "#{entry.latitude.to_s} #{entry.longitude.to_s}"
end
end
end
end
end

View file

@ -17,7 +17,7 @@
</tr>
<tr>
<th></th>
<td><%= sanitize(@message.body) %></td>
<td><%= htmlize(@message.body) %></td>
</tr>
</table>
@ -50,7 +50,7 @@
</tr>
<tr>
<th></th>
<td><%= sanitize(@message.body) %></td>
<td><%= htmlize(@message.body) %></td>
</tr>
</table>