reintroduced remember me on the login page

This commit is contained in:
MrZYX 2011-02-20 21:49:08 +01:00
parent ab706f4127
commit da244f8438
4 changed files with 26 additions and 4 deletions

View file

@ -36,6 +36,8 @@
= f.text_field :username
%span.pod_location
="@#{AppConfig[:pod_uri].host}"
%br
%br
%p
= f.label :password , t('password')
@ -45,14 +47,20 @@
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name)
- else
\.
%p.submit
= f.submit t('.sign_in')
%span
%br
- if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
- else
\.
%p.submit
= f.submit t('.sign_in')
%span#remember_me
- if devise_mapping.rememberable?
= f.check_box :remember_me
= f.label :remember_me, t('.remember_me')
- else
\.
= image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"

View file

@ -14,6 +14,9 @@
= f.label :password , t('password')
= f.password_field :password
= f.submit t('.sign_in')
- if devise_mapping.rememberable?
= f.check_box :remember_me
= f.label :remember_me, t('.remember_me')
%p
= render :partial => "devise/shared/links"

View file

@ -2397,6 +2397,7 @@ ul.show_comments
&.submit
:width auto
:bottom 15px
input
:width auto
@ -2463,3 +2464,12 @@ ul.show_comments
#sort_by
:text-align right
#remember_me
input[type='checkbox']
:display inline
:height auto !important
:top 2px !important
label
:font-size inherit !important
:position static

View file

@ -61,6 +61,7 @@ a
.login_form
@include mobile-box
:padding 10px
label
:font-weight bold