Moves a few settings to a "Display" panel.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2275 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 47e6913..35442f6 100644 (file)
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -18,6 +18,7 @@
 module SettingsHelper
   def administration_settings_tabs
     tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
+            {:name => 'display', :partial => 'settings/display', :label => :label_display},
             {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
             {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},

diff --git a/app/views/settings/_display.rhtml b/app/views/settings/_display.rhtml
new file mode 100644 (file)
index 0000000..a14ff47
--- /dev/null
+++ b/app/views/settings/_display.rhtml
@@ -0,0 +1,24 @@
+<% form_tag({:action => 'edit', :tab => 'display'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:label_theme) %></label>
+<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
+
+<p><label><%= l(:setting_default_language) %></label>
+<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
+
+<p><label><%= l(:setting_date_format) %></label>
+<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p>
+
+<p><label><%= l(:setting_time_format) %></label>
+<%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p>
+
+<p><label><%= l(:setting_user_format) %></label>
+<%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
+
+<p><label><%= l(:setting_gravatar_enabled) %></label>
+<%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>

diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
index 9889702..e786671 100644 (file)
--- a/app/views/settings/_general.rhtml
+++ b/app/views/settings/_general.rhtml
@@ -8,21 +8,6 @@
 <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings[welcome_text]' %>
 
-<p><label><%= l(:label_theme) %></label>
-<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
-
-<p><label><%= l(:setting_default_language) %></label>
-<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
-
-<p><label><%= l(:setting_date_format) %></label>
-<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p>
-
-<p><label><%= l(:setting_time_format) %></label>
-<%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p>
-
-<p><label><%= l(:setting_user_format) %></label>
-<%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
-
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
@@ -50,9 +35,6 @@
 
 <p><label><%= l(:setting_diff_max_lines_displayed) %></label>
 <%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %></p>
-
-<p><label><%= l(:setting_gravatar_enabled) %></label>
-<%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>

diff --git a/lang/bg.yml b/lang/bg.yml
index c73752b..d0df0bd 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -700,3 +700,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/ca.yml b/lang/ca.yml
index 6585617..26c309e 100644 (file)
--- a/lang/ca.yml
+++ b/lang/ca.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."\r
 button_create_and_continue: Create and continue\r
 text_custom_field_possible_values_info: 'One line for each value'\r
+label_display: Display\r

diff --git a/lang/cs.yml b/lang/cs.yml
index 9e34ab9..ce32e36 100644 (file)
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -705,3 +705,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/da.yml b/lang/da.yml
index e447d4c..d46d60f 100644 (file)
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/de.yml b/lang/de.yml
index a0098a1..c49aba0 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/en.yml b/lang/en.yml
index 7ea1b15..3dbfd85 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -584,6 +584,7 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 label_issue_watchers: Watchers
 label_example: Example
+label_display: Display
 
 button_login: Login
 button_submit: Submit

diff --git a/lang/es.yml b/lang/es.yml
index 36b1f46..9c6a08e 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -685,3 +685,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/fi.yml b/lang/fi.yml
index 2bae1f8..e80a5c7 100644 (file)
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -700,3 +700,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/fr.yml b/lang/fr.yml
index 6465f9b..ab77094 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -584,6 +584,7 @@ label_incoming_emails: Emails entrants
 label_generate_key: Générer une clé
 label_issue_watchers: Observateurs
 label_example: Exemple
+label_display: Affichage
 
 button_login: Connexion
 button_submit: Soumettre

diff --git a/lang/he.yml b/lang/he.yml
index f2bdd92..447c849 100644 (file)
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -700,3 +700,4 @@ text_diff_truncated: '... This diff was truncated because it exceeds the maximum
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/hu.yml b/lang/hu.yml
index be6bb0e..765c503 100644 (file)
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/it.yml b/lang/it.yml
index 85c8c6a..8838ab6 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -700,3 +700,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/ja.yml b/lang/ja.yml
index b215c01..31ba662 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/ko.yml b/lang/ko.yml
index 2856467..d56460f 100644 (file)
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -700,3 +700,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/lt.yml b/lang/lt.yml
index 8f530e5..e8fb517 100644 (file)
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/nl.yml b/lang/nl.yml
index b61829b..b0db9f5 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/no.yml b/lang/no.yml
index 3689d8d..2154f56 100644 (file)
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/pl.yml b/lang/pl.yml
index 98b2197..a9c78da 100644 (file)
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -719,3 +719,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 846b4d9..7c494cf 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."\r
 button_create_and_continue: Create and continue\r
 text_custom_field_possible_values_info: 'One line for each value'\r
+label_display: Display\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 6ed7415..1ec65d2 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/ro.yml b/lang/ro.yml
index 6799b4f..de89d09 100644 (file)
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -700,3 +700,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/ru.yml b/lang/ru.yml
index 6bfc64b..0d54f8a 100644 (file)
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -734,3 +734,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/sk.yml b/lang/sk.yml
index 4d4d49e..853aff6 100644 (file)
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -706,3 +706,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."\r
 button_create_and_continue: Create and continue\r
 text_custom_field_possible_values_info: 'One line for each value'\r
+label_display: Display\r

diff --git a/lang/sr.yml b/lang/sr.yml
index c045d55..fd8f3eb 100644 (file)
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/sv.yml b/lang/sv.yml
index a726235..878d1b9 100644 (file)
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/th.yml b/lang/th.yml
index 0e6e364..a2b4d29 100644 (file)
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -703,3 +703,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/tr.yml b/lang/tr.yml
index fe21404..e6dfad2 100644 (file)
--- a/lang/tr.yml
+++ b/lang/tr.yml
@@ -701,3 +701,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/uk.yml b/lang/uk.yml
index 55d642b..70fa219 100644 (file)
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/vn.yml b/lang/vn.yml
index 15b62e1..90b8965 100644 (file)
--- a/lang/vn.yml
+++ b/lang/vn.yml
@@ -703,3 +703,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."\r
 button_create_and_continue: Create and continue\r
 text_custom_field_possible_values_info: 'One line for each value'\r
+label_display: Display\r

diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 6f6740b..72e5358 100644 (file)
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

diff --git a/lang/zh.yml b/lang/zh.yml
index cceaff0..3bb139a 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -702,3 +702,4 @@ text_plugin_assets_writable: Plugin assets directory writable
 warning_attachments_not_saved: "%d file(s) could not be saved."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display