##// END OF EJS Templates
Moves a few settings to a "Display" panel....
Jean-Philippe Lang -
r2273:99c2e989751a
parent child
Show More
@@ -0,0 +1,24
1 <% form_tag({:action => 'edit', :tab => 'display'}) do %>
2
3 <div class="box tabular settings">
4 <p><label><%= l(:label_theme) %></label>
5 <%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
6
7 <p><label><%= l(:setting_default_language) %></label>
8 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
9
10 <p><label><%= l(:setting_date_format) %></label>
11 <%= 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>
12
13 <p><label><%= l(:setting_time_format) %></label>
14 <%= 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>
15
16 <p><label><%= l(:setting_user_format) %></label>
17 <%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
18
19 <p><label><%= l(:setting_gravatar_enabled) %></label>
20 <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
21 </div>
22
23 <%= submit_tag l(:button_save) %>
24 <% end %>
@@ -18,6 +18,7
18 module SettingsHelper
18 module SettingsHelper
19 def administration_settings_tabs
19 def administration_settings_tabs
20 tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
20 tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
21 {:name => 'display', :partial => 'settings/display', :label => :label_display},
21 {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
22 {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
22 {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
23 {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
23 {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
24 {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
@@ -8,21 +8,6
8 <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
8 <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
9 <%= wikitoolbar_for 'settings[welcome_text]' %>
9 <%= wikitoolbar_for 'settings[welcome_text]' %>
10
10
11 <p><label><%= l(:label_theme) %></label>
12 <%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
13
14 <p><label><%= l(:setting_default_language) %></label>
15 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
16
17 <p><label><%= l(:setting_date_format) %></label>
18 <%= 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>
19
20 <p><label><%= l(:setting_time_format) %></label>
21 <%= 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>
22
23 <p><label><%= l(:setting_user_format) %></label>
24 <%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
25
26 <p><label><%= l(:setting_attachment_max_size) %></label>
11 <p><label><%= l(:setting_attachment_max_size) %></label>
27 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
12 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
28
13
@@ -50,9 +35,6
50
35
51 <p><label><%= l(:setting_diff_max_lines_displayed) %></label>
36 <p><label><%= l(:setting_diff_max_lines_displayed) %></label>
52 <%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %></p>
37 <%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %></p>
53
54 <p><label><%= l(:setting_gravatar_enabled) %></label>
55 <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
56 </div>
38 </div>
57
39
58 <%= submit_tag l(:button_save) %>
40 <%= submit_tag l(:button_save) %>
@@ -700,3 +700,4 text_plugin_assets_writable: Plugin assets directory writable
700 warning_attachments_not_saved: "%d file(s) could not be saved."
700 warning_attachments_not_saved: "%d file(s) could not be saved."
701 button_create_and_continue: Create and continue
701 button_create_and_continue: Create and continue
702 text_custom_field_possible_values_info: 'One line for each value'
702 text_custom_field_possible_values_info: 'One line for each value'
703 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -705,3 +705,4 text_plugin_assets_writable: Plugin assets directory writable
705 warning_attachments_not_saved: "%d file(s) could not be saved."
705 warning_attachments_not_saved: "%d file(s) could not be saved."
706 button_create_and_continue: Create and continue
706 button_create_and_continue: Create and continue
707 text_custom_field_possible_values_info: 'One line for each value'
707 text_custom_field_possible_values_info: 'One line for each value'
708 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
@@ -584,6 +584,7 label_incoming_emails: Incoming emails
584 label_generate_key: Generate a key
584 label_generate_key: Generate a key
585 label_issue_watchers: Watchers
585 label_issue_watchers: Watchers
586 label_example: Example
586 label_example: Example
587 label_display: Display
587
588
588 button_login: Login
589 button_login: Login
589 button_submit: Submit
590 button_submit: Submit
@@ -685,3 +685,4 text_plugin_assets_writable: Plugin assets directory writable
685 warning_attachments_not_saved: "%d file(s) could not be saved."
685 warning_attachments_not_saved: "%d file(s) could not be saved."
686 button_create_and_continue: Create and continue
686 button_create_and_continue: Create and continue
687 text_custom_field_possible_values_info: 'One line for each value'
687 text_custom_field_possible_values_info: 'One line for each value'
688 label_display: Display
@@ -700,3 +700,4 text_plugin_assets_writable: Plugin assets directory writable
700 warning_attachments_not_saved: "%d file(s) could not be saved."
700 warning_attachments_not_saved: "%d file(s) could not be saved."
701 button_create_and_continue: Create and continue
701 button_create_and_continue: Create and continue
702 text_custom_field_possible_values_info: 'One line for each value'
702 text_custom_field_possible_values_info: 'One line for each value'
703 label_display: Display
@@ -584,6 +584,7 label_incoming_emails: Emails entrants
584 label_generate_key: Générer une clé
584 label_generate_key: Générer une clé
585 label_issue_watchers: Observateurs
585 label_issue_watchers: Observateurs
586 label_example: Exemple
586 label_example: Exemple
587 label_display: Affichage
587
588
588 button_login: Connexion
589 button_login: Connexion
589 button_submit: Soumettre
590 button_submit: Soumettre
@@ -700,3 +700,4 text_diff_truncated: '... This diff was truncated because it exceeds the maximum
700 warning_attachments_not_saved: "%d file(s) could not be saved."
700 warning_attachments_not_saved: "%d file(s) could not be saved."
701 button_create_and_continue: Create and continue
701 button_create_and_continue: Create and continue
702 text_custom_field_possible_values_info: 'One line for each value'
702 text_custom_field_possible_values_info: 'One line for each value'
703 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -700,3 +700,4 text_plugin_assets_writable: Plugin assets directory writable
700 warning_attachments_not_saved: "%d file(s) could not be saved."
700 warning_attachments_not_saved: "%d file(s) could not be saved."
701 button_create_and_continue: Create and continue
701 button_create_and_continue: Create and continue
702 text_custom_field_possible_values_info: 'One line for each value'
702 text_custom_field_possible_values_info: 'One line for each value'
703 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -700,3 +700,4 text_plugin_assets_writable: Plugin assets directory writable
700 warning_attachments_not_saved: "%d file(s) could not be saved."
700 warning_attachments_not_saved: "%d file(s) could not be saved."
701 button_create_and_continue: Create and continue
701 button_create_and_continue: Create and continue
702 text_custom_field_possible_values_info: 'One line for each value'
702 text_custom_field_possible_values_info: 'One line for each value'
703 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -719,3 +719,4 text_plugin_assets_writable: Plugin assets directory writable
719 warning_attachments_not_saved: "%d file(s) could not be saved."
719 warning_attachments_not_saved: "%d file(s) could not be saved."
720 button_create_and_continue: Create and continue
720 button_create_and_continue: Create and continue
721 text_custom_field_possible_values_info: 'One line for each value'
721 text_custom_field_possible_values_info: 'One line for each value'
722 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
@@ -700,3 +700,4 text_plugin_assets_writable: Plugin assets directory writable
700 warning_attachments_not_saved: "%d file(s) could not be saved."
700 warning_attachments_not_saved: "%d file(s) could not be saved."
701 button_create_and_continue: Create and continue
701 button_create_and_continue: Create and continue
702 text_custom_field_possible_values_info: 'One line for each value'
702 text_custom_field_possible_values_info: 'One line for each value'
703 label_display: Display
@@ -734,3 +734,4 text_plugin_assets_writable: Plugin assets directory writable
734 warning_attachments_not_saved: "%d file(s) could not be saved."
734 warning_attachments_not_saved: "%d file(s) could not be saved."
735 button_create_and_continue: Create and continue
735 button_create_and_continue: Create and continue
736 text_custom_field_possible_values_info: 'One line for each value'
736 text_custom_field_possible_values_info: 'One line for each value'
737 label_display: Display
@@ -706,3 +706,4 text_plugin_assets_writable: Plugin assets directory writable
706 warning_attachments_not_saved: "%d file(s) could not be saved."
706 warning_attachments_not_saved: "%d file(s) could not be saved."
707 button_create_and_continue: Create and continue
707 button_create_and_continue: Create and continue
708 text_custom_field_possible_values_info: 'One line for each value'
708 text_custom_field_possible_values_info: 'One line for each value'
709 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -703,3 +703,4 text_plugin_assets_writable: Plugin assets directory writable
703 warning_attachments_not_saved: "%d file(s) could not be saved."
703 warning_attachments_not_saved: "%d file(s) could not be saved."
704 button_create_and_continue: Create and continue
704 button_create_and_continue: Create and continue
705 text_custom_field_possible_values_info: 'One line for each value'
705 text_custom_field_possible_values_info: 'One line for each value'
706 label_display: Display
@@ -701,3 +701,4 text_plugin_assets_writable: Plugin assets directory writable
701 warning_attachments_not_saved: "%d file(s) could not be saved."
701 warning_attachments_not_saved: "%d file(s) could not be saved."
702 button_create_and_continue: Create and continue
702 button_create_and_continue: Create and continue
703 text_custom_field_possible_values_info: 'One line for each value'
703 text_custom_field_possible_values_info: 'One line for each value'
704 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
@@ -703,3 +703,4 text_plugin_assets_writable: Plugin assets directory writable
703 warning_attachments_not_saved: "%d file(s) could not be saved."
703 warning_attachments_not_saved: "%d file(s) could not be saved."
704 button_create_and_continue: Create and continue
704 button_create_and_continue: Create and continue
705 text_custom_field_possible_values_info: 'One line for each value'
705 text_custom_field_possible_values_info: 'One line for each value'
706 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
@@ -702,3 +702,4 text_plugin_assets_writable: Plugin assets directory writable
702 warning_attachments_not_saved: "%d file(s) could not be saved."
702 warning_attachments_not_saved: "%d file(s) could not be saved."
703 button_create_and_continue: Create and continue
703 button_create_and_continue: Create and continue
704 text_custom_field_possible_values_info: 'One line for each value'
704 text_custom_field_possible_values_info: 'One line for each value'
705 label_display: Display
General Comments 0
You need to be logged in to leave comments. Login now