--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -4,7 +4,6 @@
 class ArticlesController < ApplicationController
 
   after_filter :after_article
-
   
   # Show all articles, render grouped by year, month
   def index

--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -1,4 +1,6 @@
 class WikisController < ApplicationController
+
+  after_filter :after_wiki
   
   def index
     if params[:project_id] != nil
@@ -172,6 +174,18 @@ class WikisController < ApplicationController
   def to_slug(s)
     s.gsub(/\W+/, ' ').strip.downcase.gsub(/\ +/, '-')
   end
+
+
+protected
+
+  # Increase view count for a wiki page
+  def after_wiki
+    if action_name == "show" and @wiki != nil then
+      @wiki.views = @wiki.views + 1
+      @wiki.save!
+    end
+  end
+
   
 end
 

--- a/app/views/wikis/ac_project_index.html.erb
+++ b/app/views/wikis/ac_project_index.html.erb
@@ -9,12 +9,13 @@
 
 <tr>
   <th width='<%= STYLE_TABLE_COL_WIDTH_ID %>'>ID</th>
-  <th>Title</th>
+  <th><%= @project.title %> Wiki Pages</th>
   <% if @member %>
     <th width='100'>Status</th>
-    <th width='100'>Format</th>
     <th width='180'>Slug</th>
   <% end %>
+    <th width='80'>Views</th>
+    <th width='100'>Format</th>
     <th width='<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>'>Created</th>
   <% if @member %>
     <th colspan='2' width='<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT.to_i * 2 %>'></th>
@@ -27,9 +28,10 @@
   <td><%= link_to wiki.title, project_wiki_path(@project.slug, wiki.slug) %></td>
   <% if @member %>
     <td><%= wiki.status.to_s.capitalize %></td>
-    <td><%= wiki.format.to_s.capitalize %></td>
     <td>/<%= wiki.slug %></td>
   <% end %>
+    <td><%= wiki.views.to_s %></td>
+    <td><%= wiki.format.to_s.capitalize %></td>
     <td><%= format_datetime_ddmmyyhhmm(wiki.created_at) %></td>
   <% if @member %>
     <td>Edit</td>

--- a/test/fixtures/article_bodies/_gitlab-dev-team-collaboration.txt
+++ b/test/fixtures/article_bodies/_gitlab-dev-team-collaboration.txt
@@ -1,4 +1,4 @@
-<p>Fanatical about speed, underwhelmed by the usability of existing hosted tools, and tired of multiple logins, I decided to mash together a site using OSS.</p>
+<p>Underwhelmed by the usability of existing hosted tools, and tired of multiple logins, I decided to mash together a site using OSS.</p>
 <p>Two weeks later it was clear splicing together Wordpress, Wikimedia etc. was just moving the problem, so I started to code a new app from scratch - that could share a login and share a model.</p>
 <p>The key requirements were:</p>
 <ul>

--- a/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt
+++ b/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt
@@ -1,6 +1,6 @@
-<p>The project has been renamed to Gitlab (it's more meaningful and the domain was available), it will be hosted on the <a href='http://www.itlab.org'>gitlab.org</a> domain.</p>
+<p>The <a href='http://www.gitlab.org/projects/gitlab'>project</a> has been renamed to Gitlab (it's more meaningful and the domain was available), it will be hosted on the <a href='http://www.itlab.org'>gitlab.org</a> domain.</p>
 
-<p>I will probably fork the project from Gitorious this week and stop updating. Gitorious is about to add Krawek's events changes which
+<p>I will probably fork the project from <a href='http://gitorious.org'>Gitorious</a> this week and stop updating. Gitorious is about to add Krawek's events changes which
 conflict with events in Gitlab (also I'm now using different comment and project membership models so it's getting harder
 to merge).</p>
 

--- a/test/fixtures/articles.yml
+++ b/test/fixtures/articles.yml
@@ -5,7 +5,7 @@
 
 A005:
   id: 5
-  title: "Renamed and forked"
+  title: "Renamed and Forked"
   body: "<%= File.open("#{RAILS_ROOT}/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt",'r').read %>"
   body_summary: "<%= File.open("#{RAILS_ROOT}/test/fixtures/article_bodies/_gitlab-renamed-and-forked.txt",'r').read %>"
   article_type: :news