Redmine 4.1.1

app/views/settings/_authentication.html.erb

@@ -1,7 +1,10 @@
 <%= form_tag({:action => 'edit', :tab => 'authentication'}) do %>
 
 <div class="box tabular settings">
-<p><%= setting_check_box :login_required %></p>
+<p><%= setting_select :login_required, [[l(:label_login_required_yes), "1"],
+                                        [l(:label_login_required_no), "0"]] %>
+  <em class="info"><%= t(:text_login_required_html, anonymous_role_path: edit_role_path(Role.anonymous)) %></em>
+</p>
 
 <p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
 
@@ -15,18 +18,16 @@
 <p><%= setting_check_box :show_custom_fields_on_registration,
                          :disabled => !Setting.self_registration? %></p>
 
-<p><%= setting_check_box :unsubscribe %></p>
-
 <p><%= setting_text_field :password_min_length, :size => 6 %></p>
 
+<p><%= setting_multiselect :password_required_char_classes, Setting::PASSWORD_CHAR_CLASSES.keys.collect {|c| [l("label_password_char_class_#{c}"), c]} , :inline => true %></p>
+
 <p>
   <%= setting_select :password_max_age, [[l(:label_disabled), 0]] + [7, 30, 60, 90, 180, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %>
 </p>
 
 <p><%= setting_check_box :lost_password %></p>
 
-<p><%= setting_text_field :max_additional_emails, :size => 6 %></p>
-
 <p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
 </div>
 
@@ -41,15 +42,5 @@
   <p><em class="info"><%= l(:text_session_expiration_settings) %></em></p>
 </fieldset>
 
-<fieldset class="box">
-  <legend><%= l(:label_default_values_for_new_users) %></legend>
-
-  <div class="tabular settings">
-    <p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p>
-
-    <p><%= setting_select :default_users_time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :label => :field_time_zone, :blank => :label_none %></p>
-  </div>
-</fieldset>
-
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/settings/_display.html.erb

@@ -19,11 +19,12 @@
 
 <p><%= setting_select :user_format, @options[:user_format] %></p>
 
-<p><%= setting_check_box :gravatar_enabled %></p>
+<p><%= setting_check_box :gravatar_enabled, :data => {:enables => '#settings_gravatar_default'} %>
+<em class="info"><%= t(:text_avatar_server_config_html, :url => Redmine::Configuration['avatar_server_url']) %></em></p>
 
-<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
+<p><%= setting_select :gravatar_default, gravatar_default_setting_options, :blank => :label_none %></p>
 
-<p><%= setting_check_box :thumbnails_enabled %></p>
+<p><%= setting_check_box :thumbnails_enabled, :data => {:enables => '#settings_thumbnails_size'} %></p>
 
 <p><%= setting_text_field :thumbnails_size, :size => 6 %></p>
 

app/views/settings/_issues.html.erb

@@ -7,6 +7,8 @@
 
 <p><%= setting_select :cross_project_subtasks, cross_project_subtasks_options %></p>
 
+<p><%= setting_check_box :close_duplicate_issues %></p>
+
 <p><%= setting_check_box :issue_group_assignment %></p>
 
 <p><%= setting_check_box :default_issue_start_date_to_creation_date %></p>
@@ -20,6 +22,8 @@
 <p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
 
 <p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
+
+<p><%= setting_text_field :gantt_months_limit, :size => 6 %></p>
 </div>
 
 <fieldset class="box">

app/views/settings/_mail_handler.html.erb

@@ -5,15 +5,20 @@
     <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
     <label class="block">
       <%= setting_check_box :mail_handler_enable_regex_delimiters, :label => false %>
-      <%= l(:setting_mail_handler_enable_regex_delimiters) %>
+      <%= l(:setting_mail_handler_enable_regex) %>
     </label>
     <em class="info"><%= l(:text_line_separated) %></em>
   </p>
   <p>
-    <%= setting_text_field :mail_handler_excluded_filenames, :size => 60 %>
+    <%= setting_text_area :mail_handler_excluded_filenames %>
+    <label class="block">
+      <%= setting_check_box :mail_handler_enable_regex_excluded_filenames, :label => false %>
+      <%= l(:setting_mail_handler_enable_regex) %>
+    </label>
     <em class="info"><%= l(:text_comma_separated) %>
     <%= l(:label_example) %>: smime.p7s, *.vcf</em>
   </p>
+  <p><%= setting_select :mail_handler_preferred_body_part, [[l(:label_preferred_body_part_text), 'plain'], [l(:label_preferred_body_part_html), 'html']] %></p>
 </div>
 
 <div class="box tabular settings">

app/views/settings/_notifications.html.erb

@@ -8,8 +8,7 @@
 
 <p><%= setting_check_box :plain_text_mail %></p>
 
-<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
-
+<p><%= setting_check_box :show_status_changes_in_mail_subject %></p>
 </div>
 
 <fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
@@ -23,10 +22,12 @@
 
 <fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
 <%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
+<%= wikitoolbar_for 'settings_emails_header' %>
 </fieldset>
 
 <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
 <%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
+<%= wikitoolbar_for 'settings_emails_footer' %>
 </fieldset>
 
 <div style="float:right;">

app/views/settings/_projects.html.erb

@@ -16,5 +16,13 @@
                       :blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
 </div>
 
+<fieldset class="box">
+  <legend><%= l(:setting_project_list_defaults) %></legend>
+  <% query = ProjectQuery.new(Setting.project_list_defaults) %>
+  <%= render_query_columns_selection(query,
+        :name => 'settings[project_list_defaults][column_names]') %>
+</fieldset>
+
+
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/settings/_timelog.html.erb

@@ -4,7 +4,26 @@
 <p><%= setting_multiselect(:timelog_required_fields,
         [[l(:field_issue), 'issue_id'], [l(:field_comments), 'comments'] ]) %></p>
 
+<p><%= setting_text_field :timelog_max_hours_per_day, :size => 6 %></p>
+
+<p><%= setting_check_box :timelog_accept_0_hours %></p>
+
+<p><%= setting_check_box :timelog_accept_future_dates %></p>
 </div>
 
+<fieldset class="box">
+  <legend><%= l(:setting_time_entry_list_defaults) %></legend>
+
+  <% query = TimeEntryQuery.new(Setting.time_entry_list_defaults) %>
+  <%= hidden_field_tag('settings[time_entry_list_defaults][column_names][]', '') %>
+  <%= render_query_columns_selection(query,
+        :name => 'settings[time_entry_list_defaults][column_names]') %>
+  <p>
+    <label><%= l(:label_total_plural) %></label>
+    <%= available_totalable_columns_tags(query,
+          :name => 'settings[time_entry_list_defaults][totalable_names]') %>
+  </p>
+</fieldset>
+
 <%= submit_tag l(:button_save) %>
 <% end %>

app/views/settings/_users.html.erb

@@ -0,0 +1,20 @@
+<%= form_tag({:action => 'edit', :tab => 'users'}) do %>
+
+  <div class="box tabular settings">
+    <p><%= setting_text_field :max_additional_emails, :size => 6 %></p>
+
+    <p><%= setting_check_box :unsubscribe %></p>
+  </div>
+
+  <fieldset class="box tabular settings">
+    <legend><%= l(:label_default_values_for_new_users) %></legend>
+
+    <p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p>
+
+    <p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
+
+    <p><%= setting_select :default_users_time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :label => :field_time_zone, :blank => :label_none %></p>
+  </fieldset>
+
+  <%= submit_tag l(:button_save) %>
+<% end %>