| @@ -1,7 +1,6 | |||
|
|
1 | 1 | <%= labelled_fields_for :pref, @user.pref do |pref_fields| %> |
|
|
2 | 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 | 4 | <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p> |
|
|
5 | 5 | <p><%= pref_fields.check_box :warn_on_leaving_unsaved %></p> |
|
|
6 | 6 | <% end %> |
|
|
7 | ||
| @@ -1,47 +1,51 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2012 Jean-Philippe Lang |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 | 8 | # |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 | 13 | # |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | require 'action_view/helpers/form_helper' |
|
|
19 | 19 | |
|
|
20 | 20 | class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder |
|
|
21 | 21 | include Redmine::I18n |
|
|
22 | 22 | |
|
|
23 | 23 | (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for) + |
|
|
24 | 24 | %w(date_select)).each do |selector| |
|
|
25 | 25 | src = <<-END_SRC |
|
|
26 | 26 | def #{selector}(field, options = {}) |
|
|
27 | 27 | label_for_field(field, options) + super(field, options.except(:label)).html_safe |
|
|
28 | 28 | end |
|
|
29 | 29 | END_SRC |
|
|
30 | 30 | class_eval src, __FILE__, __LINE__ |
|
|
31 | 31 | end |
|
|
32 | 32 | |
|
|
33 | 33 | def select(field, choices, options = {}, html_options = {}) |
|
|
34 | 34 | label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe |
|
|
35 | 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 | 41 | # Returns a label tag for the given field |
|
|
38 | 42 | def label_for_field(field, options = {}) |
|
|
39 | 43 | return ''.html_safe if options.delete(:no_label) |
|
|
40 | 44 | text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label] |
|
|
41 | 45 | text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym) |
|
|
42 | 46 | text += @template.content_tag("span", " *", :class => "required") if options.delete(:required) |
|
|
43 | 47 | @template.content_tag("label", text.html_safe, |
|
|
44 | 48 | :class => (@object && @object.errors[field].present? ? "error" : nil), |
|
|
45 | 49 | :for => (@object_name.to_s + "_" + field.to_s)) |
|
|
46 | 50 | end |
|
|
47 | 51 | end |
General Comments 0
You need to be logged in to leave comments.
Login now