# HG changeset patch # User Chris Cannam # Date 1301592079 -3600 # Node ID 13147268cd65f729b42b6e45b1086de1d4808e81 # Parent f039bb649d0cf03a4b7b71d14564c2d15bc7aca0# Parent ebf53b46f3f3a9c7011c4bc69013acf9818d61e6 Merge from branch "feature_123" diff -r f039bb649d0c -r 13147268cd65 app/controllers/projects_controller.rb --- a/app/controllers/projects_controller.rb Thu Mar 31 15:21:43 2011 +0100 +++ b/app/controllers/projects_controller.rb Thu Mar 31 18:21:19 2011 +0100 @@ -217,7 +217,15 @@ end end end - + + def overview + @project.has_welcome_page = params[:has_welcome_page] + if @project.save + flash[:notice] = l(:notice_successful_update) + end + redirect_to :action => 'settings', :id => @project, :tab => 'overview' + end + def modules @project.enabled_module_names = params[:enabled_modules] flash[:notice] = l(:notice_successful_update) diff -r f039bb649d0c -r 13147268cd65 app/helpers/projects_helper.rb --- a/app/helpers/projects_helper.rb Thu Mar 31 15:21:43 2011 +0100 +++ b/app/helpers/projects_helper.rb Thu Mar 31 18:21:19 2011 +0100 @@ -23,6 +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 => '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 f039bb649d0c -r 13147268cd65 app/views/projects/settings/_overview.rhtml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/views/projects/settings/_overview.rhtml Thu Mar 31 18:21:19 2011 +0100 @@ -0,0 +1,18 @@ + +<% form_for :project, @project, + :url => { :action => 'overview', :id => @project }, + :html => {:id => 'overview-form'} do |f| %> + +
+ +

+<%= check_box_tag 'has_welcome_page', 1, @project.has_welcome_page? -%> +
<%= l(:text_has_welcome_page_info) %> +
<%= link_to(l(:button_welcome_page_edit), {:controller => 'wiki', :action => 'edit', :project_id => @project, :id => Wiki.titleize("Overview")}, :class => 'icon icon-edit') %> +

+ +
+ +<%= submit_tag l(:button_save) %> + +<% end %> diff -r f039bb649d0c -r 13147268cd65 app/views/projects/show.rhtml --- a/app/views/projects/show.rhtml Thu Mar 31 15:21:43 2011 +0100 +++ b/app/views/projects/show.rhtml Thu Mar 31 18:21:19 2011 +0100 @@ -4,6 +4,29 @@ <% end %> +<% if @project.has_welcome_page %> +<% page = @project.wiki.find_page("Overview") %> +<% end %> + +<% if page %> + +
+ +
+ +<%= render(:partial => "wiki/content", :locals => {:content => page.content_for_version()}) %> + +<% else %> +

<%=l(:label_overview)%>

@@ -79,6 +102,8 @@ <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> <% end %> +<% end %> + <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %> <% end %> diff -r f039bb649d0c -r 13147268cd65 config/locales/en.yml --- a/config/locales/en.yml Thu Mar 31 15:21:43 2011 +0100 +++ b/config/locales/en.yml Thu Mar 31 18:21:19 2011 +0100 @@ -819,6 +819,7 @@ 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" button_login: Login button_submit: Submit @@ -864,6 +865,7 @@ button_quote: Quote button_duplicate: Duplicate button_show: Show + button_welcome_page_edit: Edit custom overview page status_active: active status_registered: registered @@ -945,6 +947,7 @@ 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 contact us if you need help deciding how best to set this up.
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.
Please edit the page using the link below and put something in it, before you enable this setting!
Note: You must enable the Wiki module for this link to work.
default_role_manager: Manager diff -r f039bb649d0c -r 13147268cd65 config/routes.rb --- a/config/routes.rb Thu Mar 31 15:21:43 2011 +0100 +++ b/config/routes.rb Thu Mar 31 18:21:19 2011 +0100 @@ -138,6 +138,7 @@ :copy => [:get, :post], :settings => :get, :modules => :post, + :overview => :post, :archive => :post, :unarchive => :post } do |project| diff -r f039bb649d0c -r 13147268cd65 lib/redmine.rb --- a/lib/redmine.rb Thu Mar 31 15:21:43 2011 +0100 +++ b/lib/redmine.rb Thu Mar 31 18:21:19 2011 +0100 @@ -48,7 +48,7 @@ map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true map.permission :search_project, {:search => :index}, :public => true map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin - map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member + map.permission :edit_project, {:projects => [:settings, :edit, :update, :overview]}, :require => :member map.permission :select_project_modules, {:projects => :modules}, :require => :member map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member