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

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},

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 %>

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) %>

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

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."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

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

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

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

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."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

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

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

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

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

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

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."
 button_create_and_continue: Create and continue
 text_custom_field_possible_values_info: 'One line for each value'
+label_display: Display

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

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