Diff
Modified: branches/event_logging/app/views/home/public_news.rxml (1961 => 1962)
--- branches/event_logging/app/views/home/public_news.rxml 2008-11-13 12:11:50 UTC (rev 1961)
+++ branches/event_logging/app/views/home/public_news.rxml 2008-11-13 14:00:13 UTC (rev 1962)
@@ -7,6 +7,6 @@
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 public activities on myExperiment.org"
- render(:partial => "layouts/public_news_entry", :collection => news_from_log_public(Time.now, Time.now-DEFAULT_PUBLIC_NEWS_RSS_TIMEFRAME, DEFAULT_PUBLIC_NEWS_RSS_COUNT, nil), :locals => { :xm => xml })
+ render(:partial => "layouts/news_entry", :collection => news_from_log_public(Time.now, Time.now-DEFAULT_PUBLIC_NEWS_RSS_TIMEFRAME, DEFAULT_PUBLIC_NEWS_RSS_COUNT, nil), :locals => { :xm => xml })
end
end
\ No newline at end of file
Deleted: branches/event_logging/app/views/layouts/_group_news_entry.rxml (1961 => 1962)
--- branches/event_logging/app/views/layouts/_group_news_entry.rxml 2008-11-13 12:11:50 UTC (rev 1961)
+++ branches/event_logging/app/views/layouts/_group_news_entry.rxml 2008-11-13 14:00:13 UTC (rev 1962)
@@ -1,5 +0,0 @@
-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
Copied: branches/event_logging/app/views/layouts/_news_entry.rxml (from rev 1955, branches/event_logging/app/views/layouts/_public_news_entry.rxml) (0 => 1962)
--- branches/event_logging/app/views/layouts/_news_entry.rxml (rev 0)
+++ branches/event_logging/app/views/layouts/_news_entry.rxml 2008-11-13 14:00:13 UTC (rev 1962)
@@ -0,0 +1,5 @@
+xm.item do
+ xm.title "#{news_entry[0].strftime("%d/%m/%Y")} @ #{news_entry[0].strftime("%H:%M")} - #{strip_html(news_entry[1])}"
+ xm.description white_list(news_entry[1])
+ xm.pubDate news_entry[0].rfc822
+end
\ No newline at end of file
Deleted: branches/event_logging/app/views/layouts/_public_news_entry.rxml (1961 => 1962)
--- branches/event_logging/app/views/layouts/_public_news_entry.rxml 2008-11-13 12:11:50 UTC (rev 1961)
+++ branches/event_logging/app/views/layouts/_public_news_entry.rxml 2008-11-13 14:00:13 UTC (rev 1962)
@@ -1,5 +0,0 @@
-xm.item do
- xm.title "#{public_news_entry[0].strftime("%d/%m/%Y")} @ #{public_news_entry[0].strftime("%H:%M")} - #{strip_html(public_news_entry[1])}"
- xm.description white_list(public_news_entry[1])
- xm.pubDate public_news_entry[0].rfc822
-end
\ No newline at end of file
Modified: branches/event_logging/app/views/networks/news.rxml (1961 => 1962)
--- branches/event_logging/app/views/networks/news.rxml 2008-11-13 12:11:50 UTC (rev 1961)
+++ branches/event_logging/app/views/networks/news.rxml 2008-11-13 14:00:13 UTC (rev 1962)
@@ -6,6 +6,6 @@
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"
- 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 })
+ render(:partial => "layouts/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