diff options
author | Azul <azul@leap.se> | 2013-06-20 12:25:59 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-06-20 12:25:59 +0200 |
commit | 3a89159d249c76ed7dbde3e51541ffc82b74ccdb (patch) | |
tree | 5813f43e1514d97c83db8d8a37319e57f4e63b31 /users/app/views/sessions | |
parent | f1d53b81bfcd9803d73b26ee025160b60f1965c6 (diff) | |
parent | 11c4155aff42fe3f8bbce858bc87cdb6a91f67a2 (diff) |
Merge remote-tracking branch 'origin/js_cookie_warning' into master
Diffstat (limited to 'users/app/views/sessions')
-rw-r--r-- | users/app/views/sessions/new.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml index a04f584..6743407 100644 --- a/users/app/views/sessions/new.html.haml +++ b/users/app/views/sessions/new.html.haml @@ -1,8 +1,9 @@ .span8.offset2 + = 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 + = f.button :submit, :value => t(:login), :class => 'btn-primary' + = link_to t(:cancel), root_url, :class => :btn
\ No newline at end of file |