1 files changed, 24 insertions, 42 deletions
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 7c3544a53..daf7639fc 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -5,48 +5,28 @@
 <% end %>
 
 <% @versions.each do |version| %>   
-    <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
-    <% if version.completed? %>
-      <p><%= format_date(version.effective_date) %></p>
-    <% elsif version.overdue? %>
-      <p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
-    <% elsif version.effective_date %>
-      <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>        
-    
-    <% if version.fixed_issues.count > 0 %>
-        <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
-        <p class="progress-info">
-            <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
-            <%= lwr(:label_closed_issues, version.closed_issues_count) %>
-            (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-            &#160;
-            <%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
-            <%= lwr(:label_open_issues, version.open_issues_count)%>
-            (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-        </p>
-        <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
-        <% issues = version.fixed_issues.find(:all,
-                                     :include => [:status, :tracker],
-                                     :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                     :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
-           issues ||= []
-        %>
-        <ul>
-          <% if issues.size > 0 %>
-            <% issues.each do |issue| %>
-              <li>
-                <%= link = link_to_issue(issue)
-                    issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
-                <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
-              </li>
-            <% end %>
-          <% end %>
-        </ul>
-    <% else %>
-        <p><em><%= l(:label_roadmap_no_issues) %></em></p>
-    <% end %>
+    <%= tag 'a', :name => version.name %>
+    <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
+    <%= render :partial => 'versions/overview', :locals => {:version => version} %>
+    <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
+
+    <% issues = version.fixed_issues.find(:all,
+                                          :include => [:status, :tracker],
+                                          :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
+                                          :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+       issues ||= []
+    %>
+    <ul>
+      <% if issues.size > 0 %>
+        <% issues.each do |issue| %>
+          <li>
+            <%= link = link_to_issue(issue)
+                issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
+            <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
 <% end %>
 
 <% content_for :sidebar do %>
@@ -66,3 +46,5 @@
 <%= link_to version.name, :anchor => version.name %><br />
 <% end %>
 <% end %>
+
+<% set_html_title l(:label_roadmap) %>