--- a/app/controllers/activities_controller.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class ActivitiesController < ApplicationController
-
-  before_filter :find_project
-  
-  def index
-    @title, @url_suffix = Project.tab_settings(PRJ_TAB_ACTIVITIES)
-    @members = Member.find_by_project_alpha(@project.id)
-    if @is_member
-      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
-    else
-      @messages = Message.find_by_project(@project.id, 40)
-    end
-    render :action => "ac_project_index"
-  end
-
-  def create
-    @message = Message.new(params[:message])
-    @message.user_id = current_user.id
-    @message.project_id = @project.id
-    if @message.save
-      Journal.create(@message, request.env["REMOTE_ADDR"], @project.id, current_user.id).to_s
-      redirect_to project_activities_path(@project.slug)
-    else
-      #FIXME this is wrong I think
-      flash[:error] = 'Error.'
-      render :action => 'ac_project_new'
-    end
-  end  
-
-end

--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -59,7 +59,7 @@ class ArticlesController < ApplicationController
         original_article = @article.deep_clone
         if @article.update_attributes(params[:article])
           @article.save
-          Journal.update(original_article, @article, request.env["REMOTE_ADDR"], @project.id, current_user.id)
+          Journal.update(original_article, @article, request.env["REMOTE_ADDR"], @project.id, current_user.id, "Edited article: \'" + @article.title + "\'.")
           flash[:notice] = "Article was successfully updated."
           redirect_to project_articles_path(@project)
         else
@@ -77,15 +77,24 @@ class ArticlesController < ApplicationController
 
   def destroy
     if @is_member
-      flash[:notice] = 'Article deleted.'
       @article = Article.find(params[:id])
-      @article.status = :deleted
-      @article.save
-      redirect_to project_articles_path(@project)
+      if @article
+        original_article = Article.new
+        original_article = @article.deep_clone
+        @article.status = :deleted
+        if @article.save
+          Journal.update(original_article, @article, request.env["REMOTE_ADDR"], @project.id, current_user.id, "Deleted article: \'" + @article.title + "\'.")
+          flash[:notice] = 'Article deleted.'
+        else
+          #TODO add error report
+          flash[:error] = 'An error occurred.'
+        end
+        redirect_to project_articles_path(@project)
+      else
+        flash[:error] = 'Article ' + params[:id] + ' does not exist.'
+        redirect_to project_articles_path(@project)
+      end
     end
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Article ' + params[:id] + ' does not exist.'
-    redirect_to project_articles_path(@project)
   end
   
   # Show all articles /2008 or /2008/11 or /2008/11/1 and render grouped by date

--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -1,5 +1,16 @@
 class MembersController < ApplicationController
 
   before_filter :find_project
+
+  def index
+    @title, @url_suffix = Project.tab_settings(PRJ_TAB_MEMBERS)
+    @members = Member.find_by_project_alpha(@project.id)
+    if @is_member
+      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
+    else
+      @messages = Message.find_by_project(@project.id, 40)
+    end
+    render :action => "ac_project_index"
+  end
   
 end

--- /dev/null
+++ b/app/controllers/messages_controller.rb
@@ -0,0 +1,19 @@
+class MessagesController < ApplicationController
+
+  #before_filter :find_project
+
+  def create
+    @message = Message.new(params[:message])
+    @message.user_id = current_user.id
+    @message.project_id = @project.id
+    if @message.save
+      Journal.create(@message, request.env["REMOTE_ADDR"], @project.id, current_user.id).to_s
+      redirect_to project_members_path(@project.slug)
+    else
+      #FIXME this is wrong I think
+      flash[:error] = 'Error.'
+      render :action => 'ac_project_new'
+    end
+  end  
+
+end

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -31,8 +31,8 @@ class ProjectsController < ApplicationController
   end
   
   def show
-    @wiki = @project.wiki
-    @title = @wiki.title
+#    @wiki = @project.wiki
+    @title = "Summary"
     @url_suffix = ""
     render :action => "ac_show"
   end
@@ -84,7 +84,7 @@ class ProjectsController < ApplicationController
   end
 
   def roadmap
-    @title, @url_suffix = Project.tab_settings(PRJ_TAB_ROADMAP)
+    @title, @url_suffix = Project.tab_settings(PRJ_TAB_SUMMARY)
     render :action => "ac_roadmap"
   end
 
@@ -92,11 +92,11 @@ class ProjectsController < ApplicationController
     # Project events index page, shows list of all wikis for that project
     @events = Event.find_by_project(@project.id)
     if @events.size > 0
-      @title = "Events"
+      @title = "Log"
       @url_suffix = ""
       render :action => "ac_log_index"
     else
