git-svn-id: http://svn.redmine.org/redmine/trunk@17396 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/4.0.0
@@ -24,6 +24,7 @@ module SettingsHelper | |||
{:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication}, | |||
{:name => 'api', :partial => 'settings/api', :label => :label_api}, | |||
{:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural}, | |||
{:name => 'users', :partial => 'settings/users', :label => :label_user_plural}, | |||
{:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking}, | |||
{:name => 'timelog', :partial => 'settings/timelog', :label => :label_time_tracking}, | |||
{:name => 'attachments', :partial => 'settings/attachments', :label => :label_attachment_plural}, |
@@ -19,8 +19,6 @@ | |||
<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> | |||
@@ -29,8 +27,6 @@ | |||
<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> | |||
@@ -45,15 +41,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 %> |
@@ -7,9 +7,6 @@ | |||
<p><%= setting_check_box :bcc_recipients %></p> | |||
<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> | |||
</div> | |||
<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend> |
@@ -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 %> |
@@ -808,7 +808,6 @@ select.bool_cf {width:auto !important;} | |||
#tab-content-users .splitcontentleft {width: 64%;} | |||
#tab-content-users .splitcontentright {width: 34%;} | |||
#tab-content-users fieldset {padding:1em; margin-bottom: 1em;} | |||
#tab-content-users fieldset legend {font-weight: bold;} | |||
#tab-content-users fieldset label {display: block;} | |||
#tab-content-users #principals {max-height: 400px; overflow: auto;} | |||