nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't hide the forgot password link

Browse source
This commit is contained in:
Raphael Sofaer 2011-06-22 13:19:54 -07:00
parent 04b0705733
commit 02739259b6
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/sessions/new.haml
View file

@ -31,7 +31,7 @@
= f.password_field :password, :tabindex => 2 = f.password_field :password, :tabindex => 2
- if devise_mapping.recoverable? && controller_name != 'passwords' - if devise_mapping.recoverable? && controller_name != 'passwords'
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :class => 'hidden', :tabindex => 5 = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :tabindex => 5
%br %br
%p#controls %p#controls
@ -48,5 +48,5 @@
%br %br
%br %br
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)

10
public/javascripts/login.js
View file

@ -14,7 +14,7 @@ $(document).ready( function(){
var contentFilled = function(){ var contentFilled = function(){
return($('#user_username').val() != "" && $('#user_password').val() != ""); return($('#user_username').val() != "" && $('#user_password').val() != "");
} }
var checkSubmitAvailability = function() { var checkSubmitAvailability = function() {
if(contentFilled()){ if(contentFilled()){
controls.removeClass('hidden'); controls.removeClass('hidden');
@ -42,13 +42,5 @@ $(document).ready( function(){
// Check it again // Check it again
setTimeout(checkSubmitAvailability, 1000); setTimeout(checkSubmitAvailability, 1000);
password
.focus(function(){
forgotPass.removeClass('hidden');
})
.blur(function(){
forgotPass.addClass('hidden');
});
}); });

7
public/stylesheets/sass/login.scss
View file

@ -65,11 +65,6 @@
} }
#forgot_password_link { #forgot_password_link {
@include transition(opacity, 0.2s);
&.hidden {
display: block;
@include opacity(0);
}
text-align: left; text-align: left;
position: absolute; position: absolute;
left: 205px; left: 205px;
@ -114,4 +109,4 @@
-moz-animation-duration: 5s; -moz-animation-duration: 5s;
-moz-animation-iteration-count: infinite; -moz-animation-iteration-count: infinite;
} }