-      flash[:error] = "No events for this project."
+      flash[:error] = "No log for this project."
       redirect_to project_path(@project.slug)
     end    
   end

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -9,7 +9,7 @@ class RepositoriesController < ApplicationController
   def index
     if @project
       @repositories = @project.repositories.find(:all)
-      @title, @url_suffix = Project.tab_settings(PRJ_TAB_REPOS)
+      @title, @url_suffix = Project.tab_settings(PRJ_TAB_GIT)
       render :action => "ac_index"
     else
       flash[:error] = "Project not found."

--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -4,6 +4,7 @@ class TicketsController < ApplicationController
 
   def index
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_TICKETS)
+    @tickets = Ticket.filtered(params[:ticket] ? params[:ticket] : "")
     render :action => "ac_project_index"
   end
 

--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -9,7 +9,7 @@ class WikisController < ApplicationController
       # Project Wiki index page, shows list of all wikis for that project
       @wikis = Wiki.find_by_project(@project.id)
       if @wikis.size > 0
-        @title = "List Wikis"
+        @title = "Wiki"
         @url_suffix = ""
         render :action => "ac_project_index"
       else
@@ -117,7 +117,7 @@ class WikisController < ApplicationController
         original_wiki = @wiki.deep_clone
         if @wiki.update_attributes(params[:wiki])
           @wiki.save
-          Journal.update(original_wiki, @wiki, request.env["REMOTE_ADDR"], @project.id, current_user.id)
+          Journal.update(original_wiki, @wiki, request.env["REMOTE_ADDR"], @project.id, current_user.id, "Edited wiki: \'" + @wiki.title + "\'.")
           flash[:notice] = "Wiki was successfully updated."
           @title = @wiki.title
           render :action => "ac_project_show"
@@ -143,24 +143,35 @@ class WikisController < ApplicationController
 
   def destroy
     if @is_member
-      flash[:notice] = 'Wiki deleted.'
       @wiki = Wiki.find(params[:id])
-      @wiki.status = :deleted
-      @wiki.save
-      redirect_to project_wikis_path(@project)
+      if @wiki
+        original_wiki = Wiki.new
+        original_wiki = @wiki.deep_clone
+        @wiki.status = :deleted
+        if @wiki.save
+          Journal.update(original_wiki, @wiki, request.env["REMOTE_ADDR"], @project.id, current_user.id, "Deleted wiki: \'" + @wiki.title + "\'.")
+          flash[:notice] = 'Wiki deleted.'
+        else
+          #TODO add error report
+          flash[:error] = 'An error occurred.'
+        end
+        redirect_to project_wikis_path(@project)
+      else
+        flash[:error] = 'Wiki ' + params[:id] + ' does not exist.'
+        redirect_to project_wikis_path(@project)
+      end
+    
+#    else
+#        flash[:error] = 'xxxxxxxxxx'
+#        redirect_to root_path
     end
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Wiki ' + params[:id] + ' does not exist.'
-    redirect_to project_wikis_path(@project)
   end
   
-  
   #FIXME
   def to_slug(s)
     s.gsub(/\W+/, ' ').strip.downcase.gsub(/\ +/, '-')
   end
 
-
 protected
 
   # Increase view count for a wiki page

--- a/app/helpers/activities_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ActivitiesHelper
-
-  include ProjectsHelper
-
-end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -150,7 +150,7 @@ module ApplicationHelper
   end
 
   def breadcrumb_repositories
-    %Q{<li>#{link_to("Repos", project_repositories_path(@project))}<span> / </span></li>}
+    %Q{<li>#{link_to("Git", project_repositories_path(@project))}<span> / </span></li>}
   end
 
   def breadcrumb_repository
@@ -334,6 +334,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("Current Milestones", root_path)}</li>} if flags[:current_milestones]
     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 != ""    

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -23,12 +23,12 @@ module ProjectsHelper
     out
   end
   
-  def render_right_project_contributors
+  def render_right_project_members
     out = ""
     members = Member.find_by_project(@project.id)
     if members.size > 0 then
       out << "<table class='right_default_table'>"
