Diff
Modified: branches/rails2/app/controllers/announcements_controller.rb (2750 => 2751)
--- branches/rails2/app/controllers/announcements_controller.rb 2011-10-24 20:58:47 UTC (rev 2750)
+++ branches/rails2/app/controllers/announcements_controller.rb 2011-10-24 21:01:24 UTC (rev 2751)
@@ -15,7 +15,7 @@
respond_to do |format|
format.html # index.rhtml
format.rss do
- render :action ="" 'index.rxml', :layout => false
+ render :action ="" 'feed.rxml', :layout => false
end
end
end
Modified: branches/rails2/app/controllers/group_announcements_controller.rb (2750 => 2751)
--- branches/rails2/app/controllers/group_announcements_controller.rb 2011-10-24 20:58:47 UTC (rev 2750)
+++ branches/rails2/app/controllers/group_announcements_controller.rb 2011-10-24 21:01:24 UTC (rev 2751)
@@ -20,7 +20,7 @@
respond_to do |format|
format.html # index.rhtml
format.rss do
- render :action ="" 'index.rxml', :layout => false
+ render :action ="" 'feed.rxml', :layout => false
end
end
end
Modified: branches/rails2/app/controllers/workflows_controller.rb (2750 => 2751)
--- branches/rails2/app/controllers/workflows_controller.rb 2011-10-24 20:58:47 UTC (rev 2750)
+++ branches/rails2/app/controllers/workflows_controller.rb 2011-10-24 21:01:24 UTC (rev 2751)
@@ -219,7 +219,7 @@
end
format.rss do
address@hidden = Workflow.find(:all, :order => "updated_at DESC") # list all (if required)
- render :action ="" 'index.rxml', :layout => false
+ render :action ="" 'feed.rxml', :layout => false
end
end
end
Copied: branches/rails2/app/views/announcements/feed.rxml (from rev 2737, branches/rails2/app/views/announcements/index.rxml) (0 => 2751)
--- branches/rails2/app/views/announcements/feed.rxml (rev 0)
+++ branches/rails2/app/views/announcements/feed.rxml 2011-10-24 21:01:24 UTC (rev 2751)
@@ -0,0 +1,11 @@
+xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
+ xml.channel do
+ xml.title "#{Conf.sitename} - Site Announcements"
+ xml.link announcements_url
+ xml.language "en-us"
+ xml.ttl "60"
+ xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href ="" "http://#{request.host_with_port}/open_search.xml"
+ xml.description "RSS feed listing the Announcements on #{Conf.sitename}"
+ render(:partial => "layouts/announcement", :collection => @announcements, :locals => { :xm => xml })
+ end
+end
Deleted: branches/rails2/app/views/announcements/index.rxml (2750 => 2751)
--- branches/rails2/app/views/announcements/index.rxml 2011-10-24 20:58:47 UTC (rev 2750)
+++ branches/rails2/app/views/announcements/index.rxml 2011-10-24 21:01:24 UTC (rev 2751)
@@ -1,11 +0,0 @@
-xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
- xml.channel do
- xml.title "#{Conf.sitename} - Site Announcements"
- xml.link announcements_url
- xml.language "en-us"
- xml.ttl "60"
- xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href ="" "http://#{request.host_with_port}/open_search.xml"
- xml.description "RSS feed listing the Announcements on #{Conf.sitename}"
- render(:partial => "layouts/announcement", :collection => @announcements, :locals => { :xm => xml })
- end
-end
Copied: branches/rails2/app/views/group_announcements/feed.rxml (from rev 2737, branches/rails2/app/views/group_announcements/index.rxml) (0 => 2751)
--- branches/rails2/app/views/group_announcements/feed.rxml (rev 0)
+++ branches/rails2/app/views/group_announcements/feed.rxml 2011-10-24 21:01:24 UTC (rev 2751)
@@ -0,0 +1,12 @@
+xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
+ xml.channel do
+ xml.title "#{Conf.sitename} - Public Group Announcements for address@hidden Group"
+ xml.link group_announcements_url(@group)
+ xml.language "en-us"
+ xml.ttl "60"
+ xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href ="" "http://#{request.host_with_port}/open_search.xml"
+ xml.description "RSS feed listing the Group Announcements for address@hidden Group on #{Conf.sitename}"
+ # for the feeds always display only the public announcements
+ render(:partial => "layouts/group_announcement", :collection => @group.announcements_public, :locals => { :xm => xml, :group => @group })
+ end
+end
Deleted: branches/rails2/app/views/group_announcements/index.rxml (2750 => 2751)
--- branches/rails2/app/views/group_announcements/index.rxml 2011-10-24 20:58:47 UTC (rev 2750)
+++ branches/rails2/app/views/group_announcements/index.rxml 2011-10-24 21:01:24 UTC (rev 2751)
@@ -1,12 +0,0 @@
-xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
- xml.channel do
- xml.title "#{Conf.sitename} - Public Group Announcements for address@hidden Group"
- xml.link group_announcements_url(@group)
- xml.language "en-us"
- xml.ttl "60"
- xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href ="" "http://#{request.host_with_port}/open_search.xml"
- xml.description "RSS feed listing the Group Announcements for address@hidden Group on #{Conf.sitename}"
- # for the feeds always display only the public announcements
- render(:partial => "layouts/group_announcement", :collection => @group.announcements_public, :locals => { :xm => xml, :group => @group })
- end
-end
Copied: branches/rails2/app/views/workflows/feed.rxml (from rev 2737, branches/rails2/app/views/workflows/index.rxml) (0 => 2751)
--- branches/rails2/app/views/workflows/feed.rxml (rev 0)
+++ branches/rails2/app/views/workflows/feed.rxml 2011-10-24 21:01:24 UTC (rev 2751)
@@ -0,0 +1,11 @@
+xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
+ xml.channel do
+ xml.title "#{Conf.sitename} - Latest Workflows"
+ xml.link workflows_url
+ xml.language "en-us"
+ xml.ttl "60"
+ xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href ="" "http://#{request.host_with_port}/open_search.xml"
+ xml.description "RSS feed listing the latest Workflows which have been uploaded to #{Conf.sitename}"
+ render(:partial => "layouts/workflow", :collection => @rss_workflows, :locals => { :xm => xml })
+ end
+end
Deleted: branches/rails2/app/views/workflows/index.rxml (2750 => 2751)
--- branches/rails2/app/views/workflows/index.rxml 2011-10-24 20:58:47 UTC (rev 2750)
+++ branches/rails2/app/views/workflows/index.rxml 2011-10-24 21:01:24 UTC (rev 2751)
@@ -1,11 +0,0 @@
-xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
- xml.channel do
- xml.title "#{Conf.sitename} - Latest Workflows"
- xml.link workflows_url
- xml.language "en-us"
- xml.ttl "60"
- xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href ="" "http://#{request.host_with_port}/open_search.xml"
- xml.description "RSS feed listing the latest Workflows which have been uploaded to #{Conf.sitename}"
- render(:partial => "layouts/workflow", :collection => @rss_workflows, :locals => { :xm => xml })
- end
-end