backlog 0.36.2 → 0.37.1

data/app/models/work_lock_nagger.rb

@@ -1,5 +1,5 @@
 class WorkLockNagger
-  include ActionController::UrlWriter
+  include Rails.application.routes.url_helpers
   
   def initialize(start_delay = 1)
     @start_delay = start_delay

data/app/models/works_report_filter.rb

@@ -1,18 +1,18 @@
 class WorksReportFilter < ReportFilter
-  attr_reader :backlog_id
+  attr_reader :project_id
   attr_reader :invoice
   attr_reader :user_id
   
   def initialize(attributes)
-    @backlog_id = nil
+    @project_id = nil
     @invoice = nil
     @user_id = nil
 
     if attributes
       attributes = attributes.clone
       
-      backlog_id_param = attributes.delete(:backlog_id)
-      @backlog_id = backlog_id_param.to_i if backlog_id_param && backlog_id_param.size > 0
+      project_id_param = attributes.delete(:project_id)
+      @project_id = project_id_param.to_i if project_id_param && project_id_param.size > 0
       
       invoice_param = attributes.delete(:invoice)
       @invoice = invoice_param == 'true' if invoice_param && invoice_param.size > 0

data/app/views/customers/_name_list.rhtml

@@ -1,4 +1,4 @@
-<ul class="backlogs">
+<ul class="projects">
 <% for customer in @customers do -%>
   <li class="task"><div class="name"><%=h customer.name %></div></li>
 <% end -%>

data/app/views/layouts/_headers.rhtml

@@ -2,7 +2,7 @@
   <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
   <meta http-equiv="content-language" content="en" />
   <meta name="description" content="<%=@page_title || @application_description%>" />
-  <meta name="keywords" content="backlog, project, project management, todo list, time sheet" />
+  <meta name="keywords" content="project, project, project management, todo list, time sheet" />
   <meta http-equiv="pragma" content="no-cache" />
   <meta name="robots" content="index,follow" />
   <meta name="rating" content="general" />
@@ -20,4 +20,5 @@
   <%= javascript_include_tag "effects" %>
   <%= javascript_include_tag "controls" %>
   <%= javascript_include_tag "dragdrop" %>
+  <%= javascript_include_tag :defaults %>
   <%#= javascript_include_tag "ruby" %>

data/app/views/layouts/_left_top.rhtml

@@ -1,30 +1,33 @@
-    <div id="navbar">
-      <span style="float: left"><%=link_to "#{l :backlog} #{APP::VERSION}", 'http://rubyforge.org/projects/backlog'%></span>
-      <span style="float: left"><form action="<%=url_for :controller => 'search', :action => :results%>"><%=text_field_tag :q, @search || l(:search), :onfocus => "if (value == '#{l(:search)}') value='' "%><%=submit_tag :search, :style => 'display: none'%></form></span>
-      <span style="float: left; margin-left: 5px; font-weight: bold"><%=Time.new.strftime('%Y-%m-%d %H:%M')%></span>
-      <%= link_to l(:home), url_for('/') %>
-      
-      <% if user? %>
-      | <%= link_to l(:backlogs), :controller => 'backlogs', :action => :list %>
-      | <%= link_to l(:log_out), :controller => 'user', :action => :logout %>
-      <% else %>
-      | <%= detour_to l(:log_in), :controller => 'user', :action => :login %>
-      <% end %>
-<!--      | <%= link_to l(:administration), :controller => 'administration', :action => :index %> -->
-      <% if user? %>| <%=link_to user.email, :controller => 'user', :action => :edit%><% end %>
-    </div>
-    <div id="header">
-      <%=render :partial => '/layouts/notice'%>
-      <%= error_messages_for :backlog %>
-      <%= error_messages_for :estimate %>
-      <%= error_messages_for :group %>
-      <%= error_messages_for :period %>
-      <%= error_messages_for :task %>
-      <%= error_messages_for :user %>
-      <%= error_messages_for :work %>
+<form action="<%= url_for :controller => 'search', :action => :results %>">
+  <div id="navbar">
+    <span style="float: left"><%= link_to "#{l :project} #{APP::VERSION}", 'http://rubyforge.org/projects/project' %></span>
+    <span style="float: left"><%= text_field_tag :q, @search || l(:search), :onfocus => "if (value == '#{l(:search)}') value='' " %><%= submit_tag :search, :style => 'display: none' %></span>
+    <span style="float: left; margin-left: 5px; font-weight: bold"><%= Time.new.strftime('%Y-%m-%d %H:%M') %></span>
+    <%= link_to l(:home), url_for('/') %>
 