-      out << "<tr><th>Contributors</th></tr>"
+      out << "<tr><th>Members</th></tr>"
       for member in members
         #TODO only display admin/modify members
         out << %Q{<tr><td>#{link_to_profile(member.user)} <small><span style='color: #888'>(#{format_member_accesslevel(member.accesslevel)})</span></small></td></tr>} if member.accesslevel != :user
@@ -62,11 +62,11 @@ module ProjectsHelper
   def render_project_tabs (active_tab)
     out = ""
     out << "<ul id='tabmenu'>"
-    out << project_tab(active_tab, PRJ_TAB_WIKI)
-    out << project_tab(active_tab, PRJ_TAB_REPOS)
-    out << project_tab(active_tab, PRJ_TAB_ACTIVITIES)
-    out << project_tab(active_tab, PRJ_TAB_ROADMAP)
+    out << project_tab(active_tab, PRJ_TAB_SUMMARY)
+    out << project_tab(active_tab, PRJ_TAB_GIT)
+    out << project_tab(active_tab, PRJ_TAB_MEMBERS)
     out << project_tab(active_tab, PRJ_TAB_TICKETS)
+    out << project_tab(active_tab, PRJ_TAB_WIKI)
     out << project_tab(active_tab, PRJ_TAB_ARTICLES)
     out << project_tab(active_tab, PRJ_TAB_FORUM)
     out << project_tab(active_tab, PRJ_TAB_LOG)
@@ -78,14 +78,14 @@ module ProjectsHelper
   def breadcrumb_repos_tab(subtab)
     subtab == PRJ_TAB_SUBTAB_NONE ? out = "" : out = breadcrumb_repositories
     case subtab
-    when PRJ_TAB_REPOS_LOGS
+    when PRJ_TAB_GIT_LOGS
       out << breadcrumb_repository
-    when PRJ_TAB_REPOS_COMMIT
+    when PRJ_TAB_GIT_COMMIT
       out << breadcrumb_repository
       out << breadcrumb_repos_logs
-    when PRJ_TAB_REPOS_TREE
+    when PRJ_TAB_GIT_TREE
       out << breadcrumb_repository
-    when PRJ_TAB_REPOS_MERGEREQUESTS
+    when PRJ_TAB_GIT_MERGEREQUESTS
     end
     out
   end
@@ -100,43 +100,44 @@ module ProjectsHelper
   def render_right_column_project (tab, subtab)
     out = ""
     case tab
-    when PRJ_TAB_WIKI
-      case subtab
-      when PRJ_TAB_WIKI_EDIT, PRJ_TAB_WIKI_NEW
-        out << actionbox_basic(:allow_shortcuts => true)
-      when PRJ_TAB_WIKI_LIST
-        out << actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true)
-      else
-        out << actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true)
-        out << render_right_project_extrainfo
-        out << render_right_project_contributors
-      end
-    when PRJ_TAB_ACTIVITIES
-      out << actionbox_basic(:allow_shortcuts => true)
-      out << render(:partial => "ac_right_actionbox_post_message") if @is_member
-    when PRJ_TAB_REPOS
+    when PRJ_TAB_SUMMARY
+      out << actionbox_complex(:allow_shortcuts => true)
+      out << render_right_project_extrainfo
+      out << render_right_project_members
+    when PRJ_TAB_GIT
       case subtab
       when PRJ_TAB_SUBTAB_NONE
         out << actionbox_complex(:allow_shortcuts => true, :clone_mainline => true)
-      when PRJ_TAB_REPOS_SUMMARY
+      when PRJ_TAB_GIT_SUMMARY
         out << render(:partial => "repositories/ac_right_actionbox_repos_summary")
-      when PRJ_TAB_REPOS_LOGS
+      when PRJ_TAB_GIT_LOGS
         out << actionbox_basic(:allow_shortcuts => true)
         out << render(:partial => "repositories/ac_right_branches")
-      when PRJ_TAB_REPOS_COMMIT
+      when PRJ_TAB_GIT_COMMIT
         out << actionbox_basic(:allow_shortcuts => true)
         out << render(:partial => "commits/ac_right_diff_mode_selector")
-      when PRJ_TAB_REPOS_TREE
+      when PRJ_TAB_GIT_TREE
         out << actionbox_basic(:allow_shortcuts => true)
         out << render(:partial => "trees/ac_right_branches")
-      when PRJ_TAB_REPOS_MERGEREQUESTS
+      when PRJ_TAB_GIT_MERGEREQUESTS
         out << actionbox_basic(:allow_shortcuts => true)
       end
-    when PRJ_TAB_ROADMAP
-      out << actionbox_complex(:allow_shortcuts => true, :new_milestone => true, :completed_milestones => true)
+    when PRJ_TAB_MEMBERS
+      out << actionbox_basic(:allow_shortcuts => true)
+      out << render(:partial => "ac_right_actionbox_post_message") if @is_member
+      out << render_right_project_members
     when PRJ_TAB_TICKETS
-      out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true)
+      out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true, :new_milestone => true, :completed_milestones => true, :current_milestones => true)
       out << render(:partial => "ac_right_ticket_filter")
+    when PRJ_TAB_WIKI
+      case subtab
+      when PRJ_TAB_WIKI_EDIT, PRJ_TAB_WIKI_NEW
+        out << actionbox_basic(:allow_shortcuts => true)
+      when PRJ_TAB_WIKI_LIST
+        out << actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true)
+      else
+        out << actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true)
+      end
     when PRJ_TAB_ARTICLES
       case subtab
       when PRJ_TAB_ARTICLES_EDIT, PRJ_TAB_ARTICLES_NEW

--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -1,39 +1,6 @@
 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]

--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -80,7 +80,7 @@ class Journal < ActiveRecord::Base
   # ip: IP address
   # user_id: user id of changer
   #
-  def self.update (original_model, updated_model, ip, project_id, user_id)
+  def self.update (original_model, updated_model, ip, project_id, user_id, summary)
     
     # record that something has happened
     journal = Journal.new
@@ -89,7 +89,7 @@ class Journal < ActiveRecord::Base
     journal.row_id = updated_model.id
     journal.ip = ip
     journal.user_id = user_id
-    journal.summary = "Updated " << updated_model.class.to_s
+    journal.summary = summary
      #TODO check saves okay
     journal.save
     #

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -228,33 +228,33 @@ class Project < ActiveRecord::Base
 
     def self.tab_settings (tab)
       case tab
+      when PRJ_TAB_SUMMARY
+        title = "Summary"
+        url_suffix = "/"
+      when PRJ_TAB_GIT
+        title = "Git"
+        url_suffix = "/git/"
+      when PRJ_TAB_MEMBERS
+        title = "Members"
+        url_suffix = "/members/"
       when PRJ_TAB_WIKI
         title = "Wiki"
-        url_suffix = ""
-      when PRJ_TAB_ACTIVITIES
-        title = "Activity"
-        url_suffix = "/activities"
-      when PRJ_TAB_REPOS
-        title = "Repositories"
-        url_suffix = "/repos"
-      when PRJ_TAB_ROADMAP
-        title = "Roadmap"
-        url_suffix = "/roadmap"
+        url_suffix = "/wikis/"
       when PRJ_TAB_TICKETS
         title = "Tickets"
-        url_suffix = "/tickets"
+        url_suffix = "/tickets/"
       when PRJ_TAB_ARTICLES
         title = "Articles"
-        url_suffix = "/articles"
+        url_suffix = "/articles/"
       when PRJ_TAB_FORUM
         title = "Forum"
-        url_suffix = "/forum"
+        url_suffix = "/forum/"
       when PRJ_TAB_LOG
         title = "Log"
-        url_suffix = "/log"
+        url_suffix = "/log/"
       when PRJ_TAB_CONFIG
         title = "Config"
-        url_suffix = "/config"
+        url_suffix = "/config/"
       end
       return title, url_suffix
     end

--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -5,6 +5,17 @@ class Ticket < ActiveRecord::Base
 
   belongs_to :assignee, :class_name => 'User', :foreign_key => 'assignee_id' 
   belongs_to :submitter, :class_name => 'User', :foreign_key => 'submitter_id' 
+
+  def formatted_ttype
+    case self.ttype
+    when :enhancement
+      "Enh."
+    when :task
+      "Task"
+    when :defect
+      "Def."
+    end
+  end
   
   protected
   
@@ -56,7 +67,7 @@ class Ticket < ActiveRecord::Base
                  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")
+                 ORDER BY milestones.due_date ASC, priority DESC")
   end
 
   def self.generate_key(length = 6)

--- a/app/views/activities/_ac_right_actionbox_post_message.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<% form_for :message, :url => project_activities_path(@project.slug), :method => :post, :html => {:name => 'postmessage', :id => 'input'} do |f| -%>
-
-  <h2>Post Message</h2>
-
-  <p>Add your current activity:</p>
-
-  <%= f.text_area(:activity, :rows => 4) -%>
-  
-  <p>
-    <a href="javascript:document.postmessage.submit();">Update</a>
-  </p>
-  
-<% end -%>

--- a/app/views/activities/ac_project_index.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_ACTIVITIES,
-                                                                  :subtab => PRJ_TAB_SUBTAB_NONE,
-                                                                  :project => @project,
-                                                                  :pagetitle => @title } %>
-
-<% if @is_member && @members.size > 1 %>
-<div id='projectmembers'>
-<ul>
-<% @members.each do |m| %>
-  <% if m.user != current_user %>
-  <li><%= m.user.fullname %></li>
-  <% end %>
-<% end %>
-</ul>
-</div>
-<% end %>
-  
-<%= div_formattedtext_open %>
-
-<ul>
-<% @messages.each do |m| %>
-  <li>
-  <% unless @is_member %>
-  <strong><%= m.user.fullname %></strong>
-  <% end %