Diff
Modified: branches/event_logging/app/views/home/_news.rhtml (1915 => 1916)
--- branches/event_logging/app/views/home/_news.rhtml 2008-11-03 11:46:41 UTC (rev 1915)
+++ branches/event_logging/app/views/home/_news.rhtml 2008-11-03 14:46:43 UTC (rev 1916)
@@ -1,4 +1,5 @@
<!-- News -->
+<% benchmark "Home page news feed" do %>
<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">
@@ -15,3 +16,4 @@
</div>
<b class="xbottom"><b class="xb5"></b><b class="xb6"></b><b class="xb7"></b><b class="xb1"></b></b>
</div>
+<% end %>
Modified: branches/event_logging/app/views/networks/show.rhtml (1915 => 1916)
--- branches/event_logging/app/views/networks/show.rhtml 2008-11-03 11:46:41 UTC (rev 1915)
+++ branches/event_logging/app/views/networks/show.rhtml 2008-11-03 14:46:43 UTC (rev 1916)
@@ -149,7 +149,9 @@
<div class="tabContainer">
<div class="tabTitle">News</div>
<div class="tabContent">
- <%= render :partial => "layouts/news", :locals => { :collection => news(@network, true, Time.now, Time.now-DEFAULT_GROUP_NEWS_TIMEFRAME, DEFAULT_GROUP_NEWS_COUNT, current_user) } %>
+ <% benchmark "Group page news feed" do %>
+ <%= render :partial => "layouts/news", :locals => { :collection => news(@network, true, Time.now, Time.now-DEFAULT_GROUP_NEWS_TIMEFRAME, DEFAULT_GROUP_NEWS_COUNT, current_user) } %>
+ <% end %>
</div>
</div>
Modified: branches/event_logging/app/views/users/show.rhtml (1915 => 1916)
--- branches/event_logging/app/views/users/show.rhtml 2008-11-03 11:46:41 UTC (rev 1915)
+++ branches/event_logging/app/views/users/show.rhtml 2008-11-03 14:46:43 UTC (rev 1916)
@@ -353,9 +353,10 @@
<% tabnav :user do %>
<% case @tab; when "News" %>
-
- <%= render :partial => "layouts/news", :locals => { :collection => news(@user, true, Time.now, Time.now-DEFAULT_USER_NEWS_TIMEFRAME, DEFAULT_USER_NEWS_COUNT, current_user) } %>
-
+ <% benchmark "User profile page news feed" do %>
+ <%= render :partial => "layouts/news", :locals => { :collection => news(@user, true, Time.now, Time.now-DEFAULT_USER_NEWS_TIMEFRAME, DEFAULT_USER_NEWS_COUNT, current_user) } %>
+ <% end %>
+
<% when "Friends" %>
<div>