Rename views to rails 2 style names.

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 16186314fe94d44facc26b5f16caac32324e2858..165f4130621162208996584dc6aca905616439e3 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -78,6 +78,8 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
+    request.format = :rss
+
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
 
@@ -86,8 +88,6 @@ class DiaryEntryController < ApplicationController
         @title = "OpenStreetMap diary entries for #{user.display_name}"
         @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
-
-        render :content_type => Mime::RSS
       else
         render :nothing => true, :status => :not_found
       end
@@ -98,8 +98,6 @@ class DiaryEntryController < ApplicationController
       @title = "OpenStreetMap diary entries in #{params[:language]}"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
-      
-      render :content_type => Mime::RSS
     else
       @entries = DiaryEntry.find(:all, :include => :user,
                                  :conditions => ["users.visible = ?", true],
@@ -107,8 +105,6 @@ class DiaryEntryController < ApplicationController
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
       @link = "http://#{SERVER_URL}/diary"
-
-      render :content_type => Mime::RSS
     end
   end
 

diff --git a/app/views/api/map.rxml b/app/views/api/map.xml.builder
similarity index 100%
rename from app/views/api/map.rxml
rename to app/views/api/map.xml.builder

diff --git a/app/views/browse/_changeset_details.rhtml b/app/views/browse/_changeset_details.html.erb
similarity index 100%
rename from app/views/browse/_changeset_details.rhtml
rename to app/views/browse/_changeset_details.html.erb

diff --git a/app/views/browse/_common_details.rhtml b/app/views/browse/_common_details.html.erb
similarity index 100%
rename from app/views/browse/_common_details.rhtml
rename to app/views/browse/_common_details.html.erb

diff --git a/app/views/browse/_containing_relation.rhtml b/app/views/browse/_containing_relation.html.erb
similarity index 100%
rename from app/views/browse/_containing_relation.rhtml
rename to app/views/browse/_containing_relation.html.erb

diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.html.erb
similarity index 100%
rename from app/views/browse/_map.rhtml
rename to app/views/browse/_map.html.erb

diff --git a/app/views/browse/_navigation.rhtml b/app/views/browse/_navigation.html.erb
similarity index 100%
rename from app/views/browse/_navigation.rhtml
rename to app/views/browse/_navigation.html.erb

diff --git a/app/views/browse/_node_details.rhtml b/app/views/browse/_node_details.html.erb
similarity index 100%
rename from app/views/browse/_node_details.rhtml
rename to app/views/browse/_node_details.html.erb

diff --git a/app/views/browse/_paging_nav.rhtml b/app/views/browse/_paging_nav.html.erb
similarity index 100%
rename from app/views/browse/_paging_nav.rhtml
rename to app/views/browse/_paging_nav.html.erb

diff --git a/app/views/browse/_relation_details.rhtml b/app/views/browse/_relation_details.html.erb
similarity index 100%
rename from app/views/browse/_relation_details.rhtml
rename to app/views/browse/_relation_details.html.erb

diff --git a/app/views/browse/_relation_member.rhtml b/app/views/browse/_relation_member.html.erb
similarity index 100%
rename from app/views/browse/_relation_member.rhtml
rename to app/views/browse/_relation_member.html.erb

diff --git a/app/views/browse/_start.rhtml b/app/views/browse/_start.html.erb
similarity index 100%
rename from app/views/browse/_start.rhtml
rename to app/views/browse/_start.html.erb

diff --git a/app/views/browse/_tag.rhtml b/app/views/browse/_tag.html.erb
similarity index 100%
rename from app/views/browse/_tag.rhtml
rename to app/views/browse/_tag.html.erb

diff --git a/app/views/browse/_tag_details.rhtml b/app/views/browse/_tag_details.html.erb
similarity index 100%
rename from app/views/browse/_tag_details.rhtml
rename to app/views/browse/_tag_details.html.erb

diff --git a/app/views/browse/_way_details.rhtml b/app/views/browse/_way_details.html.erb
similarity index 100%
rename from app/views/browse/_way_details.rhtml
rename to app/views/browse/_way_details.html.erb

diff --git a/app/views/browse/changeset.rhtml b/app/views/browse/changeset.html.erb
similarity index 100%
rename from app/views/browse/changeset.rhtml
rename to app/views/browse/changeset.html.erb

diff --git a/app/views/browse/node.rhtml b/app/views/browse/node.html.erb
similarity index 100%
rename from app/views/browse/node.rhtml
rename to app/views/browse/node.html.erb

diff --git a/app/views/browse/node_history.rhtml b/app/views/browse/node_history.html.erb
similarity index 100%
rename from app/views/browse/node_history.rhtml
rename to app/views/browse/node_history.html.erb

diff --git a/app/views/browse/not_found.rhtml b/app/views/browse/not_found.html.erb
similarity index 100%
rename from app/views/browse/not_found.rhtml
rename to app/views/browse/not_found.html.erb

diff --git a/app/views/browse/relation.rhtml b/app/views/browse/relation.html.erb
similarity index 100%
rename from app/views/browse/relation.rhtml
rename to app/views/browse/relation.html.erb

diff --git a/app/views/browse/relation_history.rhtml b/app/views/browse/relation_history.html.erb
similarity index 100%
rename from app/views/browse/relation_history.rhtml
rename to app/views/browse/relation_history.html.erb

diff --git a/app/views/browse/way.rhtml b/app/views/browse/way.html.erb
similarity index 100%
rename from app/views/browse/way.rhtml
rename to app/views/browse/way.html.erb

diff --git a/app/views/browse/way_history.rhtml b/app/views/browse/way_history.html.erb
similarity index 100%
rename from app/views/browse/way_history.rhtml
rename to app/views/browse/way_history.html.erb

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.html.erb
similarity index 100%
rename from app/views/changeset/_changeset.rhtml
rename to app/views/changeset/_changeset.html.erb

diff --git a/app/views/changeset/_changeset_paging_nav.rhtml b/app/views/changeset/_changeset_paging_nav.html.erb
similarity index 100%
rename from app/views/changeset/_changeset_paging_nav.rhtml
rename to app/views/changeset/_changeset_paging_nav.html.erb

diff --git a/app/views/changeset/_changesets.rhtml b/app/views/changeset/_changesets.html.erb
similarity index 100%
rename from app/views/changeset/_changesets.rhtml
rename to app/views/changeset/_changesets.html.erb

diff --git a/app/views/changeset/list.rhtml b/app/views/changeset/list.html.erb
similarity index 100%
rename from app/views/changeset/list.rhtml
rename to app/views/changeset/list.html.erb

diff --git a/app/views/changeset/list_bbox.rhtml b/app/views/changeset/list_bbox.html.erb
similarity index 100%
rename from app/views/changeset/list_bbox.rhtml
rename to app/views/changeset/list_bbox.html.erb

diff --git a/app/views/changeset/list_user.rhtml b/app/views/changeset/list_user.html.erb
similarity index 100%
rename from app/views/changeset/list_user.rhtml
rename to app/views/changeset/list_user.html.erb

diff --git a/app/views/diary_entry/_diary_comment.rhtml b/app/views/diary_entry/_diary_comment.html.erb
similarity index 100%
rename from app/views/diary_entry/_diary_comment.rhtml
rename to app/views/diary_entry/_diary_comment.html.erb

diff --git a/app/views/diary_entry/_diary_entry.rhtml b/app/views/diary_entry/_diary_entry.html.erb
similarity index 100%
rename from app/views/diary_entry/_diary_entry.rhtml
rename to app/views/diary_entry/_diary_entry.html.erb

diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.html.erb
similarity index 100%
rename from app/views/diary_entry/edit.rhtml
rename to app/views/diary_entry/edit.html.erb

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.html.erb
similarity index 100%
rename from app/views/diary_entry/list.rhtml
rename to app/views/diary_entry/list.html.erb

diff --git a/app/views/diary_entry/no_such_entry.rhtml b/app/views/diary_entry/no_such_entry.html.erb
similarity index 100%
rename from app/views/diary_entry/no_such_entry.rhtml
rename to app/views/diary_entry/no_such_entry.html.erb

diff --git a/app/views/diary_entry/no_such_user.rhtml b/app/views/diary_entry/no_such_user.html.erb
similarity index 100%
rename from app/views/diary_entry/no_such_user.rhtml
rename to app/views/diary_entry/no_such_user.html.erb

diff --git a/app/views/diary_entry/rss.rxml b/app/views/diary_entry/rss.rss.builder
similarity index 100%
rename from app/views/diary_entry/rss.rxml
rename to app/views/diary_entry/rss.rss.builder

diff --git a/app/views/diary_entry/view.rhtml b/app/views/diary_entry/view.html.erb
similarity index 100%
rename from app/views/diary_entry/view.rhtml
rename to app/views/diary_entry/view.html.erb

diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.html.erb
similarity index 100%
rename from app/views/export/_start.rhtml
rename to app/views/export/_start.html.erb

diff --git a/app/views/geocoder/_results.rhtml b/app/views/geocoder/_results.html.erb
similarity index 100%
rename from app/views/geocoder/_results.rhtml
rename to app/views/geocoder/_results.html.erb

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.html.erb
similarity index 100%
rename from app/views/layouts/site.rhtml
rename to app/views/layouts/site.html.erb

diff --git a/app/views/message/_message_summary.rhtml b/app/views/message/_message_summary.html.erb
similarity index 100%
rename from app/views/message/_message_summary.rhtml
rename to app/views/message/_message_summary.html.erb

diff --git a/app/views/message/_sent_message_summary.rhtml b/app/views/message/_sent_message_summary.html.erb
similarity index 100%
rename from app/views/message/_sent_message_summary.rhtml
rename to app/views/message/_sent_message_summary.html.erb

diff --git a/app/views/message/inbox.rhtml b/app/views/message/inbox.html.erb
similarity index 100%
rename from app/views/message/inbox.rhtml
rename to app/views/message/inbox.html.erb

diff --git a/app/views/message/new.rhtml b/app/views/message/new.html.erb
similarity index 100%
rename from app/views/message/new.rhtml
rename to app/views/message/new.html.erb

diff --git a/app/views/message/no_such_user.rhtml b/app/views/message/no_such_user.html.erb
similarity index 100%
rename from app/views/message/no_such_user.rhtml
rename to app/views/message/no_such_user.html.erb

diff --git a/app/views/message/outbox.rhtml b/app/views/message/outbox.html.erb
similarity index 100%
rename from app/views/message/outbox.rhtml
rename to app/views/message/outbox.html.erb

diff --git a/app/views/message/read.rhtml b/app/views/message/read.html.erb
similarity index 100%
rename from app/views/message/read.rhtml
rename to app/views/message/read.html.erb

diff --git a/app/views/notifier/_gpx_description.rhtml b/app/views/notifier/_gpx_description.html.erb
similarity index 100%
rename from app/views/notifier/_gpx_description.rhtml
rename to app/views/notifier/_gpx_description.html.erb

diff --git a/app/views/notifier/diary_comment_notification.rhtml b/app/views/notifier/diary_comment_notification.html.erb
similarity index 100%
rename from app/views/notifier/diary_comment_notification.rhtml
rename to app/views/notifier/diary_comment_notification.html.erb

diff --git a/app/views/notifier/email_confirm.text.html.rhtml b/app/views/notifier/email_confirm.text.html.erb
similarity index 100%
rename from app/views/notifier/email_confirm.text.html.rhtml
rename to app/views/notifier/email_confirm.text.html.erb

diff --git a/app/views/notifier/email_confirm.text.plain.rhtml b/app/views/notifier/email_confirm.text.plain.erb
similarity index 100%
rename from app/views/notifier/email_confirm.text.plain.rhtml
rename to app/views/notifier/email_confirm.text.plain.erb

diff --git a/app/views/notifier/friend_notification.rhtml b/app/views/notifier/friend_notification.html.erb
similarity index 100%
rename from app/views/notifier/friend_notification.rhtml
rename to app/views/notifier/friend_notification.html.erb

diff --git a/app/views/notifier/gpx_failure.rhtml b/app/views/notifier/gpx_failure.html.erb
similarity index 100%
rename from app/views/notifier/gpx_failure.rhtml
rename to app/views/notifier/gpx_failure.html.erb

diff --git a/app/views/notifier/gpx_success.rhtml b/app/views/notifier/gpx_success.html.erb
similarity index 100%
rename from app/views/notifier/gpx_success.rhtml
rename to app/views/notifier/gpx_success.html.erb

diff --git a/app/views/notifier/lost_password.text.html.rhtml b/app/views/notifier/lost_password.text.html.erb
similarity index 100%
rename from app/views/notifier/lost_password.text.html.rhtml
rename to app/views/notifier/lost_password.text.html.erb

diff --git a/app/views/notifier/lost_password.text.plain.rhtml b/app/views/notifier/lost_password.text.plain.erb
similarity index 100%
rename from app/views/notifier/lost_password.text.plain.rhtml
rename to app/views/notifier/lost_password.text.plain.erb

diff --git a/app/views/notifier/message_notification.rhtml b/app/views/notifier/message_notification.html.erb
similarity index 100%
rename from app/views/notifier/message_notification.rhtml
rename to app/views/notifier/message_notification.html.erb

diff --git a/app/views/notifier/reset_password.text.html.rhtml b/app/views/notifier/reset_password.text.html.erb
similarity index 100%
rename from app/views/notifier/reset_password.text.html.rhtml
rename to app/views/notifier/reset_password.text.html.erb

diff --git a/app/views/notifier/reset_password.text.plain.rhtml b/app/views/notifier/reset_password.text.plain.erb
similarity index 100%
rename from app/views/notifier/reset_password.text.plain.rhtml
rename to app/views/notifier/reset_password.text.plain.erb

diff --git a/app/views/notifier/signup_confirm.text.html.rhtml b/app/views/notifier/signup_confirm.text.html.erb
similarity index 100%
rename from app/views/notifier/signup_confirm.text.html.rhtml
rename to app/views/notifier/signup_confirm.text.html.erb

diff --git a/app/views/notifier/signup_confirm.text.plain.rhtml b/app/views/notifier/signup_confirm.text.plain.erb
similarity index 100%
rename from app/views/notifier/signup_confirm.text.plain.rhtml
rename to app/views/notifier/signup_confirm.text.plain.erb

diff --git a/app/views/site/_key.rhtml b/app/views/site/_key.html.erb
similarity index 100%
rename from app/views/site/_key.rhtml
rename to app/views/site/_key.html.erb

diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.html.erb
similarity index 100%
rename from app/views/site/_search.rhtml
rename to app/views/site/_search.html.erb

diff --git a/app/views/site/_sidebar.rhtml b/app/views/site/_sidebar.html.erb
similarity index 100%
rename from app/views/site/_sidebar.rhtml
rename to app/views/site/_sidebar.html.erb

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.html.erb
similarity index 100%
rename from app/views/site/edit.rhtml
rename to app/views/site/edit.html.erb

diff --git a/app/views/site/index.rhtml b/app/views/site/index.html.erb
similarity index 100%
rename from app/views/site/index.rhtml
rename to app/views/site/index.html.erb

diff --git a/app/views/site/offline.rhtml b/app/views/site/offline.html.erb
similarity index 100%
rename from app/views/site/offline.rhtml
rename to app/views/site/offline.html.erb

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.html.erb
similarity index 100%
rename from app/views/trace/_trace.rhtml
rename to app/views/trace/_trace.html.erb

diff --git a/app/views/trace/_trace_form.rhtml b/app/views/trace/_trace_form.html.erb
similarity index 100%
rename from app/views/trace/_trace_form.rhtml
rename to app/views/trace/_trace_form.html.erb

diff --git a/app/views/trace/_trace_header.rhtml b/app/views/trace/_trace_header.html.erb
similarity index 100%
rename from app/views/trace/_trace_header.rhtml
rename to app/views/trace/_trace_header.html.erb

diff --git a/app/views/trace/_trace_list.rhtml b/app/views/trace/_trace_list.html.erb
similarity index 100%
rename from app/views/trace/_trace_list.rhtml
rename to app/views/trace/_trace_list.html.erb

diff --git a/app/views/trace/_trace_optionals.rhtml b/app/views/trace/_trace_optionals.html.erb
similarity index 100%
rename from app/views/trace/_trace_optionals.rhtml
rename to app/views/trace/_trace_optionals.html.erb

diff --git a/app/views/trace/_trace_paging_nav.rhtml b/app/views/trace/_trace_paging_nav.html.erb
similarity index 100%
rename from app/views/trace/_trace_paging_nav.rhtml
rename to app/views/trace/_trace_paging_nav.html.erb

diff --git a/app/views/trace/create.rhtml b/app/views/trace/create.html.erb
similarity index 100%
rename from app/views/trace/create.rhtml
rename to app/views/trace/create.html.erb

diff --git a/app/views/trace/edit.rhtml b/app/views/trace/edit.html.erb
similarity index 100%
rename from app/views/trace/edit.rhtml
rename to app/views/trace/edit.html.erb

diff --git a/app/views/trace/list.rhtml b/app/views/trace/list.html.erb
similarity index 100%
rename from app/views/trace/list.rhtml
rename to app/views/trace/list.html.erb

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.html.erb
similarity index 100%
rename from app/views/trace/mine.rhtml
rename to app/views/trace/mine.html.erb

diff --git a/app/views/trace/no_such_user.rhtml b/app/views/trace/no_such_user.html.erb
similarity index 100%
rename from app/views/trace/no_such_user.rhtml
rename to app/views/trace/no_such_user.html.erb

diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.html.erb
similarity index 100%
rename from app/views/trace/view.rhtml
rename to app/views/trace/view.html.erb

diff --git a/app/views/user/_friend_map.rhtml b/app/views/user/_friend_map.html.erb
similarity index 100%
rename from app/views/user/_friend_map.rhtml
rename to app/views/user/_friend_map.html.erb

diff --git a/app/views/user/account.rhtml b/app/views/user/account.html.erb
similarity index 100%
rename from app/views/user/account.rhtml
rename to app/views/user/account.html.erb

diff --git a/app/views/user/confirm.rhtml b/app/views/user/confirm.html.erb
similarity index 100%
rename from app/views/user/confirm.rhtml
rename to app/views/user/confirm.html.erb

diff --git a/app/views/user/confirm_email.rhtml b/app/views/user/confirm_email.html.erb
similarity index 100%
rename from app/views/user/confirm_email.rhtml
rename to app/views/user/confirm_email.html.erb

diff --git a/app/views/user/index.rhtml b/app/views/user/index.html.erb
similarity index 100%
rename from app/views/user/index.rhtml
rename to app/views/user/index.html.erb

diff --git a/app/views/user/login.rhtml b/app/views/user/login.html.erb
similarity index 100%
rename from app/views/user/login.rhtml
rename to app/views/user/login.html.erb

diff --git a/app/views/user/lost_password.rhtml b/app/views/user/lost_password.html.erb
similarity index 100%
rename from app/views/user/lost_password.rhtml
rename to app/views/user/lost_password.html.erb

diff --git a/app/views/user/new.rhtml b/app/views/user/new.html.erb
similarity index 100%
rename from app/views/user/new.rhtml
rename to app/views/user/new.html.erb

diff --git a/app/views/user/no_such_user.rhtml b/app/views/user/no_such_user.html.erb
similarity index 100%
rename from app/views/user/no_such_user.rhtml
rename to app/views/user/no_such_user.html.erb

diff --git a/app/views/user/save.rhtml b/app/views/user/save.html.erb
similarity index 100%
rename from app/views/user/save.rhtml
rename to app/views/user/save.html.erb

diff --git a/app/views/user/view.rhtml b/app/views/user/view.html.erb
similarity index 100%
rename from app/views/user/view.rhtml
rename to app/views/user/view.html.erb

diff --git a/app/views/way_tag/search.rhtml b/app/views/way_tag/search.html.erb
similarity index 100%
rename from app/views/way_tag/search.rhtml
rename to app/views/way_tag/search.html.erb