From 02739259b66ca1144cedede93d2bdcc7c92f8d57 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Wed, 22 Jun 2011 13:19:54 -0700
Subject: [PATCH] Don't hide the forgot password link
---
app/views/sessions/new.haml | 4 ++--
public/javascripts/login.js | 10 +---------
public/stylesheets/sass/login.scss | 7 +------
3 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml
index 587346f303..fb53459c52 100644
--- a/app/views/sessions/new.haml
+++ b/app/views/sessions/new.haml
@@ -31,7 +31,7 @@
= f.password_field :password, :tabindex => 2
- 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
%p#controls
@@ -48,5 +48,5 @@
%br
%br
= link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
-
+
diff --git a/public/javascripts/login.js b/public/javascripts/login.js
index 0c0b891902..1f1dcae3e2 100644
--- a/public/javascripts/login.js
+++ b/public/javascripts/login.js
@@ -14,7 +14,7 @@ $(document).ready( function(){
var contentFilled = function(){
return($('#user_username').val() != "" && $('#user_password').val() != "");
}
-
+
var checkSubmitAvailability = function() {
if(contentFilled()){
controls.removeClass('hidden');
@@ -42,13 +42,5 @@ $(document).ready( function(){
// Check it again
setTimeout(checkSubmitAvailability, 1000);
-
- password
- .focus(function(){
- forgotPass.removeClass('hidden');
- })
- .blur(function(){
- forgotPass.addClass('hidden');
- });
});
diff --git a/public/stylesheets/sass/login.scss b/public/stylesheets/sass/login.scss
index 90cafd0555..5d20a9ee58 100644
--- a/public/stylesheets/sass/login.scss
+++ b/public/stylesheets/sass/login.scss
@@ -65,11 +65,6 @@
}
#forgot_password_link {
- @include transition(opacity, 0.2s);
- &.hidden {
- display: block;
- @include opacity(0);
- }
text-align: left;
position: absolute;
left: 205px;
@@ -114,4 +109,4 @@
-moz-animation-duration: 5s;
-moz-animation-iteration-count: infinite;
-}
\ No newline at end of file
+}
--
GitLab