--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -31,6 +31,63 @@ class ArticlesController < ApplicationController
   def show
   end
   
+  def edit
+    if @project
+      # Project article
+      @article = Article.find_by_id(params[:id], current_user)
+      if @article
+        @title = "Editing: " + @project.title + ": " + @article.title
+        render :action => "ac_project_edit"
+      else
+        flash[:error] = "Article not found."
+        redirect_to project_path(@project)
+      end
+    else
+      # Normal article index page
+    end
+  end
+  
+  def update
+    if @project
+      # Project article
+      @article = Article.find_by_id(params[:id], current_user)
+      if @article
+        #FIXME is this correct?, does deep_clone make one? (if not it should)
+        original_article = Article.new
+        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)
+          flash[:notice] = "Article was successfully updated."
+          redirect_to project_articles_path(@project)
+        else
+          @title = "Editing: " + @project.title + ": " + @article.title
+          render :action => "ac_project_edit"
+        end
+      else
+        flash[:error] = "Article not found."
+        redirect_to project_path(@project)
+      end
+    else
+      # Normal Article
+    end
+  end
+
+  def destroy
+    if @is_member
+      flash[:notice] = 'Article deleted.'
+      Article.find(params[:id]).destroy
+      redirect_to project_articles_path(@project)
+    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
   def find_by_date
     @articles = Article.find_by_date(current_user, params[:year], params[:month], params[:day])

--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -115,6 +115,7 @@ class WikisController < ApplicationController
         original_wiki = Wiki.new
         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)
           flash[:notice] = "Wiki was successfully updated."
           @title = @wiki.title
@@ -139,6 +140,18 @@ class WikisController < ApplicationController
     end
   end
 
+  def destroy
+    if @is_member
+      flash[:notice] = 'Wiki deleted.'
+      Wiki.find(params[:id]).destroy
+      redirect_to project_wikis_path(@project)
+    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(/\ +/, '-')

--- a/app/helpers/articles_helper.rb
+++ b/app/helpers/articles_helper.rb
@@ -5,6 +5,11 @@ module ArticlesHelper
 
   include ProjectsHelper
   
+  #
+  # article - object
+  # short - false to show full body text, true to show summary
+  # use_permalink - makes title in to an anchor to permalink url
+  #
   def render_article (article, short, use_permalink)
     # render the coloured tab
     out = %Q{<div class='article_left_tab'><a href='/archives/type/}

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -108,9 +108,9 @@ module ProjectsHelper
         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
-      out << render_right_project_extrainfo
-      out << render_right_project_contributors
     when PRJ_TAB_ACTIVITIES
       out << actionbox_basic(:allow_shortcuts => true)
       out << render(:partial => "ac_right_actionbox_post_message") if @is_member
@@ -138,7 +138,12 @@ module ProjectsHelper
       out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true)
       out << render(:partial => "ac_right_ticket_filter")
     when PRJ_TAB_ARTICLES
-      out << actionbox_complex(:allow_shortcuts => true, :new_article => true)
+      case subtab
+      when PRJ_TAB_ARTICLES_EDIT, PRJ_TAB_ARTICLES_NEW
+        out << actionbox_basic(:allow_shortcuts => true)
+      else
+        out << actionbox_complex(:allow_shortcuts => true, :new_article => true)
+      end
     when PRJ_TAB_FORUM
       out << actionbox_basic(:allow_shortcuts => true)
     when PRJ_TAB_LOG

--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -28,7 +28,11 @@ class Article < ActiveRecord::Base
       return at.to_s.capitalize
     end
   end  
- 
+
+  def deep_clone
+    Marshal::load(Marshal.dump(self))
+  end
+  
 protected
 
   
@@ -77,6 +81,12 @@ protected
     @projects = Project.list_for_user(curruser)
     find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC", :limit => 3)
   end
+
+  # finds articles for a user based on the user slug e.g. /profiles/test-user/articles
+  def self.find_by_id (id, curruser)
+    @projects = Project.list_for_user(curruser)
+    find(:first, :conditions => ["status = '#{:published}' AND id = '#{id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"])
+  end
   
   # finds articles for a user based on the user slug e.g. /profiles/test-user/articles
   def self.find_by_user (user_id, curruser)

--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -85,11 +85,11 @@ class Journal < ActiveRecord::Base
     # record that something has happened
     journal = Journal.new
     journal.action = :update
