jro_apps/redmine Commit - r3075:111950108aca

Issue sidebar cleanup....

Jean-Philippe Lang -

r3075:111950108aca

parent child

Context file:

r3075:111950108aca

Collapse all files

app/views/issues/_sidebar.rhtml +6 -8

             <h3><%= l(:label_issue_plural) %></h3>
             <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
             <% if @project %>
             <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
             <% end %>
             <%= call_hook(:view_issues_sidebar_issues_bottom) %>
-            <% planning_links = []
+            <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
-              planning_links << link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
+            	<%= link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) %><br />
-              planning_links << link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
+            <% end %>
-            %>
+            <% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
-            <% unless planning_links.empty? %>
+            	<%= link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) %><br />
-            <h3><%= l(:label_planning) %></h3>
-            <p><%= planning_links.join(' | ') %></p>
-            <%= call_hook(:view_issues_sidebar_planning_bottom) %>
             <% end %>
+            <%= call_hook(:view_issues_sidebar_planning_bottom) %>
             <% unless sidebar_queries.empty? -%>
             <h3><%= l(:label_query_plural) %></h3>
             <% sidebar_queries.each do |query| -%>
             <%= link_to(h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query) %><br />
             <% end -%>
             <%= call_hook(:view_issues_sidebar_queries_bottom) %>
             <% end -%>

app/views/projects/show.rhtml +9 -10

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= textilizable @project.description %>
             	<ul>
             	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= link_to(h(@project.homepage), @project.homepage) %></li><% end %>
               <% if @subprojects.any? %>
              	<li><%=l(:label_subproject_plural)%>:
             	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
               <% end %>
             	<% @project.custom_values.each do |custom_value| %>
             	<% if !custom_value.value.blank? %>
             	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             	<% end %>
             	<% end %>
             	</ul>
               <% if User.current.allowed_to?(:view_issues, @project) %>
               <div class="issues box">
                 <h3><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
             					<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
             																										:total => @total_issues_by_tracker[tracker].to_i) %>
             			</li>
                 <% end %>
                 </ul>
-                <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
+                <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 => 'issues', :action => 'calendar', :project_id => @project) %>
+            			<% end %>
+            			<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
+            				| <%= link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) %>
+            			<% end %>
+            		</p>
               </div>
               <% end %>
               <%= call_hook(:view_projects_show_left, :project => @project) %>
             </div>
             <div class="splitcontentright">
               <% if @users_by_role.any? %>
             	<div class="members box">
             		<h3><%=l(:label_member_plural)%></h3>
             		<p><% @users_by_role.keys.sort.each do |role| %>
             		<%=h role %>: <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ") %><br />
             		<% end %></p>
             	</div>
             	<% end %>
               <% if @news.any? && authorize_for('news', 'index') %>
               <div class="news box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
                 <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
               </div>
               <% end %>
               <%= call_hook(:view_projects_show_right, :project => @project) %>
             </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 %>
                 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
                 <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 => 'details', :project_id => @project}) %> |
                 <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
                 <% end %>
                 <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
             <% end %>
             <% html_title(l(:label_overview)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages