--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -6,5 +6,13 @@ class TicketsController < ApplicationController
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_TICKETS)
     render :action => "ac_project_index"
   end
+
+  def create
+    if !params[:id]
+      @title, @url_suffix = Project.tab_settings(PRJ_TAB_TICKETS)
+      render :action => "ac_project_index"
+    end
+  end
+
   
 end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -183,14 +183,6 @@ module ApplicationHelper
   def div_content_close
     %Q{</div>}
   end
-  
-  def div_function_open
-    %Q{<div id='function'>}
-  end
-
-  def div_function_close
-    %Q{</div>}
-  end  #
 
   def div_rightcolumn_open
     %Q{<div id='rightcolumn'>}

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -121,7 +121,7 @@ module ProjectsHelper
       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
+      out << render(:partial => "ac_right_ticket_filter")
     when PRJ_TAB_ARTICLES
       out << actionbox_complex(:allow_shortcuts => true, :new_article => true)
     when PRJ_TAB_FORUM
@@ -134,40 +134,8 @@ module ProjectsHelper
     out
   end
 
-  #TODO need to find a better place for these (partial?)
-  def actionbox_ticket_filter
-    out = ""
-    out << %Q{<table class='right_default_table' cellspacing=0px>}
-    out << %Q{<tr><th>Ticket Filter</th></tr>}
-
-    out << %Q{<tr><td>Type:</td></tr>}
-    
-    out << %Q{<tr><td>&nbsp;&nbsp;<small><input type=checkbox>Defect</small></td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Enhancement</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Task</td></tr>}
-
-    out << %Q{<tr><td>Status:</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Proposed</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Open</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Closed</td></tr>}
-
-    out << %Q{<tr><td>Impact:</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Low</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>High</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Security</td></tr>}
-
-    out << %Q{<tr><td>Priority:</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>None</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Low</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>High</td></tr>}
-    out << %Q{<tr><td>&nbsp;&nbsp;<input type=checkbox>Critical</td></tr>}
-
-    out << %Q{</table>}
-    out
-  end
-
+  
   def render_project_roadmap
-    
     #get all milestones for a project
     #order by date desc
     #if there is a version linked, show that next to milestone
@@ -175,13 +143,11 @@ module ProjectsHelper
     @milestones = Milestone.roadmap(@project.id, current_user)
     if @milestones.size > 0 then
       for milestone in @milestones
-
         # milestone title
         out << "<h3>"
         out << format_date_ddbbyy(milestone.due_date)
         out << " - " << milestone.name << " (" << milestone.status.to_s.capitalize << ")"
         out << "</h3>"
-
         # milestone progress bar
         out << "<table class='progress'>"
         out << "<tr>"
@@ -191,36 +157,13 @@ module ProjectsHelper
         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>Task</th>"
-          out << "<th>Assignee</th>"
-          out << "<th>Status</th>"
-          out << "<th>Impact</th>"
-          out << "<th>Priority</th>"
-          out << "</tr>"
-          #
-          for ticket in @tickets
-            out << "<tr>"
-            out << "<td>" << ticket.title << "</td>"
-            out << "<td>" << ticket.assignee.fullname << "</td>"
-            out << "<td>" << ticket.status.to_s.capitalize << "</td>"
-            out << "<td>" << ticket.impact.to_s.capitalize << "</td>"
-            out << "<td>" << ticket.priority.to_s.capitalize << "</td>"
-            out << "</tr>"
-          end
-          out << "</table>"
-          out << "<br />"
-        end
       end
     end    
     out
   end
   
+  
+  
   def format_life_cycle (ls)
     case ls
     when :pre_alpha

--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -3,7 +3,42 @@ module TicketsHelper
   include ProjectsHelper
   
   def render_project_tickets
+    out = ""
+    @tickets = Ticket.filtered(params[:ticket] ? params[:ticket] : "")
+    if @tickets.size > 0 then
+      # tasks list
+      out << "<table class='public' width='100%'>"
+      out << "<tr>"
+      out << "<th></th>"
+      out << "<th>Task</th>"
+      out << "<th>Assignee</th>"
+      out << "<th>Type</th>"
+      out << "<th>Status</th>"
+      out << "<th>Impact</th>"
+      out << "<th>Priority</th>"
+      out << "</tr>"
+      #
+      for ticket in @tickets
+        out << "<tr>"
+        out << "<td>" << ticket.name << "</td>"
+        out << "<td>" << ticket.title << "</td>"
+        out << "<td>" << ticket.fullname << "</td>"
+        out << "<td>" << ticket.ttype.to_s.capitalize << "</td>"
+        out << "<td>" << ticket.status.to_s.capitalize << "</td>"
+        out << "<td>" << ticket.impact.to_s.capitalize << "</td>"
+        out << "<td>" << ticket.priority.to_s.capitalize << "</td>"
+        out << "</tr>"
+      end
+      out << "</table>"
+      out << "<br />"
+    end
+    out
   end
 
-
+  def ticket_value_checked? (v)
+    params[:ticket][v] == "1" ? "checked" : "" if params[:ticket]
+  end
+    
+    
+  
 end

--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -12,9 +12,52 @@ class Ticket < ActiveRecord::Base
   end
   
   #
-  def self.find_by_milestone(milestone_id)
-    find(:all, :conditions => ["milestone_id = '#{milestone_id}'"], :order => "due_date DESC")
+#  def self.find_by_milestone(milestone_id)
+#    find(:all, :conditions => ["milestone_id = '#{milestone_id}'"], :order => "due_date DESC")
+#  end
+  
+  def self.qconcat (filters, types, lstart)
+    s = ""
+    types.each do |t|
+      if filters[t] == "1"
+        s << ", " if s.length > 0
+        s << "'" << t.to_s[lstart..t.to_s.length] << "'"
+      end
+    end
+    s.size > 0 ? s : nil
+  end
+  
+  #
+  def self.filtered(filters = {})
+    
+    ttype = qconcat(filters, [:ttype_defect, :ttype_enhancement, :ttype_task], 6)
+    status = qconcat(filters, [:status_proposed, :status_open, :status_closed], 7)
+    impact = qconcat(filters, [:impact_low, :impact_high, :impact_security], 7)
+    priority = qconcat(filters, [:priority_none, :priority_low, :priority_high, :priority_critical], 9)
+    
+    w = "WHERE true "
+    w << "AND tickets.ttype IN (#{ttype})\n" if ttype
+    w << "AND tickets.status IN (#{status})\n" if status
+    w << "AND tickets.impact IN (#{impact})\n" if impact
+    w << "AND tickets.priority IN (#{priority})\n" if priority
+    #w << "AND tickets.audience IN (#{audience})\n"
+    
+    find_by_sql("SELECT tickets.title,
+                        tickets.ttype,
+                        tickets.status,
+                        tickets.impact,
+                        tickets.priority,
+                        tickets.audience,
+                        users.fullname AS fullname,
+                        milestones.name AS name
+                 FROM tickets
+                 JOIN users ON tickets.assignee_id = users.id
+                 LEFT JOIN milestones ON tickets.milestone_id = milestones.id
+                 #{w}
+                 ORDER BY milestones.due_date DESC, priority")
   end
+
+
   
   #
   

--- a/app/views/activities/_ac_right_actionbox_post_message.html.erb
+++ b/app/views/activities/_ac_right_actionbox_post_message.html.erb
@@ -8,7 +8,7 @@
   <%= f.text_area(:activity, :rows => 4) -%>
   
   <p>
-    <a href="javascript:document.postmessage.submit();" class='function'>Update</a>
+    <a href="javascript:document.postmessage.submit();">Update</a>
   </p>
   
 <% end -%>

--- a/app/views/projects/ac_timeline.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_LOG, :project => @project, :pagetitle => @title } %>
-
-<%= render :partial => "ac_project_footer" %>

--- a/app/views/sessions/ac_new.html.erb
+++ b/app/views/sessions/ac_new.html.erb
@@ -25,7 +25,7 @@
     <%= check_box_tag 'remember_me' %>
   </p>
 
-  <p><a href="javascript:document.sessionform.submit();" class='function'>Login</a></p>
+  <p><a href="javascript:document.sessionform.submit();">Login</a></p>
 <% end -%>
 
 <%= div_formattedtext_close %>

--- /dev/null
+++ b/app/views/tickets/_ac_right_ticket_filter.html.erb
@@ -0,0 +1,44 @@
+
+<table class='right_default_table' cellspacing=0px>
+
+<% form_for :ticket, :url => project_tickets_path(@project.slug), :method => :get, :html => {:name => 'ticketfilter'} do |f| %>
+    
+<tr><th colspan=2>Ticket Filter</th></tr>
+
+<tr>
+
+<td><small>
+<br />
+<%= check_box(:ticket, :ttype_defect, {:checked => ticket_value_checked?(:ttype_defect)}, "1", "0") %>Defect<br />
+<%= check_box(:ticket, :ttype_enhancement, {:checked => ticket_value_checked?(:ttype_enhancement)}, "1", "0") %>Enhancement<br />
+<%= check_box(:ticket, :ttype_task, {:checked => ticket_value_checked?(:ttype_task)}, "1", "0") %>Task<br />
+<br />
+<%= check_box(:ticket, :status_proposed, {:checked => ticket_value_checked?(:status_proposed)}, "1", "0") %>Proposed<br />
+<%= check_box(:ticket, :status_open, {:checked => ticket_value_checked?(:status_open)}, "1", "0") %>Open<br />
+<%= check_box(:ticket, :status_closed, {:checked => ticket_value_checked?(:status_closed)}, "1", "0") %>Closed<br />
+<br />
+</small></td>
+
+<td><small>
+<br />
+<%= check_box(:ticket, :impact_low, {:checked => ticket_value_checked?(:impact_low)}, "1", "0") %>Low Impact<br />
+<%= check_box(:ticket, :impact_high, {:checked => ticket_value_checked?(:impact_high)}, "1", "0") %>High Impact<br />
+<%= check_box(:ticket, :impact_security, {:checked => ticket_value_checked?(:impact_security)}, "1", "0") %>Security Impact<br />
+<br />
+<%= check_box(:ticket, :priority_none, {:checked => ticket_value_checked?(:priority_none)}, "1", "0") %>No Priority<br />
+<%= check_box(:ticket, :priority_low, {:checked => ticket_value_checked?(:priority_low)}, "1", "0") %>Low Priority<br />
+<%= check_box(:ticket, :priority_high, {:checked => ticket_value_checked?(:priority_high)}, "1", "0") %>High Priority<br />
+<%= check_box(:ticket, :priority_critical, {:checked => ticket_value_checked?(:priority_critical)}, "1", "0") %>Critical<br />
+<br />
+</small></td>
+    
+</tr>
+
+<tr><td colspan=2>
+<center><a href="javascript:document.ticketfilter.submit();" class='function'>Update</a></center><br />
+</td></tr>
+
+<% end %>
+    
+</table>
+

--- a/app/views/tickets/ac_project_index.html.erb
+++ b/app/views/tickets/ac_project_index.html.erb
@@ -1,44 +1,5 @@
 <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %>
 
-<div id='todo'>
-<p>Ticket management</p>
-</div>
-
-
 <%= render_project_tickets %>
 
