From: Toshi MARUYAMA Date: Wed, 18 May 2011 02:45:11 +0000 (+0000) Subject: remove trailing white-spaces from settings helper source. X-Git-Tag: 1.2.0~64 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3660e28c05ed069d66608e6e006b147658b5c354;p=redmine.git remove trailing white-spaces from settings helper source. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5829 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 6dc33a8e1..a5f10586c 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -1,16 +1,16 @@ # Redmine - project management software -# Copyright (C) 2006-2009 Jean-Philippe Lang +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -27,7 +27,7 @@ module SettingsHelper {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural} ] end - + def setting_select(setting, choices, options={}) if blank_text = options.delete(:blank) choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices @@ -35,38 +35,38 @@ module SettingsHelper setting_label(setting, options) + select_tag("settings[#{setting}]", options_for_select(choices, Setting.send(setting).to_s), options) end - + def setting_multiselect(setting, choices, options={}) setting_values = Setting.send(setting) setting_values = [] unless setting_values.is_a?(Array) - + setting_label(setting, options) + hidden_field_tag("settings[#{setting}][]", '') + choices.collect do |choice| - text, value = (choice.is_a?(Array) ? choice : [choice, choice]) + text, value = (choice.is_a?(Array) ? choice : [choice, choice]) content_tag('label', check_box_tag("settings[#{setting}][]", value, Setting.send(setting).include?(value)) + text.to_s, :class => 'block' ) end.join end - + def setting_text_field(setting, options={}) setting_label(setting, options) + text_field_tag("settings[#{setting}]", Setting.send(setting), options) end - + def setting_text_area(setting, options={}) setting_label(setting, options) + text_area_tag("settings[#{setting}]", Setting.send(setting), options) end - + def setting_check_box(setting, options={}) setting_label(setting, options) + hidden_field_tag("settings[#{setting}]", 0) + check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options) end - + def setting_label(setting, options={}) label = options.delete(:label) label != false ? content_tag("label", l(label || "setting_#{setting}")) : ''