-      <div id="introtext">
-        <h1><%=@application_title%></h1>
-        <h3><%=@page_title || @application_description%></h3>
-      </div>
-    </div>
+    <% if user? %>
+        | <%= link_to l(:projects), :controller => 'projects', :action => :list %>
+        | <%= link_to l(:log_out), :controller => 'user', :action => :logout %>
+    <% else %>
+        | <%= detour_to l(:log_in), :controller => 'user', :action => :login %>
+    <% end %>
+    <!--      | <%= link_to l(:administration), :controller => 'administration', :action => :index %> -->
+    <% if user? %>| <%= link_to user.email, :controller => 'user', :action => :edit %>
+    <% end %>
+  </div>
+</form>
+<div id="header">
+  <%= render :partial => '/layouts/notice' %>
+  <%= error_messages_for :project %>
+  <%= error_messages_for :estimate %>
+  <%= error_messages_for :group %>
+  <%= error_messages_for :period %>
+  <%= error_messages_for :task %>
+  <%= error_messages_for :user %>
+  <%= error_messages_for :work %>
+
+  <div id="introtext">
+    <h1><%= @application_title %></h1>
+    <h3><%= @page_title || @application_description %></h3>
+  </div>
+</div>

data/app/views/layouts/_shortcuts.rhtml

@@ -1,16 +1,22 @@
 <% if @shortcuts %>
     <div class="rblock">
       <div class="btitle">
-        <h4><%=l :shortcuts %></h4>
+        <h4><%= l :shortcuts %></h4>
       </div>
       <table>
-  <% @shortcuts.each_with_index do |shortcut, index| %>
-    <% if shortcut[:options] %>
-        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=detour_to l(shortcut[:function]), shortcut[:options], :id => shortcut[:function], :tabindex => index+100 %></td></tr>
-    <% else %>
-        <tr><td valign="top"><%= shortcut[:key]%></td><td><%=l shortcut[:function] %></td></tr>
-    <% end %>
-  <% end %>
+        <% @shortcuts.each_with_index do |shortcut, index| %>
+            <% if shortcut[:options] %>
+                <tr>
+                  <td valign="top"><%= shortcut[:key] %></td>
+                  <td><%= detour_to l(shortcut[:function]), shortcut[:options], :id => shortcut[:function], :tabindex => index+100 %></td>
+                </tr>
+            <% else %>
+                <tr>
+                  <td valign="top"><%= shortcut[:key] %></td>
+                  <td><%= l shortcut[:function] %></td>
+                </tr>
+            <% end %>
+        <% end %>
       </table>
     </div>
-  <% end %>
+<% end %>

data/app/views/layouts/_shortcuts_js.rhtml