-<div id='todo'>
-<p>See <a href='http://dev.rubyonrails.org/query?status=new&status=assigned&status=reopened&milestone=2.1'>http://dev.rubyonrails.org/query?status=new&status=assigned&status=reopened&milestone=2.1</a></p>
-<p>Add a filter to top of page to show All, my or members tasks, priorities etc.</p>
-<p>Add percentage completed bars to each milestone / task</p>
-<p>Add comments for a milestone or task</p>
-<p>Move this view to tasklists controller</p>
-<p>A task can belong to a version or release</p>
-<p>A milestone can belong to a project or version (e.g. a project may have a bluesky 'v7 release', and version may have a more detailed 'v6.1 release' milestone</p>
-<p>A task may or may not have an issue associated with it</p>
-<p>Add a calendar view, allow tasks, milestones and events to be added to calendar</p>
-<p>Add Ajax task order sort (needs an milestone_order sort field in DB)</p>
-</div>
-
-<div id='todo'>
-<p>Tickets can belong to a project, release, milestone</p>
-<p>Tickets can be for bugs, enhancements or tasks</p>
-
-<ul>
-  <li>Project < ticket|task|milestone</li>
-  <ul>
-    <li>Version (stable, dev) < ticket|task|milestong</li>
-    <ul>
-      <li>Release (1.0, 1.1) < ticket|task|milestone</li>
-    </ul>
-  </ul>
-  <li>milestone < task(s)</li>
-  <li>ticket < task(s)</li>
-  <li>ticket and tasks are almost indentical, is there a better solution?</li>
-  <li>allow ticket categories to be created per project</li>
-  <li>add a filter like this: http://rubyforge.org/tracker/?atid=1698&group_id=426&func=browse</li>
-</ul>
-
-</div>
-
 <%= render :partial => "projects/ac_project_footer" %>

--- a/app/views/wikis/ac_project_edit.html.erb
+++ b/app/views/wikis/ac_project_edit.html.erb
@@ -21,9 +21,9 @@
   </p>
 
   <p>
-    <%= link_to "Cancel", project_wiki_path(@project.slug, @wiki.slug), :class => 'function' %> 
-    <a href="javascript:document.editwiki.submit();" class='function'>Preview</a> 
-    <a href="javascript:document.editwiki.submit();" class='function'>Update</a>
+    <%= link_to "Cancel", project_wiki_path(@project.slug, @wiki.slug) %> 
+    <a href="javascript:document.editwiki.submit();">Preview</a> 
+    <a href="javascript:document.editwiki.submit();">Update</a>
   </p>
   
 <% end -%>

--- a/app/views/wikis/ac_project_new.html.erb
+++ b/app/views/wikis/ac_project_new.html.erb
@@ -17,8 +17,8 @@
 
   <p>
     <%= link_to "Cancel", project_path(@project.slug), :class => 'function' %> 
-    <a href="javascript:document.newwiki.submit();" class='function'>Preview</a>
-    <a href="javascript:document.newwiki.submit();" class='function'>Create</a>
+    <a href="javascript:document.newwiki.submit();">Preview</a>
+    <a href="javascript:document.newwiki.submit();">Create</a>
   </p>
   
 <% end -%>

--- a/public/robots.txt
+++ b/public/robots.txt
@@ -7,5 +7,5 @@
 #User-agent: *
 #Disallow: /projects/
 
-User-agent: *
-Disallow: /
\ No newline at end of file
+#User-agent: *
+#Disallow: /

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -1,6 +1,4 @@
 /*
-  Gitlab specfic CSS
-  
   Note: CSS for syntax highlighting is in /vendor/coderay/styles/gitlab.rb
 */
 
@@ -191,6 +189,8 @@ table.right_default_table { border: 2px solid #eee; width: 100%; margin: 0px 0px
 table.right_default_table th { font-weight: 800; text-align: left; background-color: #eee; border: 0px; margin: 0px; padding: 4px 10px 4px 10px; }
 table.right_default_table td { vertical-align: top; text-align: left; background-color: #fbfbfb; border: 0px; margin: 0px; padding: 4px 5px 4px 10px; }
 table.right_default_table .count { font-size: 0.9em; }
+table.right_default_table .function { margin: 10px 0px 0px 0px; background-color: #fff; text-decoration: none; padding: 4px 8px 4px 8px; border: 1px solid #dde; font-weight: 800; }
+
 /*
 table.releasedownload { margin-top: 10px; margin-bottom: 20px; background-color: #fff; border-spacing: 0px; }
 table.releasedownload td { vertical-align: top; color: #000; font-size: 1.0em; border: 0px; }

--- a/test/fixtures/milestones.yml
+++ b/test/fixtures/milestones.yml
@@ -6,8 +6,8 @@
 <% fixtures :projects %>
 
 gitlabstable:
-  id: 2
-  name: "0.1 Latest Stable"
+  id: 1
+  name: "0.1 Stable"
   description: "90% of Model, very little CRUD, loads missing."
   status: :complete
   slug: "0-1"
@@ -18,8 +18,8 @@ gitlabstable:
   progress: 96
 
 gitlabdevelopment:
-  id: 3
-  name: "0.2 Active Development"
+  id: 2
+  name: "0.2 Active Dev"
   description: "Current pre-alpha development version, loads missing. Commits go to <a href=''>0.2 Development</a>"
   status: :active
   slug: "0-2"
@@ -30,7 +30,7 @@ gitlabdevelopment:
   progress: 20
 
 gitlabdevelopmentplusone:
-  id: 4
+  id: 3
   name: "0.3 Next"
   description: "Proposed next development version."
   status: :proposed
@@ -42,8 +42,8 @@ gitlabdevelopmentplusone:
   progress: 30
 
 gitlabpublic:
-  id: 5
-  name: "1.x Public Release"
+  id: 4
+  name: "1.x Public"
   description: "First fully functional release."
   status: :proposed
   slug: "1-x"
@@ -53,18 +53,3 @@ gitlabpublic:
   project_id: <%= projects(:gitlab) %>
   progress: 10
 
-gitlabpublicv2:
-  id: 6
-  name: "2.x"
-  description: "Proposed second generation"
-  status: :proposed
-  slug: "2-x"
-  audience: :public
-  created_at: "2008-03-07 18:04:00"
-  due_date: "2009-01-01 00:00:00"
-  project_id: <%= projects(:gitlab) %>
-  progress: 0
-
-
-
-