Adds a branch for unlimited project hierarchy.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/work@2148 e93f8b46-1217-0410-a6f0-8f06a7374b81

nested_projects/app/views/projects/_edit.rhtml

@@ -0,0 +1,4 @@
+<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>

nested_projects/app/views/projects/_form.rhtml

@@ -0,0 +1,49 @@
+<%= error_messages_for 'project' %>
+
+<div class="box">
+<!--[form:project]-->
+<p><%= f.text_field :name, :required => true %><br /><em><%= l(:text_caracters_maximum, 30) %></em></p>
+
+<% if User.current.admin? and !@root_projects.empty? %>
+    <p><%= f.select :parent_id, (@root_projects.collect {|p| [p.name, p.id]}), { :include_blank => true } %></p>
+<% end %>
+
+<p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
+<p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
+<% unless @project.identifier_frozen? %>
+<br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) %></em>
+<% end %></p>
+<p><%= f.text_field :homepage, :size => 60 %></p>
+<p><%= f.check_box :is_public %></p>
+<%= wikitoolbar_for 'project_description' %>
+
+<% @project.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :project, value %></p>
+<% end %>
+<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
+</div>
+
+<% unless @trackers.empty? %>
+<fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
+<% @trackers.each do |tracker| %>
+    <label class="floating">
+    <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
+    <%= tracker %>
+    </label>
+<% end %>
+<%= hidden_field_tag 'project[tracker_ids][]', '' %>
+</fieldset>
+<% end %>
+
+<% unless @issue_custom_fields.empty? %>
+<fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
+<% @issue_custom_fields.each do |custom_field| %>
+    <label class="floating">
+	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= custom_field.name %>
+	</label>
+<% end %>
+<%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
+</fieldset>
+<% end %>
+<!--[eoform:project]-->

nested_projects/app/views/projects/activity.rhtml

@@ -0,0 +1,60 @@
+<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2>
+<p class="subtitle"><%= "#{l(:label_date_from)} #{format_date(@date_to - @days)} #{l(:label_date_to).downcase} #{format_date(@date_to-1)}" %></p>
+
+<div id="activity">
+<% @events_by_day.keys.sort.reverse.each do |day| %>
+<h3><%= format_activity_day(day) %></h3>
+<dl>
+<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
+  <dt class="<%= e.event_type %>  <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
+	<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
+  <span class="time"><%= format_time(e.event_datetime, false) %></span>
+  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
+  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
+  <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
+  <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
+<% end -%>
+</dl>
+<% end -%>
+</div>
+
+<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
+
+<div style="float:left;">
+<%= link_to_remote(('&#171; ' + l(:label_previous)), 
+                   {:update => "content", :url => params.merge(:from => @date_to - @days - 1), :complete => 'window.scrollTo(0,0)'},
+                   {:href => url_for(params.merge(:from => @date_to - @days - 1)),
+                    :title => "#{l(:label_date_from)} #{format_date(@date_to - 2*@days)} #{l(:label_date_to).downcase} #{format_date(@date_to - @days - 1)}"}) %>
+</div>
+<div style="float:right;">
+<%= link_to_remote((l(:label_next) + ' &#187;'), 
+                   {:update => "content", :url => params.merge(:from => @date_to + @days - 1), :complete => 'window.scrollTo(0,0)'},
+                   {:href => url_for(params.merge(:from => @date_to + @days - 1)),
+                    :title => "#{l(:label_date_from)} #{format_date(@date_to)} #{l(:label_date_to).downcase} #{format_date(@date_to + @days - 1)}"}) unless @date_to >= Date.today %>
+</div>
+&nbsp;
+<p class="other-formats">
+    <%= l(:label_export_to) %>
+    <%= link_to 'Atom', params.merge(:format => :atom, :from => nil, :key => User.current.rss_key), :class => 'feed' %>
+</p>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
+<% end %>
+
+<% content_for :sidebar do %>
+<% form_tag({}, :method => :get) do %>
+<h3><%= l(:label_activity) %></h3>
+<p><% @activity.event_types.each do |t| %>
+<label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
+<% end %></p>
+<% if @project && @project.active_children.any? %>
+    <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
+    <%= hidden_field_tag 'with_subprojects', 0 %>
+<% end %>
+<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>
+<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
+<% end %>
+<% end %>
+
+<% html_title(l(:label_activity), @author) -%>

