Application layout refactored.

The project menu is now the main menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@747 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/projects/activity.rhtml

@@ -1,19 +1,5 @@
 <h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
 
-<div>
-<div class="rightbox">
-<% form_tag do %>
-<p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
-<%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
-
-<p><% @event_types.each do |t| %>
-<%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%><br />
-<% end %></p>
-
-<p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
-<% end %>
-</div>
-
 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
   <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
   <ul>
@@ -51,7 +37,10 @@
   <% end %>
   </ul>
 <% end %>
-<% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<% if @events_by_day.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
 
 <div style="float:left;">
 <% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
@@ -65,8 +54,17 @@
 &nbsp;
 </div>
 <br />
-</div>
 
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key})) %>
 <% end %>
+
+<% content_for :sidebar do %>
+<% form_tag do %>
+<h3><%= l(:label_activity) %></h3>
+<p><% @event_types.each do |t| %>
+<%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%><br />
+<% end %></p>
+<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<% end %>
+<% end %>

app/views/projects/add_issue.rhtml

@@ -23,7 +23,7 @@
 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
 </div>
 
-<div class="clear">
+<div style="clear: left;">
 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
 <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true, :class => 'wiki-edit' %></p>
 
@@ -36,7 +36,6 @@
 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
 <%= image_to_function "add.png", "addFileField();return false" %></label>
 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
-
 </div>
 <!--[eoform:issue]-->
 </div>

app/views/projects/calendar.rhtml

