Redmine 4.1.1

app/views/projects/settings/_activities.html.erb

@@ -1,3 +1,13 @@
+<div class="contextual">
+<%= link_to(l(:button_reset), project_enumerations_path(@project),
+            :method => :delete,
+            :data => {:confirm => l(:text_are_you_sure)},
+            :class => 'icon icon-del') %>
+<% if User.current.admin? %>
+<%= link_to l(:label_administration), enumerations_path, :class => "icon icon-settings" %>
+<% end %>
+</div>
+
 <%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
 
 <table class="list">
@@ -7,7 +17,7 @@
     <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
     <th><%= value.name %></th>
     <% end %>
-    <th><%= l(:field_active) %></th>
+    <th><%= toggle_checkboxes_link('input.enumerations_active') %> <%= l(:field_active) %></th>
   </tr></thead>
 
   <% @project.activities(true).each do |enumeration| %>
@@ -24,19 +34,12 @@
     </td>
     <% end %>
     <td>
-      <%= ff.check_box :active %>
+      <%= ff.check_box :active, :class => 'enumerations_active' %>
     </td>
   </tr>
   <% end %>
   <% end %>
 </table>
 
-<div class="contextual">
-<%= link_to(l(:button_reset), project_enumerations_path(@project),
-            :method => :delete,
-            :data => {:confirm => l(:text_are_you_sure)},
-            :class => 'icon icon-del') %>
-</div>
-
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/projects/settings/_issues.html.erb

@@ -0,0 +1,47 @@
+<%= labelled_form_for @project do |f| %>
+  <%= hidden_field_tag 'tab', 'issues' %>
+
+  <% unless @trackers.empty? %>
+  <fieldset class="box tabular" id="project_trackers"><legend><%= toggle_checkboxes_link('#project_trackers input[type=checkbox]') %><%= l(:label_tracker_plural)%></legend>
+  <% if User.current.admin? %>
+    <div class="contextual"><%= link_to l(:label_administration), trackers_path, :class => "icon icon-settings" %></div>
+  <% end %>
+  <% @trackers.each do |tracker| %>
+    <label class="floating">
+      <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.to_a.include?(tracker), :id => nil %>
+      <%= tracker_name_tag tracker %>
+    </label>
+  <% end %>
+  <%= hidden_field_tag 'project[tracker_ids][]', '' %>
+  </fieldset>
+  <% end %>
+
+  <% unless @issue_custom_fields.empty? %>
+  <fieldset class="box tabular" id="project_issue_custom_fields"><legend><%= toggle_checkboxes_link('#project_issue_custom_fields input[type=checkbox]:enabled') %><%=l(:label_custom_field_plural)%></legend>
+  <% if User.current.admin? %>
+    <div class="contextual"><%= link_to l(:label_administration), custom_fields_path, :class => "icon icon-settings" %></div>
+  <% end %>
+  <% @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),
+          :disabled => (custom_field.is_for_all? ? "disabled" : nil),
+          :id => nil %>
+      <%= custom_field_name_tag(custom_field) %>
+    </label>
+  <% end %>
+  <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
+  </fieldset>
+  <% end %>
+
+  <div class="box tabular">
+  <% if @project.safe_attribute?('default_version_id') %>
+    <p><%= f.select :default_version_id, project_default_version_options(@project), include_blank: l(:label_none) %></p>
+  <% end %>
+
+  <% if @project.safe_attribute?('default_assigned_to_id') %>
+    <p><%= f.select :default_assigned_to_id, project_default_assigned_to_options(@project), include_blank: l(:label_none) %></p>
+  <% end %>
+  </div>
+
+  <p><%= submit_tag l(:button_save) %></p>
+<% end %>

app/views/projects/settings/_members.html.erb

@@ -1,5 +1,8 @@
-<% members = @project.memberships.sorted.to_a %>
+<% members = @project.memberships.preload(:project).sorted.to_a %>
 
+<% if User.current.admin? %>
+  <div class="contextual"><%= link_to l(:label_administration), users_path, :class => "icon icon-settings" %></div>
+<% end %>
 <p><%= link_to l(:label_member_new), new_project_membership_path(@project), :remote => true, :class => "icon icon-add" %></p>
 
 <% if members.any? %>

app/views/projects/settings/_modules.html.erb

@@ -1,18 +0,0 @@
-<%= form_for @project,
-            :url => { :action => 'modules', :id => @project },
-            :html => {:id => 'modules-form',
-                      :method => :post} do |f| %>
-
-<fieldset class="box">
-<legend><%= l(:text_select_project_modules) %></legend>
-
-<% Redmine::AccessControl.available_project_modules.each do |m| %>
-<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m), :id => nil -%>
- <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
-<% end %>
-</fieldset>
-<p><%= check_all_links 'modules-form' %></p>
-
-<p><%= submit_tag l(:button_save) %></p>
-
-<% end %>

app/views/projects/settings/_versions.html.erb

@@ -1,4 +1,11 @@
-<p><%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %></p>
+<% if @versions.any? %>
+  <div class="contextual">
+    <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :class => 'icon icon-locked', :method => :put %>
+  </div>
+<% end %>
+<p>
+  <%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
+</p>
 
 <%= form_tag(settings_project_path(@project, :tab => 'versions'), :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
@@ -16,6 +23,7 @@
 <table class="list versions">
   <thead><tr>
     <th><%= l(:label_version) %></th>
+    <th><%= l(:field_default_version) %></th>
     <th><%= l(:field_effective_date) %></th>
     <th><%= l(:field_description) %></th>
     <th><%= l(:field_status) %></th>
@@ -24,9 +32,10 @@
     <th style="width:15%"></th>
     </tr></thead>
   <tbody>
-<% @versions.sort.each do |version| %>
+<% @versions.each do |version| %>
     <tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>">
     <td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
+    <td class="tick"><%= checked_image(version.id == @project.default_version_id) %></td>
     <td class="date"><%= format_date(version.effective_date) %></td>
     <td class="description"><%= version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
@@ -45,9 +54,3 @@
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
-
-<div class="contextual">
-<% if @versions.any? %>
-  <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
-<% end %>
-</div>

app/views/projects/settings/_wiki.html.erb

@@ -1,19 +0,0 @@
-<%= labelled_form_for @wiki,
-                   :as => :wiki,
-                   :url => { :controller => 'wikis', :action => 'edit', :id => @project },
-                   :remote => true, :method => 'post' do |f| %>
-
-<%= error_messages_for 'wiki' %>
-
-<div class="box tabular">
-<p><%= f.text_field :start_page, :size => 60, :required => true %>
-<em class="info"><%= 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 %>