nested_projects/app/views/projects/add.rhtml

@@ -0,0 +1,16 @@
+<h2><%=l(:label_project_new)%></h2>
+
+<% labelled_tabular_form_for :project, @project, :url => { :action => "add" } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+
+<fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
+<% Redmine::AccessControl.available_project_modules.each do |m| %>
+    <label class="floating">
+    <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %>
+    <%= (l_has_string?("project_module_#{m}".to_sym) ? l("project_module_#{m}".to_sym) : m.to_s.humanize) %>
+    </label>
+<% end %>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+<% end %>

nested_projects/app/views/projects/add_file.rhtml

@@ -0,0 +1,16 @@
+<h2><%=l(:label_attachment_new)%></h2>
+
+<%= error_messages_for 'attachment' %>
+<div class="box">
+<% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
+
+<% if @versions.any? %>
+<p><label for="version_id"><%=l(:field_version)%></label>
+<%= select_tag "version_id", content_tag('option', '') +
+														 options_from_collection_for_select(@versions, "id", "name") %></p>
+<% end %>
+
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+</div>
+<%= submit_tag l(:button_add) %>
+<% end %> 

nested_projects/app/views/projects/add_issue_category.rhtml

@@ -0,0 +1,6 @@
+<h2><%=l(:label_issue_category_new)%></h2>
+
+<% labelled_tabular_form_for :category, @category, :url => { :action => 'add_issue_category' } do |f| %>
+<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
+<% end %>

nested_projects/app/views/projects/add_version.rhtml

@@ -0,0 +1,6 @@
+<h2><%=l(:label_version_new)%></h2>
+
+<% labelled_tabular_form_for :version, @version, :url => { :action => 'add_version' } do |f| %>
+<%= render :partial => 'versions/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
+<% end %>

nested_projects/app/views/projects/changelog.rhtml

@@ -0,0 +1,42 @@
+<h2><%=l(:label_change_log)%></h2>
+
+<% if @versions.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<% @versions.each do |version| %>   
+    <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
+    <% if version.effective_date %>
+      <p><%= format_date(version.effective_date) %></p>
+    <% end %>
+    <p><%=h version.description %></p>
+    <% issues = version.fixed_issues.find(:all,
+                                 :include => [:status, :tracker],
+                                 :conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true],
+                                 :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+       issues ||= []
+    %>
+    <% if !issues.empty? %>
+    <ul>
+      <% issues.each do |issue| %>
+        <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+      <% end %>
+    </ul>
+    <% end %>
+<% end %>
+
+<% content_for :sidebar do %>
+<% form_tag do %>
+<h3><%= l(:label_change_log) %></h3>
+<% @trackers.each do |tracker| %>
+  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %></label><br />
+<% end %>
+<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<% end %>
+
+<h3><%= l(:label_version_plural) %></h3>
+<% @versions.each do |version| %>
+<%= link_to version.name, :anchor => version.name %><br />
+<% end %>
+<% end %>

nested_projects/app/views/projects/destroy.rhtml

@@ -0,0 +1,16 @@
+<h2><%=l(:label_confirmation)%></h2>
+<div class="warning">
+<p><strong><%=h @project_to_destroy %></strong><br />
+<%=l(:text_project_destroy_confirmation)%>
+
+<% if @project_to_destroy.children.any? %>
+<br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.children.sort.collect{|p| p.to_s}.join(', ')))) %>
+<% end %>
+</p>
+<p>
+    <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project_to_destroy}) do %>
+    <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
+    <%= submit_tag l(:button_delete) %>
+    <% end %>
+</p>
+</div>

nested_projects/app/views/projects/index.rhtml

