From 31a976c925ad5cb71351a58fad92329dacac2ede Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 6 Oct 2015 16:48:21 +0000 Subject: [PATCH] Moves attachments settings to a new tab. git-svn-id: http://svn.redmine.org/redmine/trunk@14646 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/settings_helper.rb | 1 + app/views/settings/_attachments.html.erb | 15 +++++++++++++++ app/views/settings/_general.html.erb | 8 -------- 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 app/views/settings/_attachments.html.erb diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 6a1482419..49a618420 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -25,6 +25,7 @@ module SettingsHelper {:name => 'api', :partial => 'settings/api', :label => :label_api}, {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural}, {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking}, + {:name => 'attachments', :partial => 'settings/attachments', :label => :label_attachment_plural}, {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification}, {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails}, {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural} diff --git a/app/views/settings/_attachments.html.erb b/app/views/settings/_attachments.html.erb new file mode 100644 index 000000000..f8a85c748 --- /dev/null +++ b/app/views/settings/_attachments.html.erb @@ -0,0 +1,15 @@ +<%= form_tag({:action => 'edit', :tab => 'attachments'}) do %> + +
+

<%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

+ +

<%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

+ +

<%= setting_text_field :diff_max_lines_displayed, :size => 6 %>

+ +

<%= setting_text_field :repositories_encodings, :size => 60 %> +<%= l(:text_comma_separated) %>

+
+ +<%= submit_tag l(:button_save) %> +<% end %> diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb index 9bfd23b53..23abdb3f5 100644 --- a/app/views/settings/_general.html.erb +++ b/app/views/settings/_general.html.erb @@ -6,7 +6,6 @@

<%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %>

<%= wikitoolbar_for 'settings_welcome_text' %> -

<%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

<%= setting_text_field :per_page_options, :size => 20 %> <%= l(:text_comma_separated) %>

@@ -28,13 +27,6 @@

<%= setting_text_field :feeds_limit, :size => 6 %>

-

<%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %>

- -

<%= setting_text_field :diff_max_lines_displayed, :size => 6 %>

- -

<%= setting_text_field :repositories_encodings, :size => 60 %> -<%= l(:text_comma_separated) %>

- <%= call_hook(:view_settings_general_form) %> -- 2.39.5