Diff
Modified: branches/event_logging/app/helpers/application_helper.rb (1986 => 1987)
--- branches/event_logging/app/helpers/application_helper.rb 2008-11-19 11:08:56 UTC (rev 1986)
+++ branches/event_logging/app/helpers/application_helper.rb 2008-11-19 11:53:44 UTC (rev 1987)
@@ -1166,12 +1166,9 @@
if controller.action_name.to_s == "index"
# all feeds on "home" page
- if !logged_in?
- feed_links << "<link href="" rel=\"alternate\" type=\"application/rss+xml\" title=\"myExperiment.org - Public News\" />"
- else
- # will have secure "My News" feed here when it's implemented
- end
+ # NOTE: will have secure "My News" feed tag here when it's implemented
+ feed_links << "<link href="" rel=\"alternate\" type=\"application/rss+xml\" title=\"myExperiment.org - Public News\" />"
feed_links << "<link href="" rel=\"alternate\" type=\"application/rss+xml\" title=\"myExperiment.org - Site Announcements\" />"
feed_links << "<link href="" rel=\"alternate\" type=\"application/rss+xml\" title=\"myExperiment.org - Latest Groups\" />"
feed_links << "<link href="" rel=\"alternate\" type=\"application/rss+xml\" title=\"myExperiment.org - Updated Items\" />"
Modified: branches/event_logging/app/views/home/_news.rhtml (1986 => 1987)
--- branches/event_logging/app/views/home/_news.rhtml 2008-11-19 11:08:56 UTC (rev 1986)
+++ branches/event_logging/app/views/home/_news.rhtml 2008-11-19 11:53:44 UTC (rev 1987)
@@ -3,16 +3,13 @@
<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">
- <%= (logged_in? ? "My News" : feed_icon_tag("myExperiment Public News", home_public_news_rss_url) + " Public News") -%>
+ <%= news_box_title -%>
</div>
<div class="content">
- <% news_for = (logged_in? ? current_user : nil) %>
- <% required_news_count = (logged_in? ? DEFAULT_USER_HOME_PAGE_NEWS_COUNT : DEFAULT_ANONYMOUS_HOME_PAGE_NEWS_COUNT) %>
- <% required_news_timeframe = (logged_in? ? DEFAULT_USER_HOME_PAGE_NEWS_TIMEFRAME : DEFAULT_ANONYMOUS_HOME_PAGE_NEWS_TIMEFRAME) %>
-
- <% viewer_id = (logged_in? ? current_user.id : "public") %>
+ <% viewer_id = ((!news_for.nil? && logged_in?) ? current_user.id : "public") %>
<% cache_timeout({ :controller => 'news', :action ="" 'home', :id => viewer_id } , NEWS_CACHE_TIMEOUT.seconds.from_now ) do -%>
- <%= render :partial => "layouts/news", :locals => { :collection => news(news_for, false, Time.now, Time.now-required_news_timeframe, required_news_count, current_user) } %>
+ <% # this is the "home" page, so current viewer of the page is the same "contributor" for which news are generated -%>
+ <%= render :partial => "layouts/news", :locals => { :collection => news(news_for, false, Time.now, Time.now-required_news_timeframe, required_news_count, news_for) } %>
<% end %>
</div>
<b class="xbottom"><b class="xb5"></b><b class="xb6"></b><b class="xb7"></b><b class="xb1"></b></b>
Modified: branches/event_logging/app/views/home/index.rhtml (1986 => 1987)
--- branches/event_logging/app/views/home/index.rhtml 2008-11-19 11:08:56 UTC (rev 1986)
+++ branches/event_logging/app/views/home/index.rhtml 2008-11-19 11:53:44 UTC (rev 1987)
@@ -2,8 +2,21 @@
<div id="tabsContainer" class="tabsContainer" style="margin-top: 2em;"></div>
+ <% if logged_in? -%>
+ <div class="tabContainer">
+ <div class="tabTitle"><b>My News</b></div>
+ <div class="tabContent">
+ <%= render :partial => 'stats' %>
+ <div style="margin-top: 1.5em;">
+ <%= render :partial => "news", :locals => {:news_box_title => "My News", :news_for => current_user, :required_news_count => DEFAULT_USER_HOME_PAGE_NEWS_COUNT, :required_news_timeframe => DEFAULT_USER_HOME_PAGE_NEWS_TIMEFRAME} %>
+ <div class="clearer"> </div>
+ </div>
+ </div>
+ </div>
+ <% end -%>
+
<div class="tabContainer">
- <div class="tabTitle"><b>Home</b></div>
+ <div class="tabTitle"><b>Public News</b></div>
<div class="tabContent">
<%= render :partial => 'stats' %>
<div style="margin-top: 1.5em;">
@@ -11,7 +24,7 @@
<%= render :partial => "announcements" %>
</div>
<div class="right">
- <%= render :partial => "news" %>
+ <%= render :partial => "news", :locals => {:news_box_title => feed_icon_tag("myExperiment Public News", home_public_news_rss_url) + " Public News", :news_for => nil, :required_news_count => DEFAULT_ANONYMOUS_HOME_PAGE_NEWS_COUNT, :required_news_timeframe => DEFAULT_ANONYMOUS_HOME_PAGE_NEWS_TIMEFRAME} %>
</div>
<div class="clearer"> </div>
</div>