@@ -1,11 +1,11 @@
-<script type="text/javascript">
+<%=javascript_tag do %>
 function handlePageEvent(event) {
   if (event.altKey && event.shiftKey && event.charCode == 110) {
     window.location = '<%=url_for(:controller => 'periods', :action => :new)%>';
   } else if (event.altKey && event.ctrlKey && event.charCode == 110) {
-    window.location = '<%=url_for(:controller => 'backlogs', :action => :new ) %>';
+    window.location = '<%=url_for(:controller => 'projects', :action => :new ) %>';
   } else if (event.altKey && event.charCode == 110) {
-    window.location = '<%=url_for(:controller => 'tasks', :action => :new, :task => {:backlog_id => (@backlog ? @backlog.id : nil), :period_id => (@period ? @period.id : nil)} ) %>';
+    window.location = '<%=url_for(:controller => 'tasks', :action => :new, :task => {:project_id => (@project ? @project.id : nil), :period_id => (@period ? @period.id : nil)} ) %>';
   } else if (event.altKey && event.ctrlKey && event.charCode == 103) {
     window.location = '<%=url_for(:controller => 'groups', :action => :new ) %>';
   } else if (event.shiftKey && event.altKey && event.charCode == 100) {
@@ -16,4 +16,4 @@ function handlePageEvent(event) {
      //alert("shift: " + event.shiftKey + ", alt: " + event.altKey + ", ctrl: " + event.ctrlKey + ", " + event.charCode + ", " + event.keyCode);
   }
 }
-</script>
+<% end %>

data/app/views/layouts/mwrt002.html.erb

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <%= render :partial => '/layouts/headers' %>
+  <%= render :partial => '/layouts/shortcuts_js' %>
+</head>
+
+<body onkeypress="handlePageEvent(event);">
+<div id="wrap">
+  <div id="leftcol">
+    <%= render :partial => '/layouts/left_top' %>
+    <div id="content">
+      <%= yield %>
+    </div>
+  </div>
+  <div id="rightcol">
+    <%= render :partial => '/layouts/shortcuts' %>
+    <% @sidebars = @sidebar.blocks(@period) %>
+    <% if @sidebars %>
+        <% @sidebars.each do |sidebar| %>
+            <div class="rblock" id="sidebar_<%= sidebar[:id] %>">
+              <div class="btitle">
+                <% if sidebar[:options] %>
+                    <h4><%= link_to h(sidebar[:title]), sidebar[:options] %></h4>
+                <% else %>
+                    <h4><%= h(sidebar[:title]) %></h4>
+                <% end %>
+              </div>
+              <%= sidebar[:content] %>
+            </div>
+        <% end %>
+    <% end %>
+  </div>
+  <div id="footer">
+    <div id="footertext">Copyright &copy; 2006 Kubosch Consulting | All Rights Reserved<br/>Design By
+      <a href="http://mywebresource.com" title="Design By MyWebResource">MyWebResource</a> |
+      <a href="http://validator.w3.org/check?uri=referer" title="W3C XHTML 1.0 Strict Compliant">W3C XHTML 1.0</a> |
+      <a href="http://jigsaw.w3.org/css-validator/" title="W3C CSS 2.0 Compliant">W3C CSS 2.0</a></div>
+  </div>
+</div>
+</body>
+</html>

data/app/views/periods/_burn_down_chart.rhtml

@@ -3,7 +3,7 @@
         <h4><%=l :burn_down_chart %></h4>
       </div>
 
-<%= link_to %Q{<img id="burn_down_chart" src="#{url_for(:controller => 'periods', :action => :burn_down_chart_thumbnail, :id => @period, :format => :png)}" alt="Burn down chart" />}, :controller => 'periods', :action => :burn_down_chart, :id => @period, :format => :png %>
+<%= link_to %Q{<img id="burn_down_chart" src="#{url_for(:controller => 'periods', :action => :burn_down_chart_thumbnail, :id => @period, :format => :png)}" alt="Burn down chart" />}.html_safe, :controller => 'periods', :action => :burn_down_chart, :id => @period, :format => :png %>
 
 
     </div>

data/app/views/periods/_show_active.rhtml

@@ -1,6 +1,6 @@
   <%=render :partial => 'title' %>
 
-<!-- TODO: Insert backlog logo here
+<!-- TODO: Insert project logo here
 <img src="/images/blank.jpg" width="100" height="100" alt="Place An Alternate Description Here!" longdesc="image-description.txt" />
 <a href="image-description.txt" class="dlink" title="Place An Alternate Description Here!"></a>
 -->
@@ -33,14 +33,14 @@ function handleEvent(field, event, id) {
 
 
 <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty?%>>
-    <%=render :partial => '/tasks/fields_header', :locals => { :backlog => nil, :active => true, :track_todo => @tasks.find {|t|t.period && t.period.active?}, :track_times => @tasks.find {|t|t.period && t.period.active?}, :track_done => @tasks.find {|t|t.period && t.period.active? }, :work_done => @tasks.find {|t| t.total_done > 0} } %>
+    <%=render :partial => '/tasks/fields_header', :locals => { :project => nil, :active => true, :track_todo => @tasks.find {|t|t.period && t.period.active?}, :track_times => @tasks.find {|t|t.period && t.period.active?}, :track_done => @tasks.find {|t|t.period && t.period.active? }, :work_done => @tasks.find {|t| t.total_done > 0} } %>
 	<ul id="active_tasks_<%=@period.id%>" class="task_list">
 		<% max_depth = @tasks.map{|t|t.depth}.max %>
 		<% for task in @tasks -%>
 			<% next if @show_only_grabbed_tasks && !(task.users.empty? || task.users.include?(current_user))%>
   			<%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, 
 					:active => true, :highlight_task => (task == @selected_task), 
-					:update => :spotlight, :show_backlog => true, :hidden => false,
+					:update => :spotlight, :show_project => true, :hidden => false,
 					:max_depth => max_depth} %>
   			<% i += 1 %>
   		<% end -%>

data/app/views/periods/_title.rhtml

@@ -6,7 +6,7 @@
         <%=detour_to(image_tag(url_for(@period.party.to_sym.to_s + ".png"), :alt => l(@period.party.to_sym), :title => l(@period.party.to_sym), :class => 'image-submit'), :controller => @period.party.controller, :action => :edit, :id => @period.party) %>
 
         <%=if @period.higher_item then link_to(image_tag(url_for("arrow_left.png"), :alt => "#{l :previous} #{l :period}", :title => "#{l :previous} #{l :period}", :class => 'image-submit'), :controller => 'periods', :action => :show, :id => @period.higher_item) end%>
-        <%=unless @period.passed? then detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:period_id => (@period ? @period.id : (@backlog && @backlog.periods.first ? @backlog.periods.first.id : nil))} ) end %>
+        <%=unless @period.passed? then detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:period_id => (@period ? @period.id : (@project && @project.periods.first ? @project.periods.first.id : nil))} ) end %>
         <h4><%=h @period.name %> (<%=@period.start_on%> - <%=@period.end_on%>)
 			<% filter_style = {:style => 'float: none; vertical-align: bottom'} %>
 			<% if @show_only_grabbed_tasks %>

