Diff
Modified: branches/event_logging/app/controllers/home_controller.rb (1960 => 1961)
--- branches/event_logging/app/controllers/home_controller.rb 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/controllers/home_controller.rb 2008-11-13 12:11:50 UTC (rev 1961)
@@ -6,7 +6,6 @@
class HomeController < ApplicationController
before_filter :find_latest_public_updated_items_rss, : [:updated_items_rss]
- before_filter :find_latest_tags_rss, : [:latest_tags_rss]
before_filter :find_latest_comments_rss, : [:latest_comments_rss]
before_filter :find_latest_reviews_rss, : [:latest_reviews_rss]
@@ -32,23 +31,7 @@
end
end
end
-
- def latest_groups_rss
- respond_to do |format|
- format.rss do
- render :action ="" 'latest_groups.rxml', :layout => false
- end
- end
- end
-
- def latest_tags_rss
- respond_to do |format|
- format.rss do
- render :action ="" 'latest_tags.rxml', :layout => false
- end
- end
- end
-
+
def latest_comments_rss
respond_to do |format|
format.rss do
@@ -82,18 +65,6 @@
end
end
- def find_latest_tags_rss
- # Only carry out if request is for RSS
- if params[:format] and params[:format].downcase == 'rss'
- @latest_tags_rss = {}
- taggings = Tagging.latest(DEFAULT_RSS_ENTRY_COUNT)
- taggings.each do |t|
- # tagged item should be authorized for anonymous users to view
- @latest_tags_rss[t] = t.taggable if t.taggable.authorized?("show", nil)
- end
- end
- end
-
def find_latest_comments_rss
# Only carry out if request is for RSS
if params[:format] and params[:format].downcase == 'rss'
Modified: branches/event_logging/app/controllers/networks_controller.rb (1960 => 1961)
--- branches/event_logging/app/controllers/networks_controller.rb 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/controllers/networks_controller.rb 2008-11-13 12:11:50 UTC (rev 1961)
@@ -225,6 +225,9 @@
def index
respond_to do |format|
format.html # index.rhtml
+ format.rss do # RSS feed with latest groups
+ render :action ="" 'index.rxml', :layout => false
+ end
end
end
@@ -375,9 +378,9 @@
# on 'show' page "contributions/table" partial takes care of authorization of each item
if params[:format] and params[:format].downcase == 'rss'
@shared_items_rss = []
- shared_items = @network.shared_contributables
+ shared_items_rss = @network.shared_contributables
- shared_items.each do |item|
+ shared_items_rss.each do |item|
# should be authorized for anonymous users
@shared_items_rss << item if item.authorized?("show", nil)
end
Modified: branches/event_logging/app/controllers/tags_controller.rb (1960 => 1961)
--- branches/event_logging/app/controllers/tags_controller.rb 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/controllers/tags_controller.rb 2008-11-13 12:11:50 UTC (rev 1961)
@@ -5,6 +5,7 @@
class TagsController < ApplicationController
before_filter :find_tags, : [:index]
+ before_filter :find_latest_tags_rss, : [:index]
before_filter :find_tag_and_tagged_with, : [:show]
helper ActsAsTaggableHelper
@@ -12,6 +13,9 @@
def index
respond_to do |format|
format.html # index.rhtml
+ format.rss do # RSS feed with latest tags
+ render :action ="" 'index.rxml', :layout => false
+ end
end
end
@@ -75,6 +79,18 @@
end
end
+ def find_latest_tags_rss
+ # Only carry out if request is for RSS
+ if params[:format] and params[:format].downcase == 'rss'
+ @latest_tags_rss = {}
+ taggings = Tagging.latest(DEFAULT_RSS_ENTRY_COUNT)
+ taggings.each do |t|
+ # tagged item should be authorized for anonymous users to view
+ @latest_tags_rss[t] = t.taggable if t.taggable.authorized?("show", nil)
+ end
+ end
+ end
+
private
def error(notice, message, attr=:id)
Modified: branches/event_logging/app/views/home/_latest_groups.rhtml (1960 => 1961)
--- branches/event_logging/app/views/home/_latest_groups.rhtml 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/views/home/_latest_groups.rhtml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -3,7 +3,7 @@
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
<div class="box_title">
- <%= feed_icon_tag("Latest groups on myExperiment", home_latest_groups_rss_url) -%> Latest Groups
+ <%= feed_icon_tag("Latest Groups on myExperiment", formatted_groups_path(:rss)) -%> Latest Groups
</div>
<div class="content">
<% unless (groups = Network.recently_created(10)).empty? %>
Modified: branches/event_logging/app/views/home/_latest_tags.rhtml (1960 => 1961)
--- branches/event_logging/app/views/home/_latest_tags.rhtml 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/views/home/_latest_tags.rhtml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -3,7 +3,7 @@
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
<div class="box_title">
- <%= feed_icon_tag("Latest Tags on myExperiment", home_latest_tags_rss_url) -%> Latest Tags
+ <%= feed_icon_tag("Latest Tags on myExperiment", formatted_tags_path(:rss)) -%> Latest Tags
</div>
<div class="content">
<% unless (taggings = Tagging.latest(20)).empty? %>
Deleted: branches/event_logging/app/views/home/latest_groups.rxml (1960 => 1961)
--- branches/event_logging/app/views/home/latest_groups.rxml 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/views/home/latest_groups.rxml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -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 "myExperiment.org - Latest Groups"
- xml.link url_for(:controller => 'home', :action ="" 'index')
- 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 most recently created groups on myExperiment.org"
- render(:partial => "layouts/network", :collection => Network.recently_created(LATEST_GROUPS_RSS_ENTRY_COUNT), :locals => { :xm => xml })
- end
-end
\ No newline at end of file
Deleted: branches/event_logging/app/views/home/latest_tags.rxml (1960 => 1961)
--- branches/event_logging/app/views/home/latest_tags.rxml 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/views/home/latest_tags.rxml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -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 "myExperiment.org - Latest Tags"
- xml.link url_for(:controller => 'home', :action ="" 'index')
- 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 most recently added tags on myExperiment.org"
- render(:partial => "layouts/tagging", :collection => @latest_tags_rss, :locals => { :xm => xml })
- end
-end
\ No newline at end of file
Modified: branches/event_logging/app/views/networks/index.rhtml (1960 => 1961)
--- branches/event_logging/app/views/networks/index.rhtml 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/views/networks/index.rhtml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -22,7 +22,7 @@
<% unless (recent = Network.recently_created).empty? %>
<div class="tabContainer">
- <div class="tabTitle">Most Recent</div>
+ <div class="tabTitle"><%= feed_icon_tag("Latest Groups on myExperiment", formatted_groups_path(:rss)) -%> Most Recent</div>
<div class="tabContent">
<%= render :partial => "networks/table", :locals => { :collection => recent } %>
</div>
Added: branches/event_logging/app/views/networks/index.rxml (0 => 1961)
--- branches/event_logging/app/views/networks/index.rxml (rev 0)
+++ branches/event_logging/app/views/networks/index.rxml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -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 "myExperiment.org - Latest Groups"
+ xml.link groups_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 most recently created groups on myExperiment.org"
+ render(:partial => "layouts/network", :collection => Network.recently_created(LATEST_GROUPS_RSS_ENTRY_COUNT), :locals => { :xm => xml })
+ end
+end
\ No newline at end of file
Modified: branches/event_logging/app/views/tags/index.rhtml (1960 => 1961)
--- branches/event_logging/app/views/tags/index.rhtml 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/app/views/tags/index.rhtml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -1,3 +1,3 @@
-<h1>All Tags on myExperiment</h1>
+<h1><%= feed_icon_tag("Latest Tags on myExperiment", formatted_tags_path(:rss)) -%> All Tags on myExperiment</h1>
<%= tag_cloud_from_collection(@tags) %>
\ No newline at end of file
Added: branches/event_logging/app/views/tags/index.rxml (0 => 1961)
--- branches/event_logging/app/views/tags/index.rxml (rev 0)
+++ branches/event_logging/app/views/tags/index.rxml 2008-11-13 12:11:50 UTC (rev 1961)
@@ -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 "myExperiment.org - Latest Tags"
+ xml.link tags_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 most recently added tags on myExperiment.org"
+ render(:partial => "layouts/tagging", :collection => @latest_tags_rss, :locals => { :xm => xml })
+ end
+end
\ No newline at end of file
Modified: branches/event_logging/config/routes.rb (1960 => 1961)
--- branches/event_logging/config/routes.rb 2008-11-13 11:36:47 UTC (rev 1960)
+++ branches/event_logging/config/routes.rb 2008-11-13 12:11:50 UTC (rev 1961)
@@ -237,8 +237,6 @@
map.home_public_news_rss 'home/public_news.rss', :controller => 'home', :action ="" 'public_news_rss', :format => 'rss'
map.home_updated_items_rss 'home/updated_items.rss', :controller => 'home', :action ="" 'updated_items_rss', :format => 'rss'
- map.home_latest_groups_rss 'home/latest_groups.rss', :controller => 'home', :action ="" 'latest_groups_rss', :format => 'rss'
- map.home_latest_tags_rss 'home/latest_tags.rss', :controller => 'home', :action ="" 'latest_tags_rss', :format => 'rss'
map.home_latest_comments_rss 'home/latest_comments.rss', :controller => 'home', :action ="" 'latest_comments_rss', :format => 'rss'
map.home_latest_reviews_rss 'home/latest_reviews.rss', :controller => 'home', :action ="" 'latest_reviews_rss', :format => 'rss'