diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
| commit | a1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch) | |
| tree | c9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /app/views/users/new.html.erb | |
| parent | 706392b7c4520382ddd8f827b31205c6b71f5320 (diff) | |
| parent | 63830b0f939db5f6911218950525428420c4d467 (diff) | |
Merge branch 'master2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
Diffstat (limited to 'app/views/users/new.html.erb')
| -rw-r--r-- | app/views/users/new.html.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 704aa10..c23f76d 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -19,14 +19,14 @@ <%= f.password_field :password %> </p> <p> - <%= f.label :password_confirm %><br> + <%= f.label(:password_confirmation, "Confirm Password") %><br> <%= f.password_field :password_confirmation %> </p> <p> - <%= f.submit %> + <%= f.submit("Be a Leaguer", :class => "signup") %> </p> <% end %> -<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "btn btn-warning btn-lg" %> +<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "signin" %> |