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 47e6913341fbb71ec30fbb31d3a507da8a31fd08..35442f615351581ecda27f4d04efc1c56e90b416 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 9889702a2bf6b91c33d9665931257e4eee7dff8a..e7866715441e8b203638e2561908220363939925 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 c73752bd2c596a89dbf00180fd1604c81aae2f56..d0df0bd9e1889b2151de2acdf8e074d97daaab3a 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 6585617c28d485bd733d073f1e8c4c37adff1e02..26c309ee56243510a6ef3f706fdfbc1221bb2bb9 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 9e34ab9d5e495f6bec5da45f12f5d4af7c3add68..ce32e363756822f030c6f87e44fe704504e8822a 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 e447d4c7a0003b2d5d58478cd40ffaab80aeecad..d46d60feffb8e2bc13301b9cc76eca3edeefcb68 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 a0098a120e310a1eff7ce21bbead25af20debb4e..c49aba0f12e45ef21e5a0b9c03305d58eb7a022b 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 7ea1b150b9d260548c22e6e369145d6207014163..3dbfd851d083c02fe3453b4d4b3ba782826d4751 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 36b1f468639afe1b8c6920f0c15a479fc60cf43c..9c6a08e43de97a472751457a9be42562e037e411 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 2bae1f84d321e3a886dcf89f24717eb40d2d6968..e80a5c705240d85d83b23fa7dfb5ba066adb480e 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 6465f9bd4999467c2cd186e9183bd45c29a2b96a..ab77094a84fcbd104c9b10783402700ade55322a 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 f2bdd9217bfd04aff7271bfa5e08782289574da1..447c84933077f1d9f0fb7084617b981feb620546 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 be6bb0eb0520f72a4bcf032f3fab209653c6fb84..765c503bc59adcf3368539b2f4727fa6763c2ec5 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 85c8c6ae3685b6539c31a7c753b50c591fcbcbf8..8838ab62b3e50fd642d147b4f6e166f318993d96 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 b215c01184a28cc5a35de723cc1b0db7cf7f1e4a..31ba66268e1ca21af25fc19d7809a5c09fab1442 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 28564676169bbae59805770dbae78faecc42e883..d56460ff1c8d133975ef4b2b1ef96b457c16dd40 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 8f530e5eb06b97bc5c991aa804cdd48342334793..e8fb5176edb3952f61232b2c93d4ed33442d78c1 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 b61829bb7109b1832f4d242fab7bfb2d8d2e3bdc..b0db9f5e2a4dce2e7a86bbe94837f646a54793fa 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 3689d8df165801a4b874c0f944413ebc1c53645e..2154f56a9dd3f1d306ea285a3a54bf44fea2b58f 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 98b2197d4c0b1df2bf6161204271ec71ad43a5b7..a9c78da6311aeb7a2513f11f9df1cd26a2ac572c 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 846b4d93e62ba9886f76d4ce21d38a33e7946d92..7c494cfe309ad94f1717bc39221025b1f1a08ff1 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 6ed741584eed97ed3ead4303968fe69d15b458b2..1ec65d23bacbe2a85da4ad7daefc0ce5e199d69a 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 6799b4f1be191fd10568d0b4a8a0136b33153fea..de89d093c805fa46a9fb534c93dedccd6f8b182e 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 6bfc64b6238b989321c5676f76988cbe9eba5d6c..0d54f8a7d3bdf9d30264772b871bb1a28988022f 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 4d4d49e808fa884423e79741bf08b81084f5e905..853aff646a6c58d9ce775f473c5d21c6c4033587 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 c045d55403e09d930666ef1c2fe81ae3c08ae9c1..fd8f3ebac108c2b8c12ce56f7c20e6d0a3e1c586 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 a7262356aec3279d3c2f80275032779f74b8382f..878d1b9f6e2c5f4734091ad7888cb2c4487c9b94 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 0e6e3646cc0d06b36335b232e676ff564d9eaa56..a2b4d292bff43888c47ca795b133f838a50292e9 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 fe214049d384a4ed0b51fbefe6b47b54f4c28853..e6dfad2d56ea689a0f587cd7fd086cd48571c8c0 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 55d642b31e4d4e9191d79b4f380a1cc3b861c89c..70fa2195677ca3dd2f9dd180d19e6793b5d48a08 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 15b62e1d3dbb3f86fad8e5c1075beaf43af365d6..90b8965b8b9649882dfdf9ec382cf4e654d4fd6c 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 6f6740b75232a02da63e7440bb5e7a062eebc7a4..72e5358ecc2369bd573fb38fc426938609d2fa8f 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 cceaff0f994b318eed7af25f704e55df9c788eeb..3bb139ab17d48eb21a289cda5d2f2d500386e198 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