Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hooks up links from login modal to signup modal and signup modal to login modal

Browse Source
This commit is contained in:
Galen Frechette
2012-07-16 10:27:55 -04:00
parent 15b544c50b
commit 1c027c43d2
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/static/js/toggle_login_modal.js
View File

@@ -18,6 +18,8 @@
$(this).click(function(e) {
$(".modal").hide();
var modal_id = $(this).attr("href");
$("#lean_overlay").click(function() {

7
lms/static/sass/application.css
View File

@@ -2482,6 +2482,13 @@ header.global {
text-align: center;
text-shadow: 0 1px rgba(255, 255, 255, 0.4);
z-index: 2; }
.modal .inner-wrapper #enroll_error, .modal .inner-wrapper #login_error {
background: #fd5757;
border: 1px solid #ca1111;
color: #8f0e0e;
display: none;
margin-bottom: 20px;
padding: 12px; }
.modal .inner-wrapper form {
margin-bottom: 12px;
padding: 0px 40px;

15
lms/static/sass/shared_styles/_shared_modal.scss
View File

@@ -106,13 +106,14 @@
}
}
//#enroll_error {
//background: rgb(253, 87, 87);
//border: 1px solid rgb(202, 17, 17);
//color: rgb(143, 14, 14);
//margin-bottom: 20px;
//padding: 12px;
//}
#enroll_error, #login_error {
background: rgb(253, 87, 87);
border: 1px solid rgb(202, 17, 17);
color: rgb(143, 14, 14);
display: none;
margin-bottom: 20px;
padding: 12px;
}
//#enroll {
//padding: 0 40px;

4
lms/templates/login_modal.html
View File

@@ -24,7 +24,7 @@
<section class="login-extra">
<p>
<span>Not enrolled? <a href="#">Sign up.</a></span>
<span>Not enrolled? <a href="#signup-modal" class="close-login" rel="leanModal">Sign up.</a></span>
<a href="#" class="pwd-reset">Forgot password?</a>
</p>
</section>
@@ -64,7 +64,7 @@
} else if($('#login_error').length == 0) {
$('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
} else {
$('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
$('#login_error').stop().css("display", "block");
}
}
);

7
lms/templates/signup_modal.html
View File

@@ -31,7 +31,7 @@
<label class="honor-code">
<input name="honor_code" type="checkbox" value="true">
I agree to the
<a href="#">Honor Code</a>
<a href="/t/honor.html" target="blank">Honor Code</a>
, sumarized below as:
</label>
@@ -53,7 +53,6 @@
<hr>
</div>
<div class="submit">
<input name="submit" type="submit" value="Create My Account">
</div>
@@ -61,7 +60,7 @@
<section class="login-extra">
<p>
<span>Already have an account? <a href="#">Login.</a></span>
<span>Already have an account? <a href="#login-modal" class="close-signup" rel="leanModal">Login.</a></span>
</p>
</section>
@@ -101,7 +100,7 @@
if(json.success) {
$('#enroll').html(json.value);
} else {
$('#enroll_error').html(json.value).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
$('#enroll_error').html(json.value).stop().css("display", "block");
}
}
);