cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'openstreetmap/pull/1349'

Browse source
This commit is contained in:
Tom Hughes 2016-10-29 18:08:31 +01:00
commit 48eb8eb369
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/diary_entry/rss.rss.builder
View file

@ -9,7 +9,7 @@ xml.rss("version" => "2.0",
xml.link url_for(:action => "list", :host => SERVER_URL)
xml.image do
xml.url image_path("mag_map-rss2.0.png")
xml.title "OpenStreetMap"
xml.title @title
xml.width "100"
xml.height "100"
xml.link url_for(:action => "list", :host => SERVER_URL)
@ -21,7 +21,7 @@ xml.rss("version" => "2.0",
xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
xml.description entry.body.to_html
xml.author entry.user.display_name
xml.dc :creator, entry.user.display_name
xml.pubDate entry.created_at.to_s(:rfc822)
xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL)

2
app/views/notes/_note.rss.builder
View file

@ -13,7 +13,7 @@ xml.item do
xml.guid note_url(note)
xml.description render(:partial => "description", :object => note, :formats => [:html])
xml.author note.author.display_name if note.author
xml.dc :creator, note.author.display_name if note.author
xml.pubDate note.updated_at.to_s(:rfc822)
xml.geo :lat, note.lat

2
app/views/trace/georss.rss.builder
View file

@ -10,7 +10,7 @@ xml.rss("version" => "2.0",
xml.link url_for(:controller => :trace, :action => :list, :only_path => false)
xml.image do
xml.url image_path("mag_map-rss2.0.png")
xml.url image_path("mag_map-rss2.0.png", :host => SERVER_URL)
xml.title t("trace.georss.title")
xml.width 100
xml.height 100