| @@ -1,7 +1,6 | |||||
| 1 | <%= labelled_fields_for :pref, @user.pref do |pref_fields| %> |
|
1 | <%= labelled_fields_for :pref, @user.pref do |pref_fields| %> | |
| 2 | <p><%= pref_fields.check_box :hide_mail %></p> |
|
2 | <p><%= pref_fields.check_box :hide_mail %></p> | |
| 3 |
<p><%= pref_fields.select :time_zone, |
|
3 | <p><%= pref_fields.time_zone_select :time_zone, nil, :include_blank => true %></p> | |
| 4 | <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p> |
|
4 | <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p> | |
| 5 | <p><%= pref_fields.check_box :warn_on_leaving_unsaved %></p> |
|
5 | <p><%= pref_fields.check_box :warn_on_leaving_unsaved %></p> | |
| 6 | <% end %> |
|
6 | <% end %> | |
| 7 |
|
||||
| @@ -34,6 +34,10 class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder | |||||
| 34 | label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe |
|
34 | label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe | |
| 35 | end |
|
35 | end | |
| 36 |
|
36 | |||
|
|
37 | def time_zone_select(field, priority_zones = nil, options = {}, html_options = {}) | |||
|
|
38 | label_for_field(field, options) + super(field, priority_zones, options, html_options.except(:label)).html_safe | |||
|
|
39 | end | |||
|
|
40 | ||||
| 37 | # Returns a label tag for the given field |
|
41 | # Returns a label tag for the given field | |
| 38 | def label_for_field(field, options = {}) |
|
42 | def label_for_field(field, options = {}) | |
| 39 | return ''.html_safe if options.delete(:no_label) |
|
43 | return ''.html_safe if options.delete(:no_label) | |
General Comments 0
You need to be logged in to leave comments.
Login now