@@ -0,0 +1,31 @@
+<div class="contextual">
+    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.admin? %>
+    <%= link_to l(:label_issue_view_all), { :controller => 'issues' } %> |
+    <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
+</div>
+
+<h2><%=l(:label_project_plural)%></h2>
+
+<% @project_tree.keys.sort.each do |project| %>
+<h3><%= link_to h(project.name), {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
+<%= textilizable(project.short_description, :project => project) %>
+
+<% if @project_tree[project].any? %>
+    <p><%= l(:label_subproject_plural) %>:
+    <%= @project_tree[project].sort.collect {|subproject| 
+       link_to(h(subproject.name), {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
+<% end %>
+<% end %>
+
+<% if User.current.logged? %>
+<p style="text-align:right;">
+<span class="icon icon-fav"><%= l(:label_my_projects) %></span>
+</p>
+<% end %>
+
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+</p>
+
+<% html_title(l(:label_project_plural)) -%>

nested_projects/app/views/projects/list_files.rhtml

@@ -0,0 +1,42 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_attachment_plural)%></h2>
+
+<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+
+<table class="list">
+  <thead><tr>
+    <%= sort_header_tag("#{Attachment.table_name}.filename", :caption => l(:field_filename)) %>
+    <%= sort_header_tag("#{Attachment.table_name}.created_on", :caption => l(:label_date), :default_order => 'desc') %>
+    <%= sort_header_tag("#{Attachment.table_name}.filesize", :caption => l(:field_filesize), :default_order => 'desc') %>
+    <%= sort_header_tag("#{Attachment.table_name}.downloads", :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
+    <th>MD5</th>
+    <th></th>
+  </tr></thead>
+  <tbody>
+<% @containers.each do |container| %>	
+  <% next if container.attachments.empty? -%>
+	<% if container.is_a?(Version) -%>
+  <tr><th colspan="6" align="left"><span class="icon icon-package"><b><%=h container %></b></span></th></tr>
+	<% end -%>
+  <% container.attachments.each do |file| %>		
+  <tr class="<%= cycle("odd", "even") %>">
+    <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
+    <td align="center"><%= format_time(file.created_on) %></td>
+    <td align="center"><%= number_to_human_size(file.filesize) %></td>
+    <td align="center"><%= file.downloads %></td>
+    <td align="center"><small><%= file.digest %></small></td>
+    <td align="center">
+    <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
+																				 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
+    </td>
+  </tr>		
+  <% end
+  reset_cycle %>
+<% end %>
+  </tbody>
+</table>
+
+<% html_title(l(:label_attachment_plural)) -%>

nested_projects/app/views/projects/list_members.rhtml

@@ -0,0 +1,13 @@
+<h2><%=l(:label_member_plural)%></h2>
+
+<% if @members.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<% members = @members.group_by {|m| m.role } %>
+<% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %>
+<h3><%= role.name %></h3>
+<ul>
+<% members[role].each do |m| %>
+<li><%= link_to m.name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
+<% end %>
+</ul>
+<% end %>

nested_projects/app/views/projects/roadmap.rhtml

@@ -0,0 +1,50 @@
+<h2><%=l(:label_roadmap)%></h2>
+
+<% if @versions.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+<div id="roadmap">
+<% @versions.each do |version| %>   
+    <%= tag 'a', :name => version.name %>
+    <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
+    <%= render :partial => 'versions/overview', :locals => {:version => version} %>
+    <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
+
+    <% issues = version.fixed_issues.find(:all,
+                                          :include => [:status, :tracker],
+                                          :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
+                                          :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
+       issues ||= []
+    %>
+    <% if issues.size > 0 %>
+    <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
+    <ul>
+    <%- issues.each do |issue| -%>
+        <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+    <%- end -%>
+    </ul>
+    </fieldset>
+    <% end %>
+<% end %>
+</div>
+<% end %>
+
+<% content_for :sidebar do %>
+<% form_tag({}, :method => :get) do %>
+<h3><%= l(:label_roadmap) %></h3>
+<% @trackers.each do |tracker| %>
+  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
+  <%= tracker.name %></label><br />
+<% end %>
+<br />
+<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
+<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
+<% end %>
+
+<h3><%= l(:label_version_plural) %></h3>
+<% @versions.each do |version| %>
+<%= link_to version.name, "##{version.name}" %><br />
+<% end %>
+<% end %>
+
+<% html_title(l(:label_roadmap)) %>

nested_projects/app/views/projects/settings.rhtml

@@ -0,0 +1,24 @@
+<h2><%=l(:label_settings)%></h2>
+
+<% tabs = project_settings_tabs %>
+<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
+
+<div class="tabs">
+<ul>
+<% tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
+</ul>
+</div>
+
+<% tabs.each do |tab| -%>
+<%= content_tag('div', render(:partial => tab[:partial]), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
+
+<% html_title(l(:label_settings)) -%>

nested_projects/app/views/projects/settings/_boards.rhtml

@@ -0,0 +1,28 @@
+<% if @project.boards.any? %>
+<table class="list">
+	<thead><th><%= l(:label_board) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th><th style="width:15%"></th></thead>
+	<tbody>
+<% @project.boards.each do |board|
+	next if board.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+    <td><%=h board.name %></td>
+    <td><%=h board.description %></td>
+    <td align="center">
+    <% if authorize_for("boards", "edit") %>
+    <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
+    <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
+    <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
+    <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
+    <% end %>
+    </td>    
+    <td align="center"><%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
+	</tr>
+<% end %>
+    </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project} %></p>

nested_projects/app/views/projects/settings/_issue_categories.rhtml

@@ -0,0 +1,26 @@
+<% if @project.issue_categories.any? %>
+<table class="list">
+	<thead>
+	<th><%= l(:label_issue_category) %></th>
+	<th><%= l(:field_assigned_to) %></th>
+	<th style="width:15%"></th>
+	<th style="width:15%"></th>
+	</thead>
+	<tbody>
+<% for category in @project.issue_categories %>
+	<% unless category.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+    <td><%=h(category.name) %></td>
+    <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %></td>
+	</tr>
+	<% end %>
+<% end %>
+    </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<p><%= link_to_if_authorized l(:label_issue_category_new), :controller => 'projects', :action => 'add_issue_category', :id => @project %></p>

nested_projects/app/views/projects/settings/_members.rhtml

@@ -0,0 +1,50 @@
+<%= error_messages_for 'member' %>
+<% roles = Role.find_all_givable %>
+<% users = User.active.find(:all).sort - @project.users %>
+<% # members sorted by role position
+   members = @project.members.find(:all, :include => [:role, :user]).sort %>
+   
+<% if members.any? %>
+<table class="list">
+	<thead>
+	  <th><%= l(:label_user) %></th>
+	  <th><%= l(:label_role) %></th>
+	  <th style="width:15%"></th>
+          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
+	</thead>
+	<tbody>
+	<% members.each do |member| %>
+	<% next if member.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+	<td><%= member.name %></td>
+    <td align="center">
+    <% if authorize_for('members', 'edit') %>
+      <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member}, :method => :post) do |f| %>
+        <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, {}, :class => "small" %>
+        <%= submit_tag l(:button_change), :class => "small" %>
+      <% end %>
+    <% end %>
+    </td>
+    <td align="center">
+      <%= link_to_remote l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
+                                              :method => :post
+                                            }, :title => l(:button_delete),
+                                               :class => 'icon icon-del' %>
+    </td>
+    <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
+	</tr>
+	</tbody>
+<% end; reset_cycle %>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<% if authorize_for('members', 'new') && !users.empty? %>
+  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
+    <p><label for="member_user_id"><%=l(:label_member_new)%></label><br />
+    <%= f.select :user_id, users.collect{|user| [user.name, user.id]} %>
+    <%= l(:label_role) %>: <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, :selected => nil %>
+    <%= submit_tag l(:button_add) %></p>
+  <% end %>
+<% end %>

nested_projects/app/views/projects/settings/_modules.rhtml

@@ -0,0 +1,17 @@
+<% form_for :project, @project,
+            :url => { :action => 'modules', :id => @project },
+            :html => {:id => 'modules-form'} do |f| %>
+            
+<div class=box>
+<strong><%= l(:text_select_project_modules) %></strong>
+
+<% Redmine::AccessControl.available_project_modules.each do |m| %>
+<p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) -%>
+ <%= (l_has_string?("project_module_#{m}".to_sym) ? l("project_module_#{m}".to_sym) : m.to_s.humanize) %></label></p>
+<% end %>
+</div>
+
+<p><%= check_all_links 'modules-form' %></p>
+<p><%= submit_tag l(:button_save) %></p>
+
+<% end %>

nested_projects/app/views/projects/settings/_repository.rhtml

@@ -0,0 +1,24 @@
+<% remote_form_for :repository, @repository, 
+                   :url => { :controller => 'repositories', :action => 'edit', :id => @project },
+                   :builder => TabularFormBuilder,
+                   :lang => current_language do |f| %>
+
+<%= error_messages_for 'repository' %>
+
+<div class="box tabular">
+<p><label><%= l(:label_scm) %></label><%= scm_select_tag(@repository) %></p>
+<%= repository_field_tags(f, @repository) if @repository %>
+</div>
+
+<div class="contextual">
+<% if @repository && !@repository.new_record? %>
+<%= link_to(l(:label_user_plural), {:controller => 'repositories', :action => 'committers', :id => @project}, :class => 'icon icon-user') %>
+<%= link_to(l(:button_delete), {:controller => 'repositories', :action => 'destroy', :id => @project},
+            :confirm => l(:text_are_you_sure),
+            :method => :post,
+            :class => 'icon icon-del') %>
+<% end %>
+</div>
+
+<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save), :disabled => @repository.nil?) %>
+<% end %>

