Author: kcardineaud Date: 2011-06-10 11:57:46 +0200 (Fri, 10 Jun 2011) New Revision: 23 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/23 Log: #1552 Ajout de l'ic?\195?\180ne du sablier pour le temps pass?\195?\169 : plugin Modified: cl-overview-project/trunk/app/views/projects/show.rhtml Modified: cl-overview-project/trunk/app/views/projects/show.rhtml =================================================================== --- cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-10 09:56:56 UTC (rev 22) +++ cl-overview-project/trunk/app/views/projects/show.rhtml 2011-06-10 09:57:46 UTC (rev 23) @@ -117,6 +117,7 @@ </div> <% content_for :sidebar do %> + <div id="planning"> <h3>Planning</h3> <p><% if User.current.allowed_to?(:view_calendar, @project, :global => true) %> <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %> @@ -126,13 +127,19 @@ <% end %> </p> + </div> + + <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %> + <div id="time"> <h3><%= l(:label_spent_time) %></h3> <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p> <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> | <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p> + </div> <% end %> <% end %> + <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>