data/app/views/{backlogs → projects}/_buttons.rhtml

@@ -1,4 +1,4 @@
-    	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
-        <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog) unless controller.action_name == 'edit' %>
-        <%=image_detour_to('hammer.png', l(:work), :controller => 'works', :action => :list, :report_filter => {:backlog_id => @backlog.id}) %>
-        <%=detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:backlog_id => @backlog.id} ) %>
+    	<%=image_link_to 'arrow_up.png', l(:projects), :action => :list %>
+        <%=image_detour_to('clipboard.png', l(:edit), :controller => 'projects', :action => :edit, :id => @project) unless controller.action_name == 'edit' %>
+        <%=image_detour_to('hammer.png', l(:work), :controller => 'works', :action => :list, :report_filter => {:project_id => @project.id}) %>
+        <%=detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:project_id => @project.id} ) %>

data/app/views/projects/_form.rhtml

@@ -0,0 +1,44 @@
+<!--[form:task]-->
+<p>
+<label for="project_name"><%=l :name%></label><br/>
+<%= text_field 'project', 'name', :maxlength => 64 %>
+</p>
+
+<h3>Options</h3>
+
+<p>
+<%= check_box 'project', 'track_times'  %>
+<label for="project_track_times"><%=l :track_times%></label>
+</p>
+
+<p>
+<%= check_box 'project', 'track_todo'  %>
+<label for="project_track_todo"><%=l :track_todo%></label>
+</p>
+
+<p>
+<%= check_box 'project', 'enable_subtasks'  %>
+<label for="project_enable_subtasks"><%=l :enable_subtasks%></label>
+</p>
+
+<p>
+<%= check_box 'project', 'enable_periods'  %>
+<label for="project_enable_periods"><%=l :enable_periods%></label>
+</p>
+
+<p>
+<%= check_box 'project', 'enable_customer'  %>
+<label for="project_enable_customer"><%=l :enable_customer%></label>
+</p>
+
+<p>
+<%= check_box 'project', 'enable_users'  %>
+<label for="project_enable_users"><%=l :enable_users%></label>
+</p>
+
+<!--[eoform:task]-->
+
+
+<script type="text/JavaScript">
+document.getElementById('project_name').focus();
+</script>

