Project

General

Profile

« Previous | Next » 

Revision 2275

Moves a few settings to a "Display" panel.

View differences:

trunk/app/helpers/settings_helper.rb
18 18
module SettingsHelper
19 19
  def administration_settings_tabs
20 20
    tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
21
            {:name => 'display', :partial => 'settings/display', :label => :label_display},
21 22
            {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
22 23
            {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
23 24
            {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
trunk/app/views/settings/_display.rhtml
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 %>
0 25

  
trunk/app/views/settings/_general.rhtml
8 8
<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
9 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 11
<p><label><%= l(:setting_attachment_max_size) %></label>
27 12
<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
28 13

  
......
50 35

  
51 36
<p><label><%= l(:setting_diff_max_lines_displayed) %></label>
52 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 38
</div>
57 39

  
58 40
<%= submit_tag l(:button_save) %>
trunk/lang/bg.yml
700 700
warning_attachments_not_saved: "%d file(s) could not be saved."
701 701
button_create_and_continue: Create and continue
702 702
text_custom_field_possible_values_info: 'One line for each value'
703
label_display: Display
trunk/lang/ca.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/cs.yml
705 705
warning_attachments_not_saved: "%d file(s) could not be saved."
706 706
button_create_and_continue: Create and continue
707 707
text_custom_field_possible_values_info: 'One line for each value'
708
label_display: Display
trunk/lang/da.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/de.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display
trunk/lang/en.yml
584 584
label_generate_key: Generate a key
585 585
label_issue_watchers: Watchers
586 586
label_example: Example
587
label_display: Display
587 588

  
588 589
button_login: Login
589 590
button_submit: Submit
trunk/lang/es.yml
685 685
warning_attachments_not_saved: "%d file(s) could not be saved."
686 686
button_create_and_continue: Create and continue
687 687
text_custom_field_possible_values_info: 'One line for each value'
688
label_display: Display
trunk/lang/fi.yml
700 700
warning_attachments_not_saved: "%d file(s) could not be saved."
701 701
button_create_and_continue: Create and continue
702 702
text_custom_field_possible_values_info: 'One line for each value'
703
label_display: Display
trunk/lang/fr.yml
584 584
label_generate_key: Générer une clé
585 585
label_issue_watchers: Observateurs
586 586
label_example: Exemple
587
label_display: Affichage
587 588

  
588 589
button_login: Connexion
589 590
button_submit: Soumettre
trunk/lang/he.yml
700 700
warning_attachments_not_saved: "%d file(s) could not be saved."
701 701
button_create_and_continue: Create and continue
702 702
text_custom_field_possible_values_info: 'One line for each value'
703
label_display: Display
trunk/lang/hu.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/it.yml
700 700
warning_attachments_not_saved: "%d file(s) could not be saved."
701 701
button_create_and_continue: Create and continue
702 702
text_custom_field_possible_values_info: 'One line for each value'
703
label_display: Display
trunk/lang/ja.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/ko.yml
700 700
warning_attachments_not_saved: "%d file(s) could not be saved."
701 701
button_create_and_continue: Create and continue
702 702
text_custom_field_possible_values_info: 'One line for each value'
703
label_display: Display
trunk/lang/lt.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display
trunk/lang/nl.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display
trunk/lang/no.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/pl.yml
719 719
warning_attachments_not_saved: "%d file(s) could not be saved."
720 720
button_create_and_continue: Create and continue
721 721
text_custom_field_possible_values_info: 'One line for each value'
722
label_display: Display
trunk/lang/pt-br.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/pt.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display
trunk/lang/ro.yml
700 700
warning_attachments_not_saved: "%d file(s) could not be saved."
701 701
button_create_and_continue: Create and continue
702 702
text_custom_field_possible_values_info: 'One line for each value'
703
label_display: Display
trunk/lang/ru.yml
734 734
warning_attachments_not_saved: "%d file(s) could not be saved."
735 735
button_create_and_continue: Create and continue
736 736
text_custom_field_possible_values_info: 'One line for each value'
737
label_display: Display
trunk/lang/sk.yml
706 706
warning_attachments_not_saved: "%d file(s) could not be saved."
707 707
button_create_and_continue: Create and continue
708 708
text_custom_field_possible_values_info: 'One line for each value'
709
label_display: Display
trunk/lang/sr.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/sv.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/th.yml
703 703
warning_attachments_not_saved: "%d file(s) could not be saved."
704 704
button_create_and_continue: Create and continue
705 705
text_custom_field_possible_values_info: 'One line for each value'
706
label_display: Display
trunk/lang/tr.yml
701 701
warning_attachments_not_saved: "%d file(s) could not be saved."
702 702
button_create_and_continue: Create and continue
703 703
text_custom_field_possible_values_info: 'One line for each value'
704
label_display: Display
trunk/lang/uk.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display
trunk/lang/vn.yml
703 703
warning_attachments_not_saved: "%d file(s) could not be saved."
704 704
button_create_and_continue: Create and continue
705 705
text_custom_field_possible_values_info: 'One line for each value'
706
label_display: Display
trunk/lang/zh-tw.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display
trunk/lang/zh.yml
702 702
warning_attachments_not_saved: "%d file(s) could not be saved."
703 703
button_create_and_continue: Create and continue
704 704
text_custom_field_possible_values_info: 'One line for each value'
705
label_display: Display

Also available in: Unified diff