# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310468017 -3600
# Node ID 57c28ea4c482c69852beb2fddb24f217ba1f3548
# Parent  1c1ee0b2a1074e1026e89cfeb1d3be35be0bcc1c# Parent  cd64fb9ab7010563f2c2f1e2a1a6f5a05ce14434
Merge

diff -r 1c1ee0b2a107 -r 57c28ea4c482 app/views/projects/show.rhtml
--- a/app/views/projects/show.rhtml	Mon Jul 11 16:50:45 2011 +0100
+++ b/app/views/projects/show.rhtml	Tue Jul 12 11:53:37 2011 +0100
@@ -10,6 +10,14 @@
 
 <% if page %>
 
+<% if @project.module_enabled? :wiki %>
+<% if User.current.allowed_to?(:edit_wiki_pages, @project) %>
+<div class="contextual">
+<%= link_to(l(:button_welcome_page_edit_this), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
+</div>
+<% end %>
+<% end %>
+
 <div class="contextual" style="clear: right">
 <ul>
 <% @users_by_role.keys.sort.each do |role| %>
diff -r 1c1ee0b2a107 -r 57c28ea4c482 config/locales/en.yml
--- a/config/locales/en.yml	Mon Jul 11 16:50:45 2011 +0100
+++ b/config/locales/en.yml	Tue Jul 12 11:53:37 2011 +0100
@@ -907,6 +907,7 @@
   button_duplicate: Duplicate
   button_show: Show
   button_welcome_page_edit: Create or edit welcome page
+  button_welcome_page_edit_this: Edit this page
 
   status_active: active
   status_registered: registered
@@ -1038,4 +1039,4 @@
 
   notice_added_to_project: 'You have been added to the project "{{project_name}}".'
   notice_project_homepage: "You can visit the project using the following link: {{project_url}}"
-  mail_subject_added_to_project: "You've been added to a project on {{value}}"
\ No newline at end of file
+  mail_subject_added_to_project: "You've been added to a project on {{value}}"