diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:09:58 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:09:58 -0500 |
| commit | 185abfcaa5485f27fa52ad53f7b645f19332c1c7 (patch) | |
| tree | 0e57a75b7f7821494d3610053d305c86bc4e03d1 /app/views/users | |
| parent | ad24f46d94ad94003da412eb98d763c7a2beb863 (diff) | |
| parent | c45d69d4a7e6232d088986a78f6e12a25ae7be63 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/new.html.erb | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index f0ce746..704aa10 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,12 +1,12 @@ <h1> Sign Up </h1> -<% if false %> -<%= form_for :user do |f| %> +<%= form_for @user do |f| %> + <%= render "common/error_messages", :target => @user %> <p> <%= f.label :name %><br> <%= f.text_field :name %> </p> - <p> + <p> <%= f.label :email %><br> <%= f.text_field :email %> </p> @@ -14,7 +14,7 @@ <%= f.label :user_name %><br> <%= f.text_field :user_name %> </p> - <p> + <p> <%= f.label :password %><br> <%= f.password_field :password %> </p> @@ -28,33 +28,5 @@ <% end %> -<% end %> - -<form accept-charset="UTF-8" action="/users" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /><input name="authenticity_token" type="hidden" value="6WQoPLFISlDYCsi4LhAgT0hgrht19yydD3w5TlKfb7I=" /></div> - <p> - <label for="user_name">Name</label><br> - <input id="user_name" name="user[name]" type="text" /> - </p> - <p> - <label for="user_email">Email</label><br> - <input id="user_email" name="user[email]" type="text" /> - </p> - <p> - <label for="user_user_name">User name</label><br> - <input id="user_user_name" name="user[user_name]" type="text" /> - </p> - <p> - <label for="user_password">Password</label><br> - <input id="user_password" name="user[password]" type="password" /> - </p> - <p> - <label for="user_password_confirm">Password confirm</label><br> - <input id="user_password_confirmation" name="user[password_confirmation]" type="password" /> - </p> - <p> - <input name="commit" type="submit" value="Save User" /> - </p> -</form> - <%= link_to 'Already Have an Account? Log in', new_session_path, :class => "btn btn-warning btn-lg" %> |