Author: kcardineaud Date: 2011-05-30 10:52:16 +0200 (Mon, 30 May 2011) New Revision: 3 Url: http://nuiton.org/repositories/revision/nuiton-redmine-site/3 Log: Deplacement de calendrier et gantt, de suivi des demandes, vers la sidebar 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-05-27 15:41:10 UTC (rev 2) +++ cl-overview-project/trunk/app/views/projects/show.rhtml 2011-05-30 08:52:16 UTC (rev 3) @@ -96,13 +96,7 @@ </ul> <p> <%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %> - <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %> - | <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %> - <% end %> - <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %> - | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %> - <% end %> - </p> + </p> </div> <% end %> @@ -117,14 +111,14 @@ </div> <% content_for :sidebar do %> - <% planning_links = [] - planning_links << link_to_if_authorized(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) - planning_links << link_to_if_authorized(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) - planning_links.compact! - unless planning_links.empty? %> - <h3><%= l(:label_planning) %></h3> - <p><%= planning_links.join(' | ') %></p> - <% end %> + <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) %> + <% end %> + <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %> + | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %> + <% end %> + </p> <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %> <h3><%= l(:label_spent_time) %></h3>