diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-06-17 08:23:06 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-06-17 08:23:06 +0000 |
| commit | 51eedb884be57217c588f77335439665627e94d3 (patch) | |
| tree | ab7535b06b6d4a3bd436a204137b66451de86b9b /app/views/settings | |
| parent | 3e31f8167be6abb5afb5439a8c531e3107cefbf3 (diff) | |
| download | redmine-51eedb884be57217c588f77335439665627e94d3.tar.gz redmine-51eedb884be57217c588f77335439665627e94d3.zip | |
Add Users tab to application settings.
git-svn-id: http://svn.redmine.org/redmine/trunk@17396 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/_authentication.html.erb | 14 | ||||
| -rw-r--r-- | app/views/settings/_notifications.html.erb | 3 | ||||
| -rw-r--r-- | app/views/settings/_users.html.erb | 20 |
3 files changed, 20 insertions, 17 deletions
diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb index fc8fb0a78..a27996471 100644 --- a/app/views/settings/_authentication.html.erb +++ b/app/views/settings/_authentication.html.erb @@ -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 %> diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb index e75a2014f..0f5051404 100644 --- a/app/views/settings/_notifications.html.erb +++ b/app/views/settings/_notifications.html.erb @@ -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> diff --git a/app/views/settings/_users.html.erb b/app/views/settings/_users.html.erb new file mode 100644 index 000000000..ab61d7c21 --- /dev/null +++ b/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 %> |