-    journal.model_type = updated_model.type.to_s
+    journal.model_type = updated_model.class.to_s
     journal.row_id = updated_model.id
     journal.ip = ip
     journal.user_id = user_id
-    journal.summary = "Updated " << model.class.to_s
+    journal.summary = "Updated " << updated_model.class.to_s
      #TODO check saves okay
     journal.save
     #

--- a/app/views/articles/_ac_form.html.erb
+++ b/app/views/articles/_ac_form.html.erb
@@ -1,41 +0,0 @@
-<p>
-  <%= form.label :title -%><br />
-  <%= form.text_field :title, :class => "text" -%>
-</p>
-<% unless ["edit", "update"].include?(controller.action_name) -%>
-  <p>
-    <%= form.label :slug, "Slug (for urls etc)" -%><br />
-    <%= form.text_field :slug, :class => "text" -%>
-  </p>
-  <script type="text/javascript" charset="utf-8">
-    var slugger = new ProjectSluggorizer("project_title", "project_slug");
-  </script>
-<% end -%>
-<p>
-  <%= form.label :tag_list, "Categories (space seperated)" -%><br />
-  <%= form.text_field :tag_list, :class => "text" -%>
-</p>
-<p>
-  <%= form.label :license -%><br />
-  <%= form.select :license, Project::LICENSES -%>
-</p>
-<p>
-  <%= form.label :home_url, "Home URL (eg Rubyforge etc)" -%><br />
-  <%= form.text_field :home_url, :class => "text" -%>
-</p>
-<p>
-  <%= form.label :mailinglist_url, "Mailinglist URL (if any)" -%><br />
-  <%= form.text_field :mailinglist_url, :class => "text" -%>
-</p>
-<p>
-  <%= form.label :bugtracker_url, "Bugtracker URL (if any)" -%><br />
-  <%= form.text_field :bugtracker_url, :class => "text" -%>
-</p>
-<p>
-  <%= form.label :description -%><br />
-  <small class="hint">
-    <a href="http://daringfireball.net/projects/markdown/">Markdown</a> and
-    basic html is allowed
-  </small><br />
-  <%= form.text_area :description, :class => "text wide tall" -%>
-</p>
\ No newline at end of file

--- a/app/views/articles/ac_project_edit.html.erb
+++ b/app/views/articles/ac_project_edit.html.erb
@@ -5,25 +5,40 @@
 
 <%= div_formattedtext_open %>
 
-<%= error_messages_for :wiki %>
+<%= error_messages_for :article %>
 
-<% form_for :wiki, :url => project_wiki_path(@project.slug, @wiki.slug), :html => {:method => :put, :name => 'editwiki', :id => 'input'} do |f| -%>
+<% form_for :article, :url => project_article_path(@project.slug, @article.id), :html => {:method => :put, :name => 'editarticle', :id => 'input'} do |f| -%>
 
   <h2><%= @title %></h2>
 
   <p>The wiki title is automatically prefixed with the project title when the wiki is displayed.</p>
   
-  <%= render :partial => "ac_form", :locals => { :f => f } %>
+  <%= render :partial => "ac_form" %>
 
   <p>
-    <%= f.label :slug -%><br/>
-    <%= f.text_field :slug -%>
+    <%= f.label :title -%><br/>
+    <%= f.text_field :title -%>
   </p>
 
   <p>
-    <%= 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>
+    <%= f.label :body -%><br/>
+    <%= f.text_area :body, :rows => 20 -%>
+  </p>
+
+  <p>
+    <%= f.label :body_summary -%><br/>
+    <%= f.text_area :body_summary, :rows => 10 -%>
+  </p>
+
+  <p>
+    <%= f.label :permalink -%><br/>
+    <%= f.text_field :permalink -%>
+  </p>
+  
+  <p>
+    <%= link_to "Cancel", project_articles_path(@project.slug) %> 
+    <a href="javascript:document.editarticle.submit();">Preview</a> 
+    <a href="javascript:document.editarticle.submit();">Update</a>
   </p>
   
 <% end -%>
@@ -31,7 +46,7 @@
 <br />
 <br />
 
-<%= render_wiki %>
+<%= render_article(@article, false, false) %>
 <%= div_formattedtext_close %>
 
 <%= render :partial => "projects/ac_project_footer" %>
\ No newline at end of file

