diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 11:31:54 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 11:31:54 +0000 |
commit | 0990c1309dfa1751c1e1a48b48bfcb994ab68db0 (patch) | |
tree | a383003b620fc5a771d00ebd4429542a298e130d /actionpack/lib/action_view | |
parent | 85a5deacdc1f0d1a56a07429a03dfa0cf8cc7f78 (diff) | |
download | rails-0990c1309dfa1751c1e1a48b48bfcb994ab68db0.tar.gz rails-0990c1309dfa1751c1e1a48b48bfcb994ab68db0.tar.bz2 rails-0990c1309dfa1751c1e1a48b48bfcb994ab68db0.zip |
Fixed all helpers so that they use XHTML compliant double quotes for values instead of single quotes [htonl/bitsweat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@114 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/helpers/active_record_helper.rb | 11 | ||||
-rwxr-xr-x | actionpack/lib/action_view/helpers/date_helper.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 14 |
3 files changed, 16 insertions, 17 deletions
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb index eee8b6b970..4f7d66d8f7 100644 --- a/actionpack/lib/action_view/helpers/active_record_helper.rb +++ b/actionpack/lib/action_view/helpers/active_record_helper.rb @@ -52,12 +52,13 @@ module ActionView def form(record_name, options = {}) record = instance_eval("@#{record_name}") action = url_for(:action => options[:action] || (record.new_record? ? "create" : "update")) + submit_value = options[:submit_value] || action.gsub(/[^\w]/, '').capitalize + id_field = record.new_record? ? "" : InstanceTag.new(record_name, "id", self).to_input_field_tag("hidden") - - "<form action='#{action}' method='post'>" + - id_field + all_input_tags(record, record_name, options) + - "<input type='submit' value='#{action.gsub(/[^A-Za-z]/, "").capitalize}' />" + - "</form>" + + %(<form action="#{action}" method="POST">#{id_field}) + + all_input_tags(record, record_name, options) + + %(<input type="submit" value="#{submit_value}" /></form>) end # Returns a string containing the error message attached to the +method+ on the +object+, if one exists. diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 5526c3eef4..8af3afb034 100755 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -143,8 +143,8 @@ module ActionView end month_options << ((date.kind_of?(Fixnum) ? date : date.month) == month_number ? - "<option value='#{month_number}' selected=\"selected\">#{month_name}</option>\n" : - "<option value='#{month_number}'>#{month_name}</option>\n" + %(<option value="#{month_number}" selected="selected">#{month_name}</option>\n) : + %(<option value="#{month_number}">#{month_name}</option>\n) ) end @@ -172,9 +172,9 @@ module ActionView private def select_html(type, options, prefix = nil, include_blank = false, discard_type = false) - select_html = "<select name='#{prefix || DEFAULT_PREFIX}" + select_html = %(<select name="#{prefix || DEFAULT_PREFIX}) select_html << "[#{type}]" unless discard_type - select_html << "'>\n" + select_html << %(">\n) select_html << "<option></option>\n" if include_blank select_html << options.to_s select_html << "</select>\n" diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb index 13aa9297ca..6139943567 100644 --- a/actionpack/lib/action_view/helpers/tag_helper.rb +++ b/actionpack/lib/action_view/helpers/tag_helper.rb @@ -10,7 +10,7 @@ module ActionView # * tag("br") => <br /> # * tag("input", { "type" => "text"}) => <input type="text" /> def tag(name, options = {}, open = false) - "<#{name + tag_options(options)}" + (open ? ">" : " />") + "<#{name}#{tag_options(options)}" + (open ? ">" : " />") end # Examples: @@ -18,7 +18,7 @@ module ActionView # * content_tag("div", content_tag("p", "Hello world!"), "class" => "strong") => # <div class="strong"><p>Hello world!</p></div> def content_tag(name, content, options = {}) - "<#{name + tag_options(options)}>#{content}</#{name}>" + "<#{name}#{tag_options(options)}>#{content}</#{name}>" end # Starts a form tag that points the action to an url configured with <tt>url_for_options</tt> just like @@ -46,12 +46,10 @@ module ActionView private def tag_options(options) - if options.empty? - "" - else - " " + options.collect { |pair| - "#{pair.first}=\"#{html_escape(pair.last)}\"" - }.sort.join(" ") + unless options.empty? + " " + options.map { |key, value| + %(#{key}="#{html_escape(value)}") + }.sort.join(" ") end end end |