From b7fec09eb3811c8f79fa4d660572a38c4eecce69 Mon Sep 17 00:00:00 2001
From: Lars Smit <larssmit@me.com>
Date: Thu, 10 Feb 2011 13:45:14 +0100
Subject: [PATCH] [PATCH] Ticket#5901: Extract the inline style on the authenticity_token wrapper

---
 actionpack/lib/action_view/helpers/form_helper.rb  |    6 +++---
 .../lib/action_view/helpers/form_tag_helper.rb     |    2 +-
 actionpack/test/template/form_helper_test.rb       |    2 +-
 actionpack/test/template/form_tag_helper_test.rb   |    2 +-
 railties/guides/source/form_helpers.textile        |    6 +++---
 .../rails/stylesheets/templates/scaffold.css       |    7 +++++++
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index befaa3e..91ca784 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -38,7 +38,7 @@ module ActionView
     # The HTML generated for this would be (modulus formatting):
     #
     #   <form action="/people" class="new_person" id="new_person" method="post">
-    #     <div style="margin:0;padding:0;display:inline">
+    #     <div class="snowman_and_authenticity_wrapper">
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
@@ -68,7 +68,7 @@ module ActionView
     # the code above as is would yield instead:
     #
     #   <form action="/people/256" class="edit_person" id="edit_person_256" method="post">
-    #     <div style="margin:0;padding:0;display:inline">
+    #     <div class="snowman_and_authenticity_wrapper">
     #       <input name="_method" type="hidden" value="put" />
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
@@ -256,7 +256,7 @@ module ActionView
       # The HTML generated for this would be:
       #
       #   <form action='http://www.example.com' method='post' data-remote='true'>
-      #     <div style='margin:0;padding:0;display:inline'>
+      #     <div class="snowman_and_authenticity_wrapper">
       #       <input name='_method' type='hidden' value='put' />
       #     </div>
       #     ...
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index d6b7497..1040508 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -617,7 +617,7 @@ module ActionView
           end
 
           tags = snowman_tag << method_tag
-          content_tag(:div, tags, :style => 'margin:0;padding:0;display:inline')
+          content_tag(:div, tags, :class => 'snowman_and_authenticity_wrapper')
         end
 
         def form_tag_html(html_options)
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index b3220d6..37a42ca 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1631,7 +1631,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def snowman(method = nil)
-    txt =  %{<div style="margin:0;padding:0;display:inline">}
+    txt =  %{<div class="snowman_and_authenticity_wrapper">}
     txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
     if (method && !['get','post'].include?(method.to_s))
       txt << %{<input name="_method" type="hidden" value="#{method}" />}
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 4a584b8..5f6dd2d 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -11,7 +11,7 @@ class FormTagHelperTest < ActionView::TestCase
   def snowman(options = {})
     method = options[:method]
 
-    txt =  %{<div style="margin:0;padding:0;display:inline">}
+    txt =  %{<div class="snowman_and_authenticity_wrapper">}
     txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
     if (method && !['get','post'].include?(method.to_s))
       txt << %{<input name="_method" type="hidden" value="#{method}" />}
diff --git a/railties/guides/source/form_helpers.textile b/railties/guides/source/form_helpers.textile
index 40db430..28df212 100644
--- a/railties/guides/source/form_helpers.textile
+++ b/railties/guides/source/form_helpers.textile
@@ -33,8 +33,8 @@ Sample output from +form_tag+:
 
 <html>
 <form accept-charset="UTF-8" action="/home/index" method="post">
-  <div style="margin:0;padding:0">
-    <input name="utf8" type="hidden" value="&#x2713;" />
+  <div class="snowman_and_authenticity_wrapper">  
+  <input name="utf8" type="hidden" value="&#x2713;" />
     <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
   </div>
   Form contents
@@ -343,7 +343,7 @@ output:
 
 <html>
 <form accept-charset="UTF-8" action="/search" method="post">
-  <div style="margin:0;padding:0">
+  <div class="snowman_and_authenticity_wrapper">
     <input name="_method" type="hidden" value="put" />
     <input name="utf8" type="hidden" value="&#x2713;" />
     <input name="authenticity_token" type="hidden" value="f755bb0ed134b76c432144748a6d4b7a7ddf2b71" />
diff --git a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
index 1ae7000..8e5f9e5 100644
--- a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
+++ b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
@@ -54,3 +54,10 @@ div.field, div.actions {
   font-size: 12px;
   list-style: square;
 }
+
+.snowman_and_authenticity_wrapper {
+  margin: 0;
+  padding: 0;
+  display: inline;
+}
+
-- 
1.6.4.2