nested_projects/app/views/projects/settings/_versions.rhtml

@@ -0,0 +1,29 @@
+<% if @project.versions.any? %>
+<table class="list">
+	<thead>
+    <th><%= l(:label_version) %></th>
+    <th><%= l(:field_effective_date) %></th>
+    <th><%= l(:field_description) %></th>
+    <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th>
+    <th style="width:15%"></th>
+    <th style="width:15%"></th>
+    </thead>
+	<tbody>
+<% for version in @project.versions.sort %>
+    <tr class="<%= cycle 'odd', 'even' %>">
+    <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td>
+    <td align="center"><%= format_date(version.effective_date) %></td>
+    <td><%=h version.description %></td>
+    <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
+    <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
+    </td>
+    </tr>
+<% end; reset_cycle %>
+    </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>

nested_projects/app/views/projects/settings/_wiki.rhtml

@@ -0,0 +1,19 @@
+<% remote_form_for :wiki, @wiki,
+                   :url => { :controller => 'wikis', :action => 'edit', :id => @project },
+                   :builder => TabularFormBuilder,
+                   :lang => current_language do |f| %>
+
+<%= error_messages_for 'wiki' %>
+
+<div class="box tabular">
+<p><%= f.text_field :start_page, :size => 60, :required => true %><br />
+<em><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p>
+</div>
+
+<div class="contextual">
+<%= link_to(l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project},
+            :class => 'icon icon-del') if @wiki && !@wiki.new_record? %>
+</div>
+
+<%= submit_tag((@wiki.nil? || @wiki.new_record?) ? l(:button_create) : l(:button_save)) %>
+<% end %>