data/app/views/projects/_name_list.rhtml

@@ -0,0 +1,5 @@
+<ul class="projects">
+<% for project in @projects do -%>
+  <li class="task"><div class="name"><%=h project.name %></div></li>
+<% end -%>
+</ul>

data/app/views/projects/edit.rhtml

@@ -0,0 +1,14 @@
+<% @page_title = "#{l(:editing)} #{l(:project)}" %>
+
+<div id="spotlight">
+    <div class="btitle">
+    	<%=render :partial => 'buttons'%>
+		<h4><%=@project.name%></h4>
+    </div>
+
+  <% form_tag :action => 'update', :id => @project do %>
+    <%=render :partial => 'form' %>
+    <%=submit_tag l(:save) %>
+    <%=back_or_link_to l(:back), :action => 'show', :id => @project %>
+  <% end %>
+</div>

data/app/views/projects/list.rhtml

@@ -0,0 +1,16 @@
+<% @page_title = "#{l(:listing)} #{l(:projects)}" %>
+
+<div id="spotlight">
+    <div class="btitle">
+      <h4><%=l :projects%></h4>
+    </div>
+        
+    <table>
+      <% i = 0 %>
+      <% for @project in @projects %>
+	  	<tr>
+	  		<td><%=link_to @project.name, :action => :show, :id => @project.id%></td>
+	  	</tr>
+      <% end %>
+    </table>
+</div>

data/app/views/{backlogs → projects}/new.rhtml

@@ -1,4 +1,4 @@
-<% @page_title = l :new_backlog %>
+<% @page_title = l :new_project %>
 
 <div id="spotlight">
 

data/app/views/{backlogs → projects}/show.rhtml

@@ -1,9 +1,9 @@
-<%@page_title = @backlog.name %>
+<%@page_title = @project.name %>
 <div id="spotlight">
     <div class="btitle">
         <%=render :partial => 'buttons' %><h4><%=l :tasks %></h4>
     </div>
-    <div id="active_tasks"<%=' style="display: none;"' unless @tasks and not @tasks.empty? %>>
+    <div id="active_tasks"<%=' style="display: none;"'.html_safe unless @tasks and not @tasks.empty? %>>
 		<%i = 0 %>
 		<% periods = @tasks.map {|t| t.period}.uniq %>
 		<% list_ids = periods.map {|period| "active_tasks_#{period && period.id}"} %>
@@ -11,11 +11,11 @@
 		    <% tasks_in_period = @tasks.select {|t| t.period_id == (period && period.id)} %>
 			<% work_done = !tasks_in_period.find{|t| t.total_done > 0}.nil? %>
 			<div id="active_period_<%=period && period.id%>">
-          	<%=render :partial => '/tasks/period_header', :locals => {:period => period} if @backlog.enable_periods %>
-			<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => true, :track_todo => @backlog.track_todo?, :track_done => @backlog.track_done?, :track_times => tasks_in_period.find {|t|t.period && t.period.active?}, :work_done => work_done} %>
+          	<%=render :partial => '/tasks/period_header', :locals => {:period => period} if @project.enable_periods %>
+			<%=render :partial => '/tasks/fields_header', :locals => {:project => @project, :active => true, :track_todo => @project.track_todo?, :track_done => @project.track_done?, :track_times => tasks_in_period.find {|t|t.period && t.period.active?}, :work_done => work_done} %>
         	<ul id="active_tasks_<%=period && period.id%>" class="task_list">
 				<%for @task in tasks_in_period %>
