Commit 261c9b15 by Kyle Fiedler

Added link to create a new account on login modal and added styles for that too

--HG--
branch : kf-login-errors
parent bd523c2e
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
${ error } ${ error }
<div id="login_div"> <div id="login_div">
<h1>Log in to MITx</h1> <header>
<h1>Log in to MITx</h1>
<p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p>
</header>
<form id="login_form" method="post"> <form id="login_form" method="post">
<ol> <ol>
<li> <li>
......
...@@ -100,6 +100,7 @@ function postJSON(url, data, callback) { ...@@ -100,6 +100,7 @@ function postJSON(url, data, callback) {
% if settings.COURSEWARE_ENABLED: % if settings.COURSEWARE_ENABLED:
<div id="login" class="leanModal_box"><%include file="login.html" /></div> <div id="login" class="leanModal_box"><%include file="login.html" /></div>
<div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>
% endif % endif
<div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div> <div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
<div id="reset_done" class="leanModal_box"></div> <div id="reset_done" class="leanModal_box"></div>
...@@ -122,7 +123,7 @@ $(document).ready(function(){ ...@@ -122,7 +123,7 @@ $(document).ready(function(){
if(json.success) { if(json.success) {
location.href="/courseware"; location.href="/courseware";
} else if($('#login_error').length == 0) { } else if($('#login_error').length == 0) {
$('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>'); $('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
} else { } else {
$('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); $('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
} }
......
...@@ -167,16 +167,16 @@ header.announcement { ...@@ -167,16 +167,16 @@ header.announcement {
a { a {
@extend .button; @extend .button;
@include box-shadow(inset 0 1px 0 darken($mit-red, 5%), 0 1px 0 lighten($mit-red, 5%)); @include box-shadow(inset 0 1px 0 darken($mit-red, 10%), 0 1px 0 lighten($mit-red, 5%));
background-color: darken($mit-red, 10%); background-color: darken($mit-red, 20%);
display: block; display: block;
padding: lh(.5) lh(); padding: lh(.5) lh();
border-color: darken($mit-red, 20%); border-color: darken($mit-red, 30%);
text-align: center; text-align: center;
&:hover { &:hover {
background-color: darken($mit-red, 20%); background-color: darken($mit-red, 10%);
border-color: darken($mit-red, 30%); border-color: darken($mit-red, 20%);
} }
} }
} }
...@@ -417,7 +417,7 @@ section.index-content { ...@@ -417,7 +417,7 @@ section.index-content {
a.enroll { a.enroll {
@extend .button; @extend .button;
padding: lh(.5) lh(1.5); padding: lh(.5) lh(2);
@include inline-block(); @include inline-block();
text-align: center; text-align: center;
font: 800 18px $header-font-family; font: 800 18px $header-font-family;
......
...@@ -160,6 +160,18 @@ div.leanModal_box { ...@@ -160,6 +160,18 @@ div.leanModal_box {
div#login { div#login {
min-width: 400px; min-width: 400px;
header {
border-bottom: 1px solid #ddd;
margin-bottom: lh();
padding-bottom: lh();
h1 {
border-bottom: 0;
padding-bottom: 0;
margin-bottom: lh(.25);
}
}
ol { ol {
li { li {
width: auto; width: auto;
...@@ -209,6 +221,7 @@ div#feedback_div{ ...@@ -209,6 +221,7 @@ div#feedback_div{
div#calculator_div { div#calculator_div {
max-width: 500px; max-width: 500px;
form { form {
padding-bottom: lh(); padding-bottom: lh();
margin-bottom: lh(); margin-bottom: lh();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment