diff options
| author | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 |
| commit | 09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch) | |
| tree | 3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /users/app/views/sessions/new.html.haml | |
| parent | 9979b50848ce27730f880159512933e50d5ae0e4 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/authentication_generic_error
Conflicts:
app/views/layouts/_messages.html.haml
app/views/layouts/application.html.haml
users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'users/app/views/sessions/new.html.haml')
| -rw-r--r-- | users/app/views/sessions/new.html.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml index 6743407..c915968 100644 --- a/users/app/views/sessions/new.html.haml +++ b/users/app/views/sessions/new.html.haml @@ -1,9 +1,10 @@ -.span8.offset2 +.span1 +.span9 = render :partial => 'users/warnings' %h2=t :login = simple_form_for @session, :validate => true, :html => { :id => :new_session, :class => 'form-horizontal' } do |f| - %legend=t :login_message - = f.input :login, :input_html => { :id => :srp_username } - = f.input :password, :required => true, :input_html => { :id => :srp_password } - = f.button :submit, :value => t(:login), :class => 'btn-primary' - = link_to t(:cancel), root_url, :class => :btn
\ No newline at end of file + = f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username } + = f.input :password, :required => false, :input_html => { :id => :srp_password } + .form-actions + = f.button :submit, :value => t(:login), :class => 'btn-primary' + = link_to t(:cancel), root_path, :class => 'btn' |