-					<%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :show_backlog => false, :hidden => false} %>
+					<%=render :partial => '/tasks/task/', :locals => {:task => @task, :i => i += 1, :active => true, :highlight_task => false, :update => :maincontent, :show_project => false, :hidden => false} %>
 				<%end %>
         	</ul>
 			</div>
@@ -25,7 +25,7 @@
         <%=sortable_element list_id, :url => { :action => :order }, :containment => list_ids, :constraint => false, :dropOnEmpty => true %>
     <% end %>
     <p id="no_tasks_message"<%=' style="display: none;"' if @tasks and not @tasks.empty? %>>
-        <%=l :no_pending_tasks_in_backlog %>
+        <%=l :no_pending_tasks_in_project %>
     </p>
     <%=back_or_link_to(l(:back)) %>
 </div>

data/app/views/search/results.rhtml

@@ -2,11 +2,11 @@
 
 <div id="lfeature">
   <div class="btitle">
-    <h4><%=l(:backlogs) %></h4>
+    <h4><%=l(:projects) %></h4>
   </div>
 <ul>
-<% @backlogs.each do |backlog| %>
-<li><%=link_to backlog.name, :controller => 'backlogs', :action => :show, :id => backlog%></li>
+<% @projects.each do |project| %>
+<li><%=link_to project.name, :controller => 'projects', :action => :show, :id => project%></li>
 <% end %>
 </ul>
 </div>

data/app/views/tasks/_backlog_header.rhtml

@@ -1,14 +1,14 @@
-<% @backlog = backlog %>
+<% @project = project %>
 
   <div valign="top">
   	<div>
       <span style="float: left">
-        <%=image_detour_to('add.png', l(:new_task), :controller => 'tasks', :action => :new, :task => {:backlog_id => @backlog.id, :period_id => @period && @period.id})%>
+        <%=image_detour_to('add.png', l(:new_task), :controller => 'tasks', :action => :new, :task => {:project_id => @project.id, :period_id => @period && @period.id})%>
       </span>
       <span colspan="4" style="float: left; vertical-align: middle">
         <h5>
-      		<%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :show, :id => @backlog) %>
-      		<%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog.id)%>
+      		<%=detour_to(h(project.name), :controller => 'projects', :action => :show, :id => @project) %>
+      		<%=image_detour_to('clipboard.png', l(:edit), :controller => 'projects', :action => :edit, :id => @project.id)%>
       	</h5>
       </span>
       <span style="float: left" width="*"/>

data/app/views/tasks/_completed.rhtml

@@ -4,12 +4,12 @@
   <% work_done = !tasks_in_period.find{|t| t.total_done != 0}.nil? %>
   <div id="completed_period_<%=period && period.id%>">
   	<%=render :partial => '/tasks/period_header', :locals => {:period => period} unless @completed_tasks.map(&:period).uniq.size == 1 %>
-  	<%=render :partial => '/tasks/fields_header', :locals => {:backlog => @backlog, :active => false, :track_times => false, :work_done => work_done} %>
+  	<%=render :partial => '/tasks/fields_header', :locals => {:project => @project, :active => false, :track_times => false, :work_done => work_done} %>
   	<ul id="completed_tasks_<%=period && period.id%>" class="task_list" style="width: 100%;">
   	  <% @completed_tasks.select {|t| t.period == period}.each do |task| %>
   	    <%=render :partial => '/tasks/task', :locals => { :task => task, :i => i, :active => false, 
 				:highlight_task => task == @selected_task, :hidden => false, 
-				:show_backlog => controller.class != BacklogsController, :update => :spotlight } %>
+				:show_project => controller.class != ProjectsController, :update => :spotlight } %>
   	    <% i += 1 %>
   	  <% end %>
   	</ul>