##// END OF EJS Templates
jro_apps » redmine
RSS
Issue sidebar cleanup....
Jean-Philippe Lang -
r3075:111950108aca
parent child
Show More
Side by Side Unified
Context file:
r3075:111950108aca Loading diff...:
Show file before | Show file after | Hide comments
@@ -5,15 +5,13
5 <% end %>
5 <% end %>
6 <%= call_hook(:view_issues_sidebar_issues_bottom) %>
6 <%= call_hook(:view_issues_sidebar_issues_bottom) %>
7
7
8 <% planning_links = []
8 <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
9 planning_links << link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
9 <%= link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) %><br />
10 planning_links << link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
10 <% end %>
11 %>
11 <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
12 <% unless planning_links.empty? %>
12 <%= link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) %><br />
13 <h3><%= l(:label_planning) %></h3>
14 <p><%= planning_links.join(' | ') %></p>
15 <%= call_hook(:view_issues_sidebar_planning_bottom) %>
16 <% end %>
13 <% end %>
14 <%= call_hook(:view_issues_sidebar_planning_bottom) %>
17
15
18 <% unless sidebar_queries.empty? -%>
16 <% unless sidebar_queries.empty? -%>
19 <h3><%= l(:label_query_plural) %></h3>
17 <h3><%= l(:label_query_plural) %></h3>
Show file before | Show file after | Hide comments
@@ -28,7 +28,15
28 </li>
28 </li>
29 <% end %>
29 <% end %>
30 </ul>
30 </ul>
31 <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
31 <p>
32 <%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
33 <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
34 | <%= link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) %>
35 <% end %>
36 <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
37 | <%= link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) %>
38 <% end %>
39 </p>
32 </div>
40 </div>
33 <% end %>
41 <% end %>
34 <%= call_hook(:view_projects_show_left, :project => @project) %>
42 <%= call_hook(:view_projects_show_left, :project => @project) %>
@@ -55,15 +63,6
55 </div>
63 </div>
56
64
57 <% content_for :sidebar do %>
65 <% content_for :sidebar do %>
58 <% planning_links = []
59 planning_links << link_to_if_authorized(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project)
60 planning_links << link_to_if_authorized(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project)
61 planning_links.compact!
62 unless planning_links.empty? %>
63 <h3><%= l(:label_planning) %></h3>
64 <p><%= planning_links.join(' | ') %></p>
65 <% end %>
66
67 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
66 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
68 <h3><%= l(:label_spent_time) %></h3>
67 <h3><%= l(:label_spent_time) %></h3>
69 <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
68 <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
General Comments 0
You need to be logged in to leave comments. Login now