--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
   rescue_from ActiveRecord::RecordNotFound, :with => :render_not_found
   rescue_from ActionController::UnknownController, :with => :render_not_found
   rescue_from ActionController::UnknownAction, :with => :render_not_found
-  
+
   def rescue_action(exception)
     return super if RAILS_ENV != "production"
     
@@ -70,4 +70,5 @@ class ApplicationController < ActionController::Base
         "appcast"
       end
     end
+
 end

--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -4,6 +4,7 @@
 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,15 +1,14 @@
 class WikisController < ApplicationController
   
   def index
-    # Project Wiki index page, shows list of all wikis for that project
     if params[:project_id] != nil
-      @project = Project.find_by_slug(params[:project_id], current_user)
+      # Project Wiki index page, shows list of all wikis for that project
+      @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
       if @project != nil
-        @title = "List Wikis"
-        #@url_suffix = Project.tab_settings(PRJ_TAB_DOCUMENTATION)
-        @url_suffix = ""
         @wikis = Wiki.find_by_project(@project.id)
-        if @wikis.size > 0        
+        if @wikis.size > 0
+          @title = "List Wikis"
+          @url_suffix = ""
           render :action => "ac_project_index"
         else
           flash[:error] = "No wikis for this project."
@@ -20,7 +19,7 @@ class WikisController < ApplicationController
         redirect_to root_path
       end
     else
-      # show default wiki page
+      # Main wiki - default page
       @wiki = Wiki.find_by_slug("wiki-contents")
       @wiki_breadcrumb = false
       @title = "Wiki"
@@ -30,9 +29,9 @@ class WikisController < ApplicationController
 
   def show
     if params[:project_id] != nil
-      @project = Project.find_by_slug(params[:project_id], current_user)
+      # Project wiki, page specfied
+      @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
       if @project != nil
-        # Project wiki, page specfied
         @wiki = Wiki.find_by_slug(params[:id])
         if @wiki != nil
           @title = @wiki.title
@@ -48,7 +47,7 @@ class WikisController < ApplicationController
         redirect_to root_path
       end
     else
-      # Normal Wiki index page
+      # Main wiki index page
       @wiki = Wiki.find_by_slug(params[:id])
       if @wiki != nil
         @wiki_breadcrumb = true
@@ -66,7 +65,7 @@ class WikisController < ApplicationController
 
   def new
     if params[:project_id] != nil
-      @project = Project.find_by_slug(params[:project_id], current_user)
+      @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
       if @project != nil
         @wiki = Wiki.new
         @title = "New " + @project.title + " Wiki Page"
@@ -85,7 +84,7 @@ class WikisController < ApplicationController
 
   def create
     #FIXME error check @project
-    @project = Project.find_by_slug(params[:project_id], current_user)
+    @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
     @wiki = Wiki.new(params[:wiki])
     @wiki.slug = to_slug(@wiki.title)
     @wiki.project_id = @project.id
@@ -102,7 +101,7 @@ class WikisController < ApplicationController
   
   def edit
     if params[:project_id] != nil
-      @project = Project.find_by_slug(params[:project_id], current_user)
+      @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
       if @project != nil
         # Project wiki, page specfied
         @wiki = Wiki.find_by_slug(params[:id])
@@ -133,7 +132,7 @@ class WikisController < ApplicationController
   
   def update
     if params[:project_id] != nil
-      @project = Project.find_by_slug(params[:project_id], current_user)
+      @project, @member = Project.find_by_slug_public_or_member(params[:project_id], current_user)
       if @project != nil
         # Project wiki, page specfied
         @wiki = Wiki.find_by_slug(params[:id])

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,7 +1,7 @@
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
   include TagsHelper
-  
+
   def default_css_tag_sizes
     %w(tag_size_1 tag_size_2 tag_size_3 tag_size_4)
   end
@@ -326,27 +326,25 @@ module ApplicationHelper
     out
   end  
 
-
   def render_right_actionbox_complex (flags = {})
     out = %Q{<table class='right_default_table'>}
     out << %Q{<tr><th>Actions</th></tr>}
     #
