Redmine 4.1.1

app/views/projects/show.html.erb

@@ -1,4 +1,7 @@
 <div class="contextual">
+  <%= bookmark_link @project %>
+
+  <%= actions_dropdown do %>
   <% if User.current.allowed_to?(:add_subprojects, @project) %>
     <%= link_to l(:label_subproject_new), new_project_path(:parent_id => @project), :class => 'icon icon-add' %>
   <% end %>
@@ -9,6 +12,10 @@
       <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
     <% end %>
   <% end %>
+  <%= link_to_if_authorized l(:label_settings),
+              {:controller => 'projects', :action => 'settings', :id => @project},
+              :class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %>
+  <% end %>
 </div>
 
 <h2><%=l(:label_overview)%></h2>
@@ -17,6 +24,7 @@
   <p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
 <% end %>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
   <% if @project.description.present? %>
   <div class="wiki">
@@ -29,14 +37,20 @@
     <li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to_if uri_with_safe_scheme?(@project.homepage), @project.homepage, @project.homepage %></li>
   <% end %>
   <% render_custom_field_values(@project) do |custom_field, formatted| %>
-    <li><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
+    <li class="<%= custom_field.css_classes %>"><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
   <% end %>
   </ul>
   <% end %>
 
   <% if User.current.allowed_to?(:view_issues, @project) %>
   <div class="issues box">
-    <h3 class="icon icon-issue"><%=l(:label_issue_tracking)%></h3>
+    <h3 class="icon icon-issue">
+      <%=l(:label_issue_tracking)%>&nbsp;
+      <%= link_to l(:label_details),
+            project_issues_report_details_path(@project, :detail => 'tracker'),
+            :class => 'icon-only icon-zoom-in',
+            :title => l(:label_details) %>
+    </h3>
     <% if @trackers.present? %>
     <table class="list issue-report">
       <thead>
@@ -51,7 +65,7 @@
       <% @trackers.each do |tracker| %>
         <tr>
           <td class="name">
-            <%= link_to tracker.name, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>
+            <%= link_to tracker.name, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id), :title => tracker.description %>
           </td>
           <td>
             <%= link_to @open_issues_by_tracker[tracker].to_i, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>
@@ -69,6 +83,7 @@
     <% end %>
     <p>
       <%= link_to l(:label_issue_view_all), project_issues_path(@project, :set_filter => 1) %>
+      | <%= link_to l(:field_summary), project_issues_report_path(@project) %>
       <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
         | <%= link_to l(:label_calendar), project_calendar_path(@project) %>
       <% end %>
@@ -81,10 +96,15 @@
 
   <% if User.current.allowed_to?(:view_time_entries, @project) %>
   <div class="spent_time box">
-    <h3 class="icon icon-time"><%= l(:label_spent_time) %></h3>
-    <% if @total_hours.present? %>
-      <p><%= l_hours(@total_hours) %></p>
-    <% end %>
+    <h3 class="icon icon-time"><%= l(:label_time_tracking) %></h3>
+    <ul>
+      <% if @total_estimated_hours.present? %>
+        <li><%= l(:field_estimated_hours) %>: <%= l_hours(@total_estimated_hours) %>
+      <% end %>
+      <% if @total_hours.present? %>
+          <li><%= l(:label_spent_time) %>: <%= l_hours(@total_hours) %>
+      <% end %>
+    </ul>
     <p>
     <% if User.current.allowed_to?(:log_time, @project) %>
       <%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |
@@ -98,8 +118,6 @@
 </div>
 
 <div class="splitcontentright">
-  <%= render :partial => 'members_box' %>
-
   <% if @news.any? && authorize_for('news', 'index') %>
   <div class="news box">
     <h3 class="icon icon-news"><%=l(:label_news_latest)%></h3>
@@ -108,15 +126,22 @@
   </div>
   <% end %>
 
+  <%= render :partial => 'members_box' %>
+
   <% if @subprojects.any? %>
   <div class="projects box">
     <h3 class="icon icon-projects"><%=l(:label_subproject_plural)%></h3>
-    <%= @subprojects.collect{|p| link_to p, project_path(p), :class => p.css_classes}.join(", ").html_safe %>
+	<ul class="subprojects">
+	  <% @subprojects.each do |project| %>
+	  <li><%= link_to(project.name, project_path(project), :class => project.css_classes).html_safe %></li>
+	  <% end %> 
+    </ul>
   </div>
   <% end %>
 
   <%= call_hook(:view_projects_show_right, :project => @project) %>
 </div>
+</div>
 
 <% content_for :sidebar do %>
   <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>