# HG changeset patch
# User Chris Cannam
# Date 1301647065 -3600
# Node ID debf12a566cd242024c18f518d083dd75686b258
# Parent  13147268cd65f729b42b6e45b1086de1d4808e81# Parent  8c804ce943db3932b65032fa9b62d18947de66b2
Merge from branch "feature_123"

diff -r 13147268cd65 -r debf12a566cd app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb	Thu Mar 31 18:21:19 2011 +0100
+++ b/app/helpers/projects_helper.rb	Fri Apr 01 09:37:45 2011 +0100
@@ -23,7 +23,7 @@
   
   def project_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
-            {:name => 'overview', :action => :edit_project, :partial => 'projects/settings/overview', :label => :label_overview},
+            {:name => 'overview', :action => :edit_project, :partial => 'projects/settings/overview', :label => :label_welcome_page},
             {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
             {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
             {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
diff -r 13147268cd65 -r debf12a566cd app/views/projects/settings/_overview.rhtml
--- a/app/views/projects/settings/_overview.rhtml	Thu Mar 31 18:21:19 2011 +0100
+++ b/app/views/projects/settings/_overview.rhtml	Fri Apr 01 09:37:45 2011 +0100
@@ -5,10 +5,22 @@
 
 <div class="box tabular">
 
+<p><%= l(:text_has_welcome_page_info, { :overview_link => link_to(l(:label_overview), { :controller => 'projects', :action => 'show' } ) } ) %></p>
+
+<% if @project.module_enabled? :wiki %>
+
+<p><%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
+
+<% else %>
+
+<p><%= l(:text_has_welcome_page_wiki_disabled, { :modules_link => link_to(l(:label_module_plural), { :controller => 'projects', :action => 'settings', :tab => 'modules' } ) } ) %></p>
+
+<% end %>
+
 <p><label for="has_welcome_page"><%= l(:label_has_welcome_page) %></label>
 <%= check_box_tag 'has_welcome_page', 1, @project.has_welcome_page? -%>
-<br/><em><%= l(:text_has_welcome_page_info) %></em>
-<br/><%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %>
+<br/><em><%= l(:setting_has_welcome_page) %></em>
+
 </p>
 
 </div>
diff -r 13147268cd65 -r debf12a566cd config/locales/en.yml
--- a/config/locales/en.yml	Thu Mar 31 18:21:19 2011 +0100
+++ b/config/locales/en.yml	Fri Apr 01 09:37:45 2011 +0100
@@ -373,6 +373,7 @@
   setting_rest_api_enabled: Enable REST web service
   setting_cache_formatted_text: Cache formatted text
   setting_default_notification_option: Default notification option
+  setting_has_welcome_page: Select this to replace the project overview page with your own welcome page
   
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects
@@ -819,7 +820,8 @@
   label_project_copy_notifications: Send email notifications during the project copy
   label_principal_search: "Search by name:"
   label_user_search: "Search for user:"
-  label_has_welcome_page: "Use custom overview page"
+  label_welcome_page: "Welcome page"
+  label_has_welcome_page: "Use your own welcome page"
   
   button_login: Login
   button_submit: Submit
@@ -865,7 +867,7 @@
   button_quote: Quote
   button_duplicate: Duplicate
   button_show: Show
-  button_welcome_page_edit: Edit custom overview page
+  button_welcome_page_edit: Create or edit welcome page
   
   status_active: active
   status_registered: registered
@@ -947,7 +949,8 @@
   text_settings_repo_is_internal: Currently the repository hosted at this site is the primary repository for this project.
   text_settings_repo_is_external: Currently the repository hosted at this site is a read-only copy of an external repository.
   text_settings_repo_need_help: Please <a href="/projects/soundsoftware-site/wiki/Help">contact us</a> if you need help deciding how best to set this up.<br>We can also import complete revision history from other systems into a new primary repository for you if you wish.
-  text_has_welcome_page_info: Select this to use your own wiki-editable information page instead of the standard project overview.<br>Please edit the page using the link below and put something in it, before you enable this setting!<br><b>Note:</b> You must enable the Wiki module for this link to work.<br>
+  text_has_welcome_page_info: <b>Welcome page</b><p>You can replace the standard {{overview_link}} page for this project with your own welcome page.<br>This page will be editable using the project Wiki.
+  text_has_welcome_page_wiki_disabled: <b>Note:</b> You must enable the Wiki module in the {{modules_link}} tab before you can create or edit this page.
 
  
   default_role_manager: Manager
diff -r 13147268cd65 -r debf12a566cd db/migrate/20110331152140_add_has_welcome_page_to_projects.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/migrate/20110331152140_add_has_welcome_page_to_projects.rb	Fri Apr 01 09:37:45 2011 +0100
@@ -0,0 +1,9 @@
+class AddHasWelcomePageToProjects < ActiveRecord::Migration
+  def self.up
+    add_column :projects, :has_welcome_page, :boolean
+  end
+
+  def self.down
+    remove_column :projects, :has_welcome_page
+  end
+end