Diff
Modified: branches/event_logging/app/controllers/networks_controller.rb (1941 => 1942)
--- branches/event_logging/app/controllers/networks_controller.rb 2008-11-11 14:49:50 UTC (rev 1941)
+++ branches/event_logging/app/controllers/networks_controller.rb 2008-11-11 15:34:18 UTC (rev 1942)
@@ -4,10 +4,10 @@
# See license.txt for details.
class NetworksController < ApplicationController
- before_filter :login_required, :except => [:index, :show, :search, :all]
+ before_filter :login_required, :except => [:index, :show, :search, :all, :news]
before_filter :find_networks, : [:all]
- before_filter :find_network, : [:membership_request, :show, :comment, :comment_delete, :tag]
+ before_filter :find_network, : [:membership_request, :show, :comment, :comment_delete, :tag, :news]
before_filter :find_network_auth, : [:invite, :membership_invite, :membership_invite_external, :edit, :update, :destroy]
# declare sweepers and which actions should invoke them
@@ -200,6 +200,16 @@
:network_id => @network.id
end
+ # GET /groups/1/news.rss
+ def news
+ respond_to do |format|
+ format.html { redirect_to group_path(params[:id]) }
+ format.rss do
+ render :action ="" 'news.rxml', :layout => false
+ end
+ end
+ end
+
# GET /networks
def index
respond_to do |format|
Added: branches/event_logging/app/views/layouts/_group_news_entry.rxml (0 => 1942)
--- branches/event_logging/app/views/layouts/_group_news_entry.rxml (rev 0)
+++ branches/event_logging/app/views/layouts/_group_news_entry.rxml 2008-11-11 15:34:18 UTC (rev 1942)
@@ -0,0 +1,5 @@
+xm.item do
+ xm.title "#{group_news_entry[0].strftime("%d/%m/%Y")} @ #{group_news_entry[0].strftime("%H:%M")} - #{strip_html(group_news_entry[1])}"
+ xm.description white_list(group_news_entry[1])
+ xm.pubDate group_news_entry[0].rfc822
+end
\ No newline at end of file
Added: branches/event_logging/app/views/networks/news.rxml (0 => 1942)
--- branches/event_logging/app/views/networks/news.rxml (rev 0)
+++ branches/event_logging/app/views/networks/news.rxml 2008-11-11 15:34:18 UTC (rev 1942)
@@ -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 "myExperiment.org - Public News for \"address@hidden" Group"
+ xml.link group_path(@network)
+ 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 public group news for address@hidden Group on myExperiment.org"
+ # for the feeds always display only the public announcements
+ render(:partial => "layouts/group_news_entry", :collection => news_from_log_for_contributor(@network, Time.now, Time.now-DEFAULT_PUBLIC_NEWS_RSS_TIMEFRAME, true, false, DEFAULT_PUBLIC_NEWS_RSS_COUNT, nil), :locals => { :xm => xml, :group => @network })
+ end
+end
\ No newline at end of file
Modified: branches/event_logging/app/views/networks/show.rhtml (1941 => 1942)
--- branches/event_logging/app/views/networks/show.rhtml 2008-11-11 14:49:50 UTC (rev 1941)
+++ branches/event_logging/app/views/networks/show.rhtml 2008-11-11 15:34:18 UTC (rev 1942)
@@ -147,7 +147,7 @@
<a name="news"></a>
<div class="tabContainer">
- <div class="tabTitle">News</div>
+ <div class="tabTitle"><%= feed_icon_tag("\"address@hidden" Group public news", formatted_news_group_path(@network, :rss)) -%> News</div>
<div class="tabContent">
<% benchmark "Group page news feed" do %>
<% viewer_id = (logged_in? ? current_user.id : "public") -%>
Modified: branches/event_logging/config/routes.rb (1941 => 1942)
--- branches/event_logging/config/routes.rb 2008-11-11 14:49:50 UTC (rev 1941)
+++ branches/event_logging/config/routes.rb 2008-11-11 15:34:18 UTC (rev 1942)
@@ -188,7 +188,8 @@
:comment => :post,
:comment_delete => :delete,
:rate => :post,
- :tag => :post } do |group|
+ :tag => :post,
+ :news => :get } do |group|
# relationships 'accepted by' group (relation --> relationship --> group)
group.resources :relationships, :member => { :accept => :get }
group.resources :announcements, :controller => :group_announcements