diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-30 17:10:10 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-30 17:10:10 +0000 |
| commit | 7fb55bc363b22b9768a8f9575215a57b3ae5fa22 (patch) | |
| tree | 1b1db190018cfe3cd6b52293e110b1584155860f /app/views/projects/show.html.erb | |
| parent | 040b90f48312efb7bd59ce0943b32094d148bc60 (diff) | |
| download | redmine-7fb55bc363b22b9768a8f9575215a57b3ae5fa22.tar.gz redmine-7fb55bc363b22b9768a8f9575215a57b3ae5fa22.zip | |
Move spent time to a box like issues on the project overview.
git-svn-id: http://svn.redmine.org/redmine/trunk@15592 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects/show.html.erb')
| -rw-r--r-- | app/views/projects/show.html.erb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index b68a5ac26..d0d83e267 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -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 %> |