-    if logged_in?
-      acts = ""
-      acts << %Q{<li>#{link_to("Edit Wiki Page", edit_project_wiki_path(@project.slug, @wiki.slug))}</li>} if flags[:edit_project_wiki]
-      acts << %Q{<li>#{link_to("New Wiki Page", new_project_wiki_path(@project.slug))}</li>} if flags[:new_project_wiki]
-      acts << %Q{<li>#{link_to("List Wiki Pages", project_wikis_path(@project.slug))}</li>} if flags[:list_project_wikis]
-      #
-      acts << %Q{<li>#{link_to("Edit Article", edit_project_article_path(@project.slug, @article.slug))}</li>} if flags[:edit_article]
-      acts << %Q{<li>#{link_to("New Article", new_project_article_path(@project.slug))}</li>} if flags[:new_article]
-      acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone]
-      acts << %Q{<li>#{link_to("New Ticket", new_project_ticket_path(@project.slug))}</li>} if flags[:new_ticket]
-      acts << %Q{<li>#{link_to("Clone Mainline", new_project_repository_path(@project.slug, @repository))}</li>} if flags[:clone_mainline]
-      out << %Q{<tr><td><ul>#{acts}</ul></td></tr>} if acts != ""    
-    end
+    #FIXME finish this, also it must must only be true if logged_in?
+    logged_in? ? is_member = true : is_member = false
+    acts = ""
+    acts << %Q{<li>#{link_to("Edit Wiki Page", edit_project_wiki_path(@project.slug, @wiki.slug))}</li>} if flags[:edit_project_wiki] && is_member
+    acts << %Q{<li>#{link_to("New Wiki Page", new_project_wiki_path(@project.slug))}</li>} if flags[:new_project_wiki] && is_member
+    acts << %Q{<li>#{link_to("List Wiki Pages", project_wikis_path(@project.slug))}</li>} if flags[:list_project_wikis]
+    acts << %Q{<li>#{link_to("Edit Article", edit_project_article_path(@project.slug, @article.slug))}</li>} if flags[:edit_article] && is_member
+    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 Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && 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("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>#{render_right_actionbox_default(flags)}</td></tr>}
     out << %Q{</table>}
     out
   end  
-
+  
 end

--- /dev/null
+++ b/app/helpers/members_helper.rb
@@ -0,0 +1,16 @@
+module MembersHelper
+
+  #
+  # FIXME pointless, and should be in model
+  def format_member_accesslevel(accesslevel)
+    case accesslevel
+    when :admin
+      return "Admin"
+    when :modify
+      return "Modify"
+    when :readonly        
+      return "Read Only"
+    end
+  end
+
+end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -98,8 +98,8 @@ module ProjectsHelper
       else
         out << render_right_actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true)
       end
-      out << render_right_project_contributors
       out << render_right_project_extrainfo
+      out << render_right_project_contributors
     when PRJ_TAB_DOWNLOADS
       out << render_right_actionbox_basic(:allow_shortcuts => true)
     when PRJ_TAB_REPOS
@@ -135,7 +135,6 @@ module ProjectsHelper
     end
     out
   end  
-
   
   def format_life_cycle (ls)
     case ls
@@ -144,7 +143,17 @@ module ProjectsHelper
     when :mature_frozen
       "Mature Frozen"
     else
-      ls.to_s.captilize
+      ls.to_s.capitalize
+    end
+  end
+
+  
+  def format_member_accesslevel (al)
+    case al
+    when :readonly        
+      "Read Only"
+    else
+      al.to_s.capitalize
     end
   end
 

--- a/app/models/appcast/member.rb
+++ b/app/models/appcast/member.rb
@@ -5,27 +5,23 @@ class Member < ActiveRecord::Base
     
   protected
   
-    #
     def self.find_by_search(phrase)
       #find(:all, :conditions => ["status = '#{:published}' AND title like ?", "%" << phrase << "%"])
     end
 
-    #
     def self.find_by_project(project_id)
       find(:all, :conditions => ["project_id = '#{project_id}'"], :order => "accesslevel DESC")
     end
 
-    #
     def self.find_by_user(user_id)
       find(:all, :conditions => ["user_id = '#{user_id}'"])
     end
 
-    #
     def self.is_member? (project_id, user_id)
-      if find(:first, :conditions => ["project_id = '#{project_id}' AND user_id = '#{user_id}'"]) != nil then
-        return true
+      if find(:first, :conditions => ["project_id = '#{project_id}' AND user_id = '#{user_id}'"]) != nil
+        true
       else
-        return false
+        false
       end
     end
     

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,5 +1,5 @@
 class Project < ActiveRecord::Base
-  acts_as_taggable
+  acts_as_taggable if $application_mode != MODE_APPCAST
   
   belongs_to  :user
   has_many    :comments, :dependent => :destroy
@@ -188,12 +188,18 @@ class Project < ActiveRecord::Base
           )
     end
 
-    #
-    def self.find_by_slug_secure(slug, curruser)
+    def self.find_by_slug_public_or_member(slug, curruser)
       projects_allowed = Project.list_for_user(curruser)
-      find(:first, :conditions => ["status = '#{:active}' AND slug = '#{slug}' AND ( audience = '#{:public}' OR projects.id IN (" << projects_allowed << ") )"])
+      project = find(:first, :conditions => ["status = '#{:active}' AND slug = '#{slug}' AND ( audience = '#{:public}' OR projects.id IN (" << projects_allowed << ") )"])
+      #TODO this can be found from the above
+      if project
+        member = Member.is_member?(project.id, curruser.id)
+      else
+        member = false
+      end
+      return project, member
     end
-
+    
     # takes a list of project_ids e.g. '1','2','3'
     def self.find_by_list (list, curruser)
       projects_allowed = Project.list_for_user(curruser)
@@ -202,29 +208,28 @@ class Project < ActiveRecord::Base
 
     #
     # Get a list of project_ids of a user is a members of in the format '1','2','3'
-    # FIXME this should be in a helper I think
     #
     def self.list_for_user(user)
-      #if user != nil then
-      #  list = ""
-      #  projects = Member.find_by_user(user.id)
-      #  if projects.size > 0 then
-      #    start = true
-      #    for project in projects
-      #      if not start then
-      #        list = list << ","
-      #      else
-      #        start = false
-      #      end
-      #      list = list << "'" << project.project_id.to_s << "'"
-      #    end
-      #    return list
-      #  else
-      #    return "'1'" # see below
-      #  end
-      #else
+      if user != nil then
+        list = ""
+        projects = Member.find_by_user(user.id)
+        if projects.size > 0 then
+          start = true
+          for project in projects
+            if not start then
+              list = list << ","
+            else
+              start = false
+            end
+            list = list << "'" << project.project_id.to_s << "'"
+          end
+          return list
+        else
+          return "'1'" # see below
+        end
+      else
         return "'1'" # Project.id 1 is no project (this is a bit of a frig really, without it 2 queries will be needed for all finds)
-      #end
+      end
     end    
 
     def self.tab_settings (tab)

--- a/app/views/layouts/appcast.html.erb
+++ b/app/views/layouts/appcast.html.erb
@@ -21,7 +21,7 @@
   <% end -%>
 
   <div id="system_message">
-  <p><strong>Notice:</strong> this site is unstable work-in-progress, source for it is available on <a href='http://gitorious.org/projects/gitorious/repos/appcast'>gitorious.org</a>. Contact <a href='mailto:mtkd@prj2.com'>mtkd@prj2.com</a></p>
+  <p><strong>Notice:</strong> <%= @member.to_s %> this site is unstable work-in-progress, source for it is available on <a href='http://gitorious.org/projects/gitorious/repos/appcast'>gitorious.org</a>. Contact <a href='mailto:mtkd@prj2.com'>mtkd@prj2.com</a></p>
   </div>
 
   <div id='header'>

--- a/app/views/wikis/ac_project_index.html.erb
+++ b/app/views/wikis/ac_project_index.html.erb
@@ -8,25 +8,33 @@
 <table class='public'>
 
 <tr>
-  <th>ID</th>
-  <th width='260'>Title</th>
-  <th>Status</th>
-  <th>Format</th>
-  <th>Slug</th>
-  <th>Created</th>
-  <th colspan='2'></th>
+  <th width='<%= STYLE_TABLE_COL_WIDTH_ID %>'>ID</th>
+  <th>Title</th>
+  <% if @member %>
+    <th width='100'>Status</th>
+    <th width='100'>Format</th>
+    <th width='180'>Slug</th>
+  <% end %>
+    <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>
+  <% end %>
 </tr>
 
 <% for wiki in @wikis %>
 <tr>
   <td><%= wiki.id %></td>
-  <td><%= wiki.title %></td>
-  <td><%= wiki.status.to_s.capitalize %></td>
-  <td><%= wiki.format.to_s.capitalize %></td>
-  <td>/<%= wiki.slug %></td>
-  <td><%= format_datetime_ddmmyyhhmm(wiki.created_at) %></td>
-  <td>Edit</td>
-  <td>Del</td>
+  <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><%= format_datetime_ddmmyyhhmm(wiki.created_at) %></td>
+  <% if @member %>
+    <td>Edit</td>
+    <td>Del</td>
+  <% end %>
 </tr>
 <% end %>
 

--- a/config/initializers/appcast_config.rb
+++ b/config/initializers/appcast_config.rb
@@ -48,6 +48,7 @@ ART_LIST_USER = 1
 ART_LIST_PROJECT = 2
 
 #
+STYLE_TABLE_COL_WIDTH_ID = "30"
 STYLE_TABLE_COL_WIDTH_DATE = "74"
 STYLE_TABLE_COL_WIDTH_DDMMYYHHMM = "124"
 STYLE_TABLE_COL_WIDTH_DDBBYY = "82"

--- a/public/stylesheets/appcast.css
+++ b/public/stylesheets/appcast.css
@@ -164,7 +164,7 @@ html>body #content_withrightcolumn {height: auto;}
 #comments .commentdate { font-size: 0.8em; }
 
 /* Footer Section */
-#footer { clear: left; height: 600px; margin: 60px 0px 0px 0px; padding: 3px; border-top: 1px solid #aaa; background-color: #ededed; }
+#footer { clear: left; height: 600px; margin: 60px 360px 0px 0px; padding: 3px; border-top: 1px solid #aaa; background-color: #fff; }
 #footer .text { margin: 0px 0px 0px 2px; font-size: 0.8em; color: #666; }
 
 table.admin_vert { margin-top: 20px; margin-bottom: 10px; background-color: #aaa; border-spacing: 1px; }
@@ -188,8 +188,8 @@ table.right_archive_summary th { background-color: #fff; text-align: left; font-
 table.right_archive_summary td { font-size: 0.9em; text-align: center; margin: 0px; padding: 1px; }
 
 table.right_default_table { border: 2px solid #eee; width: 100%; margin: 0px 0px 20px 0px; border-spacing: 0px; }
-table.right_default_table th { font-weight: 800; text-align: left; background-color: #eee; border: 0px; margin: 0px; padding: 6px 10px 6px 10px; }
-table.right_default_table td { vertical-align: top; text-align: left; background-color: #fbfbfb; border: 0px; margin: 0px; padding: 6px 10px 6px 10px; }
+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.releasedownload { margin-top: 10px; margin-bottom: 20px; background-color: #fff; border-spacing: 0px; }

--- /dev/null
+++ b/test/fixtures/members.yml
@@ -0,0 +1,21 @@
+#
+#
+#
+#
+<% fixtures :users, :projects %>
+
+one:
+  id: 1
+  accesslevel: :admin
+  project_id: <%= projects(:appcast) %>
+  user_id: <%= users(:mtkd) %>
+
+
+
+
+
+
+
+
+
+

--- a/test/fixtures/tickets.yml
+++ b/test/fixtures/tickets.yml
@@ -8,7 +8,7 @@
 
 #
 #
-#
+# Remove all != nil
 #
 # Add defaults to fixtures:
 #