meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity

Move spent time to a box like issues on the project overview.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15592 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-06-30 17:10:10 +00:00
parent 040b90f483
commit 7fb55bc363
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/projects/_sidebar.html.erb
View File

@ -1,14 +0,0 @@
<% if User.current.allowed_to?(:view_time_entries, @project) %>
<h3><%= l(:label_spent_time) %></h3>
<% if @total_hours.present? %>
<p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
<% end %>
<p>
<% if User.current.allowed_to?(:log_time, @project) %>
<%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |
<% end %>
<%= link_to(l(:label_details), project_time_entries_path(@project)) %> |
<%= link_to(l(:label_report), report_project_time_entries_path(@project)) %>
</p>
<% end %>
<%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>

18
app/views/projects/show.html.erb
View File

@ -78,6 +78,22 @@
</p>
</div>
<% end %>
<% if User.current.allowed_to?(:view_time_entries, @project) %>
<div class="spent_time box">
<h3><%= l(:label_spent_time) %></h3>
<% if @total_hours.present? %>
<p><%= l_hours(@total_hours) %></p>
<% end %>
<p>
<% if User.current.allowed_to?(:log_time, @project) %>
<%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |
<% end %>
<%= link_to(l(:label_details), project_time_entries_path(@project)) %> |
<%= link_to(l(:label_report), report_project_time_entries_path(@project)) %>
</p>
</div>
<% end %>
<%= call_hook(:view_projects_show_left, :project => @project) %>
</div>
@ -103,7 +119,7 @@
</div>
<% content_for :sidebar do %>
<%= render :partial => 'projects/sidebar' %>
<%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
<% end %>
<% content_for :header_tags do %>

1
public/stylesheets/application.css
View File

@ -324,6 +324,7 @@ div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-
div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
div.spent_time h3 { background: url(../images/time.png) no-repeat 0% 50%; padding-left: 20px; }
#watchers select {width: 95%; display: block;}
#watchers a.delete {opacity: 0.4; margin-left: 5px;}