Changeset 8830

Timestamp:

02/10/08 01:04:27 (5 months ago)

Author:

nzkoz

Message:

2-0-stable: Add label_tag helper for generating elements. References #10802 [DefV]

Merging [8685]

Files:

• branches/2-0-stable/actionpack/CHANGELOG (modified) (1 diff)
• branches/2-0-stable/actionpack/lib/action_view/helpers/form_tag_helper.rb (modified) (1 diff)
• branches/2-0-stable/actionpack/test/template/form_tag_helper_test.rb (modified) (1 diff)

branches/2-0-stable/actionpack/CHANGELOG

@@ -6 +6 @@
-
-* Fix bug with setting Request#format= after the getter has cached the value.  #10889 [cch1]
+
+* Add label_tag helper for generating elements. #10802 [DefV]
-
-* TestSession supports indifferent access.  #7372 [tamc, Arsen7, mhackett, julik, jean.helou]

branches/2-0-stable/actionpack/lib/action_view/helpers/form_tag_helper.rb

@@ -113 +113 @@
-      def text_field_tag(name, value = nil, options = {})
-        tag :input, { "type" => "text", "name" => name, "id" => name, "value" => value }.update(options.stringify_keys)
+      end
+
+      # Creates a label field
+      #
+      # ==== Options
+      # * Creates standard HTML attributes for the tag.
+      #
+      # ==== Examples
+      #   label_tag 'name'
+      #   # => <label for="name">Name</label>
+      #
+      #   label_tag 'name', 'Your name'
+      #   # => <label for="name">Your Name</label>
+      #
+      #   label_tag 'name', nil, :class => 'small_label'
+      #   # => <label for="name" class="small_label">Name</label>
+      def label_tag(name, text = nil, options = {})
+        content_tag :label, text || name.humanize, { "for" => name }.update(options.stringify_keys)
-      end
-

branches/2-0-stable/actionpack/test/template/form_tag_helper_test.rb

@@ -189 +189 @@
-  end
-
+  def test_label_tag_without_text
+    actual = label_tag "title"
+    expected = %(<label for="title">Title</label>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_label_tag_with_text
+    actual = label_tag "title", "My Title"
+    expected = %(<label for="title">My Title</label>)
+    assert_dom_equal expected, actual
+  end
+
+  def test_label_tag_class_string
+    actual = label_tag "title", "My Title", "class" => "small_label"
+    expected = %(<label for="title" class="small_label">My Title</label>)
+    assert_dom_equal expected, actual
+  end
+
-  def test_boolean_optios
-    assert_dom_equal %(<input checked="checked" disabled="disabled" id="admin" name="admin" readonly="readonly" type="checkbox" value="1" />), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes")