Commit eb8c9e549d97a7ac3316f1ce9bca9ba1e349c4cc
1 parent
bdfbacf0
Exists in
master
and in
1 other branch
converting clearance forms to formtastic
Showing
4 changed files
with
30 additions
and
32 deletions
Show diff stats
app/views/passwords/edit.html.erb
| @@ -4,16 +4,16 @@ | @@ -4,16 +4,16 @@ | ||
| 4 | Your password has been reset. Choose a new password below. | 4 | Your password has been reset. Choose a new password below. |
| 5 | </p> | 5 | </p> |
| 6 | 6 | ||
| 7 | -<% form_for(:user, | 7 | +<% semantic_form_for(:user, |
| 8 | :url => user_password_path(@user, :token => @user.token), | 8 | :url => user_password_path(@user, :token => @user.token), |
| 9 | :html => { :method => :put }) do |form| %> | 9 | :html => { :method => :put }) do |form| %> |
| 10 | - <fieldset class="inputs"> | ||
| 11 | - <%= form.error_messages %> | ||
| 12 | - <%= form.password :password %> | ||
| 13 | - <%= form.password :password_confirmation %> | ||
| 14 | - </fieldset> | ||
| 15 | - <fieldset class="buttons"> | ||
| 16 | - <%= form.submit "Save this password", :disable_with => "Please wait..." %> | ||
| 17 | - </fieldset> | 10 | + <%= form.error_messages %> |
| 11 | + <% form.inputs do -%> | ||
| 12 | + <%= form.input :password, :as => :password %> | ||
| 13 | + <%= form.input :password_confirmation, :as => :password %> | ||
| 14 | + <% end -%> | ||
| 15 | + <% form.buttons do -%> | ||
| 16 | + <%= form.commit_button "Save this password" %> | ||
| 17 | + <% end -%> | ||
| 18 | <% end %> | 18 | <% end %> |
| 19 | 19 |
app/views/passwords/new.html.erb
| @@ -4,12 +4,12 @@ | @@ -4,12 +4,12 @@ | ||
| 4 | We will email you a link to reset your password. | 4 | We will email you a link to reset your password. |
| 5 | </p> | 5 | </p> |
| 6 | 6 | ||
| 7 | -<% form_for :password, :url => passwords_path do |form| %> | ||
| 8 | - <fieldset class="inputs"> | ||
| 9 | - <%= form.string :email %> | ||
| 10 | - </fieldset> | ||
| 11 | - <fieldset class="buttons"> | ||
| 12 | - <%= form.submit "Reset password", :disable_with => "Please wait..." %> | ||
| 13 | - </fieldset> | ||
| 14 | -<% end %> | 7 | +<% semantic_form_for :password, :url => passwords_path do |form| -%> |
| 8 | + <% form.inputs do -%> | ||
| 9 | + <%= form.input :email %> | ||
| 10 | + <% end -%> | ||
| 11 | + <% form.buttons do -%> | ||
| 12 | + <%= form.commit_button "Reset password" %> | ||
| 13 | + <% end -%> | ||
| 14 | +<% end -%> | ||
| 15 | 15 |
app/views/sessions/new.html.erb
| 1 | <h2>Sign in</h2> | 1 | <h2>Sign in</h2> |
| 2 | 2 | ||
| 3 | -<% form_for :session, :url => session_path do |form| %> | ||
| 4 | - <fieldset class="inputs"> | ||
| 5 | - <%= form.string :email %> | ||
| 6 | - <%= form.password :password %> | ||
| 7 | - <%= form.boolean :remember_me %> | ||
| 8 | - </fieldset> | ||
| 9 | - <fieldset class="buttons"> | ||
| 10 | - <%= form.submit "Sign in", :disable_with => "Please wait..." %> | ||
| 11 | - </fieldset> | 3 | +<% semantic_form_for :session, :url => session_path do |form| %> |
| 4 | + <% form.inputs do %> | ||
| 5 | + <%= form.input :email %> | ||
| 6 | + <%= form.input :password, :as => :password %> | ||
| 7 | + <%= form.input :remember_me, :as => :boolean %> | ||
| 8 | + <% end %> | ||
| 9 | + <% form.buttons do %> | ||
| 10 | + <%= form.commit_button "Sign In" %> | ||
| 11 | + <% end %> | ||
| 12 | <% end %> | 12 | <% end %> |
| 13 | 13 | ||
| 14 | <ul> | 14 | <ul> |
app/views/users/new.html.erb
| 1 | <h2>Sign up</h2> | 1 | <h2>Sign up</h2> |
| 2 | 2 | ||
| 3 | -<% form_for @user do |form| %> | ||
| 4 | - <%= form.error_messages %> | ||
| 5 | - <%= render :partial => '/users/inputs', :locals => { :form => form } %> | ||
| 6 | - <fieldset class="buttons"> | ||
| 7 | - <%= form.submit 'Sign up', :disable_with => 'Please wait...' %> | ||
| 8 | - </fieldset> | 3 | +<% form.inputs do %> |
| 4 | + <%= form.input :email %> | ||
| 5 | + <%= form.input :password, :as => :password %> | ||
| 6 | + <%= form.input :password_confirmation, :as => :password %> | ||
| 9 | <% end %> | 7 | <% end %> |
| 10 | 8 |