--- a/app/views/shared/_ac_article_list.html.erb
+++ b/app/views/shared/_ac_article_list.html.erb
@@ -35,7 +35,7 @@
   <td align=center><%= 0 %></td>
   <td align=center><%= article.views %></td>
   <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Edit", edit_project_article_path(@project.slug, article.id)) %></td>
-  <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_article_path(@project.slug, article.id), :action => "destroy") %></td>
+  <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_article_path(@project.slug, article.id), :method => :delete) %></td>
 <% end %>
 </tr>
 <% end %>

--- a/app/views/wikis/ac_project_index.html.erb
+++ b/app/views/wikis/ac_project_index.html.erb
@@ -34,8 +34,8 @@
     <td><%= wiki.format.to_s.capitalize %></td>
     <td><%= format_datetime_ddmmyyhhmm(wiki.created_at) %></td>
   <% if @is_member %>
-    <td>Edit</td>
-    <td>Del</td>
+    <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Edit", edit_project_wiki_path(@project.slug, wiki.slug)) %></td>
+    <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_wiki_path(@project.slug, wiki.id), :method => :delete) %></td>
   <% end %>
 </tr>
 <% end %>

--- a/db/migrate/014_create_articles.rb
+++ b/db/migrate/014_create_articles.rb
@@ -4,8 +4,6 @@
 # also it's 7 because there are 6 migrations before it on the project being merged in, the order
 # of the migrations is importand for foreign_key_migrations plugin
 #
-# Some fields have an _jid this is an identifier for journaling system that tracks changes
-#
 
 class CreateArticles < ActiveRecord::Migration
 
@@ -24,42 +22,22 @@ class CreateArticles < ActiveRecord::Migration
     
     create_table :articles do |t|
       t.string :title, :default => "Empty", :null => false
-      t.integer :title_jid
-      #
       t.text :body
-      t.integer :body_jid
-      #
       t.text :body_summary
-      t.integer :body_summary_jid
       #also need to change the article_type table/fixtures
       t.column :article_type, :enum, :limit => [:news, :code, :release, :howto, :issue, :other], :default => :other, :null => true
-      t.integer :article_type_jid
-      #
       t.column :status, :enum, :limit => [:draft, :published, :test, :deleted], :default => :draft
-      t.integer :status_jid
-      # who is allowed to post comments
       t.column :comment_status, :enum, :limit => [:open, :closed, :users, :administrators], :default => :open
-      t.integer :comment_status_jid
-      # slug friendly name e.g. sample-title
       t.string :permalink, :null => false
-      t.integer :permalink_jid
-      # who is allowed to view (members = project members)
       t.column :audience, :enum, :limit => [:public, :members], :default => :public
-      t.integer :audience_jid
-      # 
       t.integer :views, :default => 0
       #t.boolean :members_only, :default => false, :null => false
       t.timestamps
       #foreign keys
       t.integer :user_id, :on_delete => :cascade, :on_update => :cascade, :default => 1
-      t.integer :user_id_jid
-      #
       t.integer :category_id, :on_delete => :cascade, :on_update => :cascade, :default => 1
-      t.integer :category_id_jid
-      #
       #FIXME allow project|version|release polymorphic (maybe, it would help the project filter on the article tab)
       t.integer :project_id, :on_delete => :cascade, :on_update => :cascade, :default => 1
-      t.integer :project_id_jid
     end
     add_index :articles, [:id]
     add_index :articles, [:status, :audience]

--- a/db/migrate/015_create_tickets.rb
+++ b/db/migrate/015_create_tickets.rb
@@ -48,7 +48,6 @@ class CreateTickets < ActiveRecord::Migration
       t.timestamps
       #
       t.integer :component_id
-      t.integer :component_jid
       t.integer :milestone_id  
       t.integer :assignee_id, :references => nil #foreign key to user table
       t.integer :submitter_id, :references => nil #foreign key to user table

--- a/test/fixtures/tickets.yml
+++ b/test/fixtures/tickets.yml
@@ -7,6 +7,17 @@
 <% fixtures :users, :milestones %>
 
 #
+# Fixup edit article and wiki preview button
+#
+# Change articles bodies and project descriptions to use markdown
+#
+# Update wiki and article should have the .save error checked
+#
+# Add delete journals for wiki, article (they shouldn't physically delete anyway)
+#
+
+
+#
 # Possible filtering
 #
 #   * Summary