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

diff --git a/app/views/projects/_sidebar.html.erb b/app/views/projects/_sidebar.html.erb
deleted file mode 100644 (file)
index 803686a..0000000
--- a/app/views/projects/_sidebar.html.erb
+++ /dev/null
@@ -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) %>

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index b68a5ac263bebdaa053bb97be55b55ad7fe0564f..d0d83e2670cf9bf2470b3e8e1e6d43cd17b72ba2 100644 (file)
--- 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 %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 598939cd02353ae0b4c7598775dbcdb27124c2ae..277088cb9b9f4b1fecfcb3d559544cdd7037e61e 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -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;}