--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -340,6 +340,7 @@ module ApplicationHelper
     acts << %Q{<li>#{link_to("New Article", new_project_article_path(@project.slug))}</li>} if flags[:new_article] && is_member
     acts << %Q{<li>#{link_to("New Ticket", new_project_ticket_path(@project.slug))}</li>} if flags[:new_ticket]
     acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && is_member
+    acts << %Q{<li>#{link_to("Completed Milestones", root_path)}</li>} if flags[:completed_milestones]
     acts << %Q{<li>#{link_to("Clone Mainline", new_project_repository_path(@project.slug, @repository))}</li>} if flags[:clone_mainline] && logged_in?
     out << %Q{<tr><td><ul>#{acts}</ul></td></tr>} if acts != ""    
     out << %Q{<tr><td>#{actionbox_default(flags)}</td></tr>}

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -118,7 +118,7 @@ module ProjectsHelper
         out << actionbox_basic(:allow_shortcuts => true)
       end
     when PRJ_TAB_ROADMAP
-      out << actionbox_complex(:allow_shortcuts => true, :new_milestone => true)
+      out << actionbox_complex(:allow_shortcuts => true, :new_milestone => true, :completed_milestones => true)
     when PRJ_TAB_TICKETS
       out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true)
       out << actionbox_ticket_filter
@@ -175,18 +175,28 @@ module ProjectsHelper
     @milestones = Milestone.roadmap(@project.id, current_user)
     if @milestones.size > 0 then
       for milestone in @milestones
+
         # milestone title
-        out << "<h2>"
+        out << "<h3>"
         out << format_date_ddbbyy(milestone.due_date)
         out << " - " << milestone.name << " (" << milestone.status.to_s.capitalize << ")"
-        out << "</h2>"
+        out << "</h3>"
+
+        # milestone progress bar
+        out << "<table class='progress'>"
+        out << "<tr>"
+        out << "<td class='closed' style='width: " << milestone.progress.to_s << "%'><a href='/query?status=closed&amp;milestone=2.x' title='903 of 2501 tickets closed'></a></td>"
+        out << "<td class='open' style='width: " << (100 - milestone.progress).to_s << "%'><a href='/query?status=new&amp;status=assigned&amp;status=reopened&amp;milestone=2.x' title='1598 of 2501 tickets active'></a></td>"
+        out << "</tr>"
+        out << "</table>"
+
+        
         # tickets for milestone
         @tickets = Ticket.find_by_milestone(milestone.id)
         if @tickets.size > 0 then
           # tasks list
           out << "<table class='public' width='100%'>"
           out << "<tr>"
-          out << "<th>Due</th>"
           out << "<th>Task</th>"
           out << "<th>Assignee</th>"
           out << "<th>Status</th>"
@@ -196,14 +206,6 @@ module ProjectsHelper
           #
           for ticket in @tickets
             out << "<tr>"
-            #
-            out << "<td>"
-            #FIXME must be a better way of handling nils like ||=
-            if ticket.due_date != nil then
-              out << format_date_ddbbyy(ticket.due_date)
-            end
-            out << "</td>"
-            #
             out << "<td>" << ticket.title << "</td>"
             out << "<td>" << ticket.assignee.fullname << "</td>"
             out << "<td>" << ticket.status.to_s.capitalize << "</td>"

--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -35,7 +35,7 @@ class Milestone < ActiveRecord::Base
   #to display roadmap, except it's now also used by the project summary tab
   def self.roadmap(project_id, curruser)
     projects_allowed = Project.list_for_user(curruser)
-    find(:all, :conditions => ["project_id = '#{project_id}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "due_date ASC")
+    find(:all, :conditions => ["project_id = '#{project_id}' AND NOT status = 'complete'  AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "due_date ASC")
   end
 
   #

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,7 +8,7 @@
 <link rel="shortcut icon" href="/favicon.ico">
 <link rel='alternate' type='application/rss+xml' title='RSS Feed' href='/rss.xml'/>
 <title><%= yield(:title) %> - <%= SITENAME %></title>
-<%= stylesheet_link_tag 'gitlab' %>
+<%= stylesheet_link_tag 'base' %>
 </head>
 
 <body>

--- a/app/views/projects/ac_roadmap.html.erb
+++ b/app/views/projects/ac_roadmap.html.erb
@@ -5,6 +5,7 @@
 
 <div id='todo'>
 <p>Show milestones and allow tickets to be dragged between them, show unmilestoned tickets, clicking ticket goes to ticket tab.</p>
+<p>Make milestone boxes collapsable</p>
 </div>
 
 <%= render :partial => "ac_project_footer" %>

--- a/db/migrate/015_create_tickets.rb
+++ b/db/migrate/015_create_tickets.rb
@@ -41,7 +41,6 @@ class CreateTickets < ActiveRecord::Migration
       t.column :impact, :enum, :limit => [:low, :high, :security], :default => :low
       t.column :priority, :enum, :limit => [:none, :low, :high, :critical], :default => :none
       t.column :audience, :enum, :limit => [:public, :members], :default => :public
-      t.datetime :due_date
       t.string :cc, :default => ""
       t.datetime :open_date
       t.datetime :close_date