diff options
| -rw-r--r-- | app/helpers/settings_helper.rb | 1 | ||||
| -rw-r--r-- | app/views/settings/_display.rhtml | 24 | ||||
| -rw-r--r-- | app/views/settings/_general.rhtml | 18 | ||||
| -rw-r--r-- | lang/bg.yml | 1 | ||||
| -rw-r--r-- | lang/ca.yml | 1 | ||||
| -rw-r--r-- | lang/cs.yml | 1 | ||||
| -rw-r--r-- | lang/da.yml | 1 | ||||
| -rw-r--r-- | lang/de.yml | 1 | ||||
| -rw-r--r-- | lang/en.yml | 1 | ||||
| -rw-r--r-- | lang/es.yml | 1 | ||||
| -rw-r--r-- | lang/fi.yml | 1 | ||||
| -rw-r--r-- | lang/fr.yml | 1 | ||||
| -rw-r--r-- | lang/he.yml | 1 | ||||
| -rw-r--r-- | lang/hu.yml | 1 | ||||
| -rw-r--r-- | lang/it.yml | 1 | ||||
| -rw-r--r-- | lang/ja.yml | 1 | ||||
| -rw-r--r-- | lang/ko.yml | 1 | ||||
| -rw-r--r-- | lang/lt.yml | 1 | ||||
| -rw-r--r-- | lang/nl.yml | 1 | ||||
| -rw-r--r-- | lang/no.yml | 1 | ||||
| -rw-r--r-- | lang/pl.yml | 1 | ||||
| -rw-r--r-- | lang/pt-br.yml | 1 | ||||
| -rw-r--r-- | lang/pt.yml | 1 | ||||
| -rw-r--r-- | lang/ro.yml | 1 | ||||
| -rw-r--r-- | lang/ru.yml | 1 | ||||
| -rw-r--r-- | lang/sk.yml | 1 | ||||
| -rw-r--r-- | lang/sr.yml | 1 | ||||
| -rw-r--r-- | lang/sv.yml | 1 | ||||
| -rw-r--r-- | lang/th.yml | 1 | ||||
| -rw-r--r-- | lang/tr.yml | 1 | ||||
| -rw-r--r-- | lang/uk.yml | 1 | ||||
| -rw-r--r-- | lang/vn.yml | 1 | ||||
| -rw-r--r-- | lang/zh-tw.yml | 1 | ||||
| -rw-r--r-- | lang/zh.yml | 1 |
34 files changed, 56 insertions, 18 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 47e691334..35442f615 100644 --- 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 index 000000000..a14ff47ce --- /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 9889702a2..e78667154 100644 --- 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 c73752bd2..d0df0bd9e 100644 --- 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 6585617c2..26c309ee5 100644 --- 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."
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/cs.yml b/lang/cs.yml index 9e34ab9d5..ce32e3637 100644 --- 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 e447d4c7a..d46d60fef 100644 --- 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 a0098a120..c49aba0f1 100644 --- 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 7ea1b150b..3dbfd851d 100644 --- 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 36b1f4686..9c6a08e43 100644 --- 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 2bae1f84d..e80a5c705 100644 --- 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 6465f9bd4..ab77094a8 100644 --- 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 f2bdd9217..447c84933 100644 --- 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 be6bb0eb0..765c503bc 100644 --- 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 85c8c6ae3..8838ab62b 100644 --- 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 b215c0118..31ba66268 100644 --- 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 285646761..d56460ff1 100644 --- 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 8f530e5eb..e8fb5176e 100644 --- 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 b61829bb7..b0db9f5e2 100644 --- 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 3689d8df1..2154f56a9 100644 --- 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 98b2197d4..a9c78da63 100644 --- 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 846b4d93e..7c494cfe3 100644 --- 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."
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.yml b/lang/pt.yml index 6ed741584..1ec65d23b 100644 --- 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 6799b4f1b..de89d093c 100644 --- 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 6bfc64b62..0d54f8a7d 100644 --- 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 4d4d49e80..853aff646 100644 --- 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."
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/sr.yml b/lang/sr.yml index c045d5540..fd8f3ebac 100644 --- 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 a7262356a..878d1b9f6 100644 --- 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 0e6e3646c..a2b4d292b 100644 --- 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 fe214049d..e6dfad2d5 100644 --- 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 55d642b31..70fa21956 100644 --- 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 15b62e1d3..90b8965b8 100644 --- 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."
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-tw.yml b/lang/zh-tw.yml index 6f6740b75..72e5358ec 100644 --- 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 cceaff0f9..3bb139ab1 100644 --- 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 |