nested_projects/app/views/projects/show.rhtml

@@ -0,0 +1,80 @@
+<h2><%=l(:label_overview)%></h2> 
+	
+<div class="splitcontentleft">
+	<%= textilizable @project.description %>	
+	<ul>
+	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= link_to(h(@project.homepage), @project.homepage) %></li><% end %>
+    <% if @subprojects.any? %>
+ 	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
+    <% end %>
+	<% if @project.parent %>
+	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
+	<% end %>
+	<% @project.custom_values.each do |custom_value| %>
+	<% if !custom_value.value.empty? %>
+	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+	<% end %>
+	<% end %>
+	</ul>	
+
+  <% if User.current.allowed_to?(:view_issues, @project) %>
+  <div class="box">    
+    <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
+    <ul>
+    <% for tracker in @trackers %>    
+      <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project, 
+                                                :set_filter => 1, 
+                                                "tracker_id" => tracker.id %>:
+      <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
+      <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
+    <% end %>
+    </ul>
+    <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
+  </div>
+  <% end %>
+</div>
+
+<div class="splitcontentright">
+    <% if @members_by_role.any? %>
+	<div class="box">
+		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>	
+		<p><% @members_by_role.keys.sort.each do |role| %>
+		<%= role.name %>:
+		<%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %>
+		<br />
+		<% end %></p>
+	</div>
+	<% end %>
+    
+  <% if @news.any? && authorize_for('news', 'index') %>
+  <div class="box">
+    <h3><%=l(:label_news_latest)%></h3>  
+    <%= render :partial => 'news/news', :collection => @news %>
+    <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
+  </div>  
+  <% end %>
+</div>
+
+<% content_for :sidebar do %>
+    <% planning_links = []
+      planning_links << link_to_if_authorized(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project)
+      planning_links << link_to_if_authorized(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project)
+      planning_links.compact!
+      unless planning_links.empty? %>
+    <h3><%= l(:label_planning) %></h3>
+    <p><%= planning_links.join(' | ') %></p>
+    <% end %>
+    
+    <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
+    <h3><%= l(:label_spent_time) %></h3>
+    <p><span class="icon icon-time"><%= lwr(:label_f_hour, @total_hours) %></span></p>
+    <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
+    <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
+    <% end %>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+<% end %>
+
+<% html_title(l(:label_overview)) -%>