4 files changed, 16 insertions, 17 deletions

diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 2a53831fe..48fdaf64d 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -74,7 +74,7 @@ while day <= @date_to
         </span>		
 		</div>
 		<% else %>
-        <%= image_tag('milestone.png') %> <small><%= "#{l(:label_version)}: #{i.name}" %></small>
+        <small><%= link_to_version i, :class => "icon icon-package" %></small>
 		<% end %>
 	<% end %>
     </td>
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml
index 51724f149..f42f32c42 100644
--- a/app/views/projects/changelog.rhtml
+++ b/app/views/projects/changelog.rhtml
@@ -1,14 +1,12 @@
 <h2><%=l(:label_change_log)%></h2>
 
-<div>
-
 <div class="rightbox" style="width:140px;">
 <% form_tag do %>
-<p><strong><%=l(:label_tracker_plural)%></strong></p>
+<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 %>
+<% end %></p>
 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
 <% end %>
 </div>
@@ -27,4 +25,3 @@
     end %>
     <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
 <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 317fd993d..ccc9a019a 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -90,7 +90,7 @@ top = headers_height + 8
       	<%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
       	<%=h i.subject %>
   	<% else %>
-      	<strong><%= "#{l(:label_version)}: #{i.name}" %></strong>
+      	<%= link_to_version i, :class => "icon icon-package" %>
   	<% end %>  	
   	</small></div>
     <% top = top + 20
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index e1449dcfa..ab591a830 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -1,14 +1,13 @@
 <h2><%=l(:label_roadmap)%></h2>
 
-<div>
-
-<div class="rightbox" style="width:140px;">
+<div class="rightbox">
 <% form_tag do %>
-<p><strong><%=l(:label_tracker_plural)%></strong></p>
+<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 %>
+<% 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>
 <% end %>
 </div>
@@ -16,13 +15,17 @@
 <% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
 
 <% @versions.each do |version| %>   
-    <h3 class="icon22 icon22-package"><%= version.name %></h3>
+    <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
+    <% if version.completed? %>
+      <p><%= format_date(version.effective_date) %></p>
+    <% else %>
+      <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
+    <% end %>
     <p><%=h version.description %></p>
-    <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>    
     <% issues = version.fixed_issues.find(:all,
-                                 :include => :status,
+                                 :include => [:status, :tracker],
                                  :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                 :order => "position")
+                                 :order => "#{Tracker.table_name}.position")
 
        total = issues.size
        complete = issues.inject(0) {|c,i| i.status.is_closed? ? c + 1 : c } 
@@ -56,4 +59,3 @@
       <% end %>
     </ul>
 <% end %>
-</div>