diff options
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/helpers/form_tag_helper.rb | 20 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index 67b4e842b1..388d6813ef 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -199,8 +199,8 @@ module ActionView # file_field_tag 'attachment' # # => <input id="attachment" name="attachment" type="file" /> # - # file_field_tag 'avatar', :class => 'profile-input' - # # => <input class="profile-input" id="avatar" name="avatar" type="file" /> + # file_field_tag 'avatar', :class => 'profile_input' + # # => <input class="profile_input" id="avatar" name="avatar" type="file" /> # # file_field_tag 'picture', :disabled => true # # => <input disabled="disabled" id="picture" name="picture" type="file" /> @@ -244,8 +244,8 @@ module ActionView # password_field_tag 'confirm_pass', nil, :disabled => true # # => <input disabled="disabled" id="confirm_pass" name="confirm_pass" type="password" /> # - # password_field_tag 'pin', '1234', :maxlength => 4, :size => 6, :class => "pin-input" - # # => <input class="pin-input" id="pin" maxlength="4" name="pin" size="6" type="password" value="1234" /> + # password_field_tag 'pin', '1234', :maxlength => 4, :size => 6, :class => "pin_input" + # # => <input class="pin_input" id="pin" maxlength="4" name="pin" size="6" type="password" value="1234" /> def password_field_tag(name = "password", value = nil, options = {}) text_field_tag(name, value, options.update("type" => "password")) end @@ -374,8 +374,8 @@ module ActionView # submit_tag nil, :class => "form_submit" # # => <input class="form_submit" name="commit" type="submit" /> # - # submit_tag "Edit", :disable_with => "Editing...", :class => "edit-button" - # # => <input class="edit-button" data-disable_with="Editing..." + # submit_tag "Edit", :disable_with => "Editing...", :class => "edit_button" + # # => <input class="edit_button" data-disable_with="Editing..." # # name="commit" type="submit" value="Edit" /> # # submit_tag "Save", :confirm => "Are you sure?" @@ -414,11 +414,11 @@ module ActionView # image_submit_tag("purchase.png", :disabled => true) # # => <input disabled="disabled" src="/images/purchase.png" type="image" /> # - # image_submit_tag("search.png", :class => 'search-button') - # # => <input class="search-button" src="/images/search.png" type="image" /> + # image_submit_tag("search.png", :class => 'search_button') + # # => <input class="search_button" src="/images/search.png" type="image" /> # - # image_submit_tag("agree.png", :disabled => true, :class => "agree-disagree-button") - # # => <input class="agree-disagree-button" disabled="disabled" src="/images/agree.png" type="image" /> + # image_submit_tag("agree.png", :disabled => true, :class => "agree_disagree_button") + # # => <input class="agree_disagree_button" disabled="disabled" src="/images/agree.png" type="image" /> def image_submit_tag(source, options = {}) options.stringify_keys! diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 5925faf810..0b748d700b 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -265,7 +265,7 @@ module ActionView # using the +link_to+ method with the <tt>:method</tt> modifier as described in # the +link_to+ documentation. # - # The generated form element has a class name of <tt>button-to</tt> + # The generated form element has a class name of <tt>button_to</tt> # to allow styling of the form itself and its children. You can control # the form submission and input element behavior using +html_options+. # This method accepts the <tt>:method</tt> and <tt>:confirm</tt> modifiers @@ -289,14 +289,14 @@ module ActionView # # ==== Examples # <%= button_to "New", :action => "new" %> - # # => "<form method="post" action="/controller/new" class="button-to"> + # # => "<form method="post" action="/controller/new" class="button_to"> # # <div><input value="New" type="submit" /></div> # # </form>" # # # <%= button_to "Delete Image", { :action => "delete", :id => @image.id }, # :confirm => "Are you sure?", :method => :delete %> - # # => "<form method="post" action="/images/delete/1" class="button-to"> + # # => "<form method="post" action="/images/delete/1" class="button_to"> # # <div> # # <input type="hidden" name="_method" value="delete" /> # # <input data-confirm='Are you sure?' value="Delete" type="submit" /> @@ -306,7 +306,7 @@ module ActionView # # <%= button_to('Destroy', 'http://www.example.com', :confirm => 'Are you sure?', # :method => "delete", :remote => true, :disable_with => 'loading...') %> - # # => "<form class='button-to' method='post' action='http://www.example.com' data-remote='true'> + # # => "<form class='button_to' method='post' action='http://www.example.com' data-remote='true'> # # <div> # # <input name='_method' value='delete' type='hidden' /> # # <input value='Destroy' type='submit' disable_with='loading...' data-confirm='Are you sure?' /> @@ -338,7 +338,7 @@ module ActionView html_options.merge!("type" => "submit", "value" => name) - ("<form method=\"#{form_method}\" action=\"#{escape_once url}\" #{"data-remote=\"true\"" if remote} class=\"button-to\"><div>" + + ("<form method=\"#{form_method}\" action=\"#{escape_once url}\" #{"data-remote=\"true\"" if remote} class=\"button_to\"><div>" + method_tag + tag("input", html_options) + request_token_tag + "</div></form>").html_safe end |