@@ -1,49 +1,24 @@
 <% cache(:year => @year, :month => @month, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
-<h2><%= l(:label_calendar) %></h2>
+<h2><%= l(:label_calendar) %>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
 
-<% form_tag do %>
 <table width="100%">
-<tr>
-<td align="left" style="width:15%">
+<tr><td align="left">
     <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
                         {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
                         {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                         %>
-</td>
-<td align="center" style="width:55%">
-    <%= select_month(@month, :prefix => "month", :discard_type => true) %>
-    <%= select_year(@year, :prefix => "year", :discard_type => true) %>
-    <%= submit_tag l(:button_submit), :class => "button-small" %>
-</td>
-<td align="left" style="width:15%">
-    <%= toggle_link l(:label_options), "trackerselect" %>
-    <div id="trackerselect" class="rightbox overlay" style="width:140px; display:none;">
-    <p><strong><%=l(:label_tracker_plural)%></strong></p>
-    <% @trackers.each do |tracker| %>
-      <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-      <%= tracker.name %><br />
-    <% end %>
-    <% if @project.active_children.any? %>
-    <p><strong><%=l(:label_subproject_plural)%></strong></p>
-    <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
-    <% end %>
-    <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
-    </div>
-</td>
-<td align="right" style="width:15%">
+</td><td align="right">
     <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
                         {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
                         {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
-                        %>&nbsp;
-</td>
-</tr>
+                        %>
+</td></tr>
 </table>
-<% end %>
 
-<table class="list with-cells">
+<table class="cal">
 <thead>
 <tr>
-<th></th>
+<td></td>
 <% 1.upto(7) do |d| %>
     <th style="width:14%"><%= day_name(d) %></th>
 <% end %>
@@ -56,7 +31,7 @@ while day <= @date_to
 	if day.cwday == 1 %>
 	<th><%= day.cweek %></th>
 	<% end %>	
-	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>">
+	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %> <%= Date.today == day ? 'today' : '' %>" style="width:14%;">
 	<p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>	
 	<% ((@ending_events_by_days[day] || []) + (@starting_events_by_days[day] || [])).uniq.each do |i| %>
 	    <% if i.is_a? Issue %>
@@ -68,7 +43,11 @@ while day <= @date_to
 		elsif day == i.due_date
 		    image_tag('arrow_to.png') 
 		end %>
-		<small><%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+		<small>
+		<%= h("#{i.project.name} -") unless @project && @project == i.project %>
+		<%= link_to_issue i %>:
+        <%= h(truncate(i.subject, 30)) %>
+		</small>
         <span class="tip">
         <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
         </span>		
@@ -90,3 +69,20 @@ end %>
 <%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
 <%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
 <% end %>
+
+<% content_for :sidebar do %>
+    <h3><%= l(:label_calendar) %></h3>
+    
+    <% form_tag() do %>
+    <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
+    <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
+    
+    <% @trackers.each do |tracker| %>
+      <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %><br />
+    <% end %>
+    <% if @project.active_children.any? %>
+    <br /><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%>
+    <% end %>
+    <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+    <% end %>
+<% end %>

app/views/projects/changelog.rhtml

@@ -1,17 +1,8 @@
 <h2><%=l(:label_change_log)%></h2>
 
-<div class="rightbox" style="width:140px;">
-<% form_tag do %>
-<p><strong><%=l(:label_tracker_plural)%></strong><br />
-<% @trackers.each do |tracker| %>
-  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %><br />
-<% end %></p>
-<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
+<% if @versions.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
-</div>
-
-<% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
 
 <% @versions.each do |version| %>   
     <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
@@ -33,3 +24,19 @@
     </ul>
     <% end %>
 <% end %>
+
+<% content_for :sidebar do %>
+<% form_tag do %>
+<h3><%= l(:label_change_log) %></h3>
+<% @trackers.each do |tracker| %>
+  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %><br />
+<% end %>
+<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<% end %>
+
+<h3><%= l(:label_version_plural) %></h3>
+<% @versions.each do |version| %>
+<%= link_to version.name, :anchor => version.name %><br />
+<% end %>
+<% end %>

app/views/projects/gantt.rhtml

@@ -23,14 +23,11 @@ t_height = g_height + headers_height
 %>
 
 <div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'icon icon-pdf' %>
-<%= link_to 'PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'icon icon-image' if respond_to?('gantt_image') %>
 </div>
 
 <h2><%= l(:label_gantt) %></h2>
 
-<% form_tag do %>
+<% form_tag(params.merge(:month => nil, :year => nil, :years => nil)) do %>
 <table width="100%">
 <tr>
 <td align="left">
@@ -41,21 +38,7 @@ t_height = g_height + headers_height
     <%= hidden_field_tag 'zoom', @zoom %>
     <%= submit_tag l(:button_submit), :class => "button-small" %>    
 </td>
-<td>
-    <%= toggle_link l(:label_options), "trackerselect" %>
-    <div id="trackerselect" class="rightbox overlay" style="width:140px; display: none;">
-    <p><strong><%=l(:label_tracker_plural)%></strong></p>
-    <% @trackers.each do |tracker| %>
-      <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-      <%= tracker.name %><br />
-    <% end %>
-    <% if @project.active_children.any? %>
-    <p><strong><%=l(:label_subproject_plural)%></strong></p>
-    <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
-    <% end %>
-    <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
-    </div>
-</td>
+
 <td align="right">
 <%= if @zoom < 4
     link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
@@ -244,3 +227,21 @@ if Date.today >= @date_from and Date.today <= @date_to %>
 <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
 </tr>
 </table>
+
+<div class="contextual"><%= l(:label_export_to) %>
+<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'icon icon-pdf' %>
+<%= link_to 'PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'icon icon-image' if respond_to?('gantt_image') %>
+</div>
+
+<% content_for :sidebar do %>
+    <h3><%= l(:label_gantt) %></h3>
+    <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
+    <% @trackers.each do |tracker| %>
+      <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %><br />
+    <% end %>
+    <% if @project.active_children.any? %>
+    <br /><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%>
+    <% end %>
+    <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+    <% end %>
+<% end %>

app/views/projects/list.rhtml

@@ -1,18 +1,15 @@
 <h2><%=l(:label_project_plural)%></h2>
 
-<dl class="projects">
 <% @project_tree.keys.sort.each do |project| %>
-<dt><%= link_to project.name, {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %>
-<dd><%= textilizable(project.description, :project => project) %>
+<h3><%= link_to project.name, {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
+<%= textilizable(project.description, :project => project) %>
 
 <% if @project_tree[project].any? %>
-    <%= l(:label_subproject_plural) %>:
+    <p><%= l(:label_subproject_plural) %>:
     <%= @project_tree[project].sort.collect {|subproject| 
-       link_to(subproject.name, {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %>
+       link_to(subproject.name, {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
 <% end %>
-</dd></dt>
 <% end %>
-</dl>
 
 <% if User.current.logged? %>
 <div class="contextual">

app/views/projects/list_documents.rhtml

@@ -4,7 +4,9 @@
 
 <h2><%=l(:label_document_plural)%></h2>
 
-<% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+<% if @documents.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
 
 <% documents = @documents.group_by {|d| d.category } %>
 <% documents.each do |category, docs| %>

app/views/projects/list_issues.rhtml

@@ -1,8 +1,4 @@
 <% if @query.new_record? %>
-    <div class="contextual">
-      <%= link_to l(:label_query_plural), :controller => 'queries', :project_id => @project %>
-      <% if authorize_for('projects', 'add_issue') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %>
-    </div>
     <h2><%=l(:label_issue_plural)%></h2>
     <% set_html_title l(:label_issue_plural) %>
     
@@ -33,17 +29,19 @@
     <br />
 <% else %>
     <div class="contextual">
-        <%= link_to l(:label_query_plural), {:controller => 'queries', :project_id => @project} %> |
-        <%= link_to l(:label_issue_view_all), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1} %>
-        <% if authorize_for('projects', 'add_issue') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %>
-    </div>    
+    <% if @query.editable_by?(User.current) %>
+    <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
+    <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+    <% end %>
+    </div>
+    
     <h2><%= @query.name %></h2>
     <% set_html_title @query.name %>
 <% end %>
 <%= error_messages_for 'query' %>
 <% if @query.valid? %>
 <% if @issues.empty? %>
-<p><i><%= l(:label_no_data) %></i></p>
+<p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
 &nbsp;
 <% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>	
@@ -64,7 +62,7 @@
 	    <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
 		<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
 		<td align="center"><%= issue.tracker.name %></td>
-		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
+		<td><%= issue.status.name %></td>
 		<td align="center"><%= issue.priority.name %></td>
 		<td><%= "#{issue.project.name} - " unless @project && @project == issue.project %><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
 		<td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
@@ -85,3 +83,7 @@
 <% end %>
 <% end %>
 <% end %>
+
+<% content_for :sidebar do %>
+    <%= render :partial => 'issues/sidebar' %>
+<% end %>

app/views/projects/list_news.rhtml

@@ -4,7 +4,11 @@
 
 <h2><%=l(:label_news_plural)%></h2>
 
-<% if @news.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+<% if @news.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+
 <%= render :partial => 'news/news', :collection => @news %>
 <%= pagination_links_full @news_pages %>
 

app/views/projects/roadmap.rhtml

@@ -1,18 +1,8 @@
 <h2><%=l(:label_roadmap)%></h2>
 
-<div class="rightbox">
-<% form_tag do %>
-<p><strong><%=l(:label_tracker_plural)%></strong><br />
-<% @trackers.each do |tracker| %>
-  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %><br />
-<% end %></p>
-<p class="small"><label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label></p>
-<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
+<% if @versions.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
-</div>
-
-<% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
 
 <% @versions.each do |version| %>   
     <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
@@ -63,3 +53,21 @@
       <% end %>
     </ul>
 <% end %>
+
+<% content_for :sidebar do %>
+<% form_tag do %>
+<h3><%= l(:label_roadmap) %></h3>
+<% @trackers.each do |tracker| %>
+  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %><br />
+<% end %>
+<br />
+<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
+<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<% end %>
+
+<h3><%= l(:label_version_plural) %></h3>
+<% @versions.each do |version| %>
+<%= link_to version.name, :anchor => version.name %><br />
+<% end %>
+<% end %>

app/views/projects/settings/_boards.rhtml

@@ -1,3 +1,4 @@
+<% if @project.boards.any? %>
 <table class="list">
 	<thead><th><%= l(:label_board) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th><th style="width:15%"></th></thead>
 	<tbody>
@@ -14,11 +15,14 @@
     <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
     <% end %>
     </td>    
-    <td align="center"><small><%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %></small></td>
-    <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small></td>
+    <td align="center"><%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
 	</tr>
 <% end %>
     </tbody>
 </table>
-&nbsp;
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
 <p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project} %></p>

app/views/projects/settings/_issue_categories.rhtml

@@ -1,3 +1,4 @@
+<% if @project.issue_categories.any? %>
 <table class="list">
 	<thead>
 	<th><%= l(:label_issue_category) %></th>
@@ -11,12 +12,15 @@
 	<tr class="<%= cycle 'odd', 'even' %>">
     <td><%=h(category.name) %></td>
     <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
-    <td align="center"><small><%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %></small></td>
-    <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %></small></td>
+    <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %></td>
 	</tr>
 	<% end %>
 <% end %>
     </tbody>
 </table>
-&nbsp;
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
 <p><%= link_to_if_authorized l(:label_issue_category_new), :controller => 'projects', :action => 'add_issue_category', :id => @project %></p>

app/views/projects/settings/_members.rhtml

@@ -1,7 +1,10 @@
 <%= error_messages_for 'member' %>
 <% roles = Role.find_all_givable %>
 <% users = User.find_active(:all) - @project.users %>
-
+<% # members sorted by role position
+   members = @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position} %>
+   
+<% if members.any? %>
 <table class="list">
 	<thead>
 	  <th><%= l(:label_user) %></th>
@@ -9,7 +12,7 @@
 	  <th style="width:15%"></th>
 	</thead>
 	<tbody>
-	<% @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position}.each do |member| %>
+	<% members.each do |member| %>
 	<% next if member.new_record? %>
 	<tr class="<%= cycle 'odd', 'even' %>">
 	<td><%= member.name %></td>
@@ -22,16 +25,18 @@
     <% end %>
     </td>
     <td align="center">
-      <small><%= link_to_remote l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
+      <%= link_to_remote l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
                                               :method => :post
                                             }, :title => l(:button_delete),
-                                               :class => 'icon icon-del' %></small>
+                                               :class => 'icon icon-del' %>
     </td>
 	</tr>
 	</tbody>
 <% end; reset_cycle %>
 </table>
-&nbsp;
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
 
 <% if authorize_for('members', 'new') && !users.empty? %>
   <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>

app/views/projects/settings/_modules.rhtml

@@ -3,6 +3,8 @@
             :html => {:id => 'modules-form'} do |f| %>
             
 <div class=box>
+<strong>Select modules to enable for this project:</strong>
+<br />
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
 <p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %></label></p>
 <% end %>

app/views/projects/settings/_versions.rhtml

@@ -1,3 +1,4 @@
+<% if @project.versions.any? %>
 <table class="list">
 	<thead>
     <th><%= l(:label_version) %></th>
@@ -14,12 +15,15 @@
     <td align="center"><%= format_date(version.effective_date) %></td>
     <td><%=h version.description %></td>
     <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
-    <td align="center"><small><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></small></td>
-    <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small></td>
+    <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
     </td>
     </tr>
 <% end; reset_cycle %>
     </tbody>
 </table>
-&nbsp;
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
 <p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>

app/views/projects/show.rhtml

@@ -1,15 +1,13 @@
-<div class="contextual">
-<%= link_to l(:label_feed_plural), {:action => 'feeds', :id => @project}, :class => 'icon icon-feed' %>
-</div>
-
 <h2><%=l(:label_overview)%></h2> 
 	
 <div class="splitcontentleft">
 	<%= textilizable @project.description %>	
 	<ul>
 	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
-	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
-	<% unless @project.parent.nil? %>
+    <% if @subprojects.any? %>
+ 	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %></li>
+    <% end %>
+	<% if @project.parent %>
 	<li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
 	<% end %>
 	<% for custom_value in @custom_values %>
@@ -20,8 +18,7 @@
 	</ul>	
 
   <% if User.current.allowed_to?(:view_issues, @project) %>
-  <div class="box">
-    <div class="contextual"><% if authorize_for('projects', 'add_issue') %><%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %></div>
+  <div class="box">    
     <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
     <ul>
     <% for tracker in @trackers %>    
@@ -32,35 +29,53 @@
       <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
     <% end %>
     </ul>
-    <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
+    <p><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></p>
   </div>
   <% end %>
 </div>
 
 <div class="splitcontentright">
+    <% if @members_by_role.any? %>
 	<div class="box">
 		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>	
-		<% @members_by_role.keys.sort.each do |role| %>
-		<%= role.name %>: <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %><br />
-		<% end %>		
+		<p><% @members_by_role.keys.sort.each do |role| %>
+		<%= role.name %>:
+		<%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %>
+		<br />
+		<% end %></p>
 	</div>
-  
-  <% if @subprojects.any? %>
- 	<div class="box">
-		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>	
-		<%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %>
-	</div>
-  <% end %>
-  
+	<% end %>
+    
   <% if @news.any? && authorize_for('projects', 'list_news') %>
   <div class="box">
     <h3><%=l(:label_news_latest)%></h3>  
     <%= render :partial => 'news/news', :collection => @news %>
-    <p class="textcenter"><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></p>
+    <p><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></p>
   </div>  
   <% end %>
 </div>
 
+<% content_for :sidebar do %>
+    <% if authorize_for('projects', 'add_issue') %>
+    <h3><%= l(:label_issue_new) %></h3>
+    <%= l(:label_tracker) %>: <%= new_issue_selector %>
+    <% end %>
+    
+    <h3>Planning</h3>
+    <p><%= link_to_if_authorized l(:label_calendar), :action => 'calendar', :id => @project %> |
+    <%= link_to_if_authorized l(:label_gantt), :action => 'gantt', :id => @project %></p>
+    
+    <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
+    <h3><%= l(:label_spent_time) %></h3>
+    <p><span class="icon icon-time"><%= lwr(:label_f_hour, @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 %>
+
+    <hr />
+    <p><%= link_to l(:label_feed_plural), {:action => 'feeds', :id => @project}, :class => 'icon icon-feed' %></p>
+<% end %>
+
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:rss,  {:controller => 'feeds', :action => 'issues', :project_id => @project, :key => @key}, {:title => l(:label_reported_issues)}) %>
 <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'issues', :project_id => @project, :key => @key, :format => 'atom'}, {:title => l(:label_reported_issues)}) %>