Skip to content

E
edx-platform
Commit d7393cd5 by Galen Frechette
Options

Merge branch 'prototype' into dormsbee/multicourse

parents cd4dac13 b414f2bb
Showing with 378 additions and 170 deletions
lms/static/js/toggle_login_modal.js
$(document).ready(function () { $(document).ready(function () {
$('a.login').click(function() { $('a#login').click(function() {
$('.modal-wrapper').addClass("visible"); $('.modal.login-modal').addClass("visible");
$('.modal-overlay').addClass("visible");
}); });
$('div.close-modal').click(function() { $('div.close-modal').click(function() {
$('.modal-wrapper').removeClass("visible"); $('.modal.login-modal').removeClass("visible");
$('.modal-overlay').removeClass("visible");
});
$('a#signup').click(function() {
$('.modal.signup-modal').addClass("visible");
$('.modal-overlay').addClass("visible");
});
$('div.close-modal').click(function() {
$('.modal.signup-modal').removeClass("visible");
$('.modal-overlay').removeClass("visible");
}); });
}); });
lms/static/sass/_base_extends.scss
.faded-hr-divider { .faded-hr-divider {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%, rgba(200,200,200, 0.8) 15%, rgb(200,200,200) 50%, rgba(200,200,200, 0.8) 85%, rgba(255,255,255, 0))); @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 1px;
width: 100%;
}
.faded-hr-divider-light {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.8) 50%,
rgba(255,255,255, 0)));
height: 1px; height: 1px;
width: 100%; width: 100%;
} }
.faded-vertical-divider { .faded-vertical-divider {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%, rgba(200,200,200, 0.6) 25%, rgb(200,200,200) 50%, rgba(200,200,200, 0.6) 75%, rgba(255,255,255, 0))); @include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 100%;
width: 1px;
}
.faded-vertical-divider-light {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.6) 50%,
rgba(255,255,255, 0)));
height: 100%; height: 100%;
width: 1px; width: 1px;
} }
.vertical-divider {
@extend .faded-vertical-divider;
position: relative;
&::after {
@extend .faded-vertical-divider-light;
content: "";
display: block;
position: absolute;
left: 1px;
}
}
.horizontal-divider {
@extend .faded-hr-divider;
position: relative;
&::after {
@extend .faded-hr-divider-light;
content: "";
display: block;
position: absolute;
top: 1px;
}
}
lms/static/sass/_base_mixins.scss
@mixin vertically-and-horizontally-centered ( $height, $width ) { @mixin vertically-and-horizontally-centered ( $height, $width ) {
left: 50%; left: 50%;
margin-left: -$width / 2; margin-left: -$width / 2;
margin-top: -$height / 2; //margin-top: -$height / 2;
min-height: $height; min-height: $height;
min-width: $width; min-width: $width;
position: fixed; position: absolute;
top: 35%; top: 150px;
} }
lms/static/sass/_index.scss
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
} }
a { a {
@include button(shiny, $pink); @include button(shiny, $blue);
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(3px); @include border-radius(3px);
@include inline-block; @include inline-block;
...@@ -95,20 +95,7 @@ ...@@ -95,20 +95,7 @@
padding: 15px 0px; padding: 15px 0px;
text-transform: uppercase; text-transform: uppercase;
text-align: center; text-align: center;
width: flex-grid(6); width: flex-grid(12);
&:first-child {
margin-right: flex-gutter();
}
&.find-courses {
@include button(shiny, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
@include inline-block;
font: normal italic 1.2rem/1.6rem $serif;
padding: 15px 0px;
}
} }
form { form {
......
lms/static/sass/_shared_forms.scss
...@@ -34,7 +34,7 @@ form { ...@@ -34,7 +34,7 @@ form {
} }
input[type="submit"] { input[type="submit"] {
@include button(shiny, $pink); @include button(shiny, $blue);
@include border-radius(3px); @include border-radius(3px);
font: normal italic 1.2rem/1.6rem $serif; font: normal italic 1.2rem/1.6rem $serif;
height: 35px; height: 35px;
......
lms/static/sass/_shared_login_modal.scss → lms/static/sass/_shared_modal.scss
.modal-wrapper { .modal-overlay {
@include background-image(radial-gradient(50% 50%, circle cover, rgba(0,0,0, 0.3), rgba(0,0,0, 0.7))); //background: rgba(255,255,255, 0.7);
@include background-image(radial-gradient(50% 30%, circle cover, rgba(0,0,0, 0.3), rgba(0,0,0, 0.8)));
bottom: 0; bottom: 0;
content: ""; content: "";
display: none; display: none;
...@@ -12,43 +13,60 @@ ...@@ -12,43 +13,60 @@
&.visible { &.visible {
display: block; display: block;
} }
}
.modal {
background: rgba(0,0,0, 0.6);
border: 1px solid rgba(0, 0, 0, 0.9);
@include border-radius(0px);
@include box-shadow(0 15px 80px 15px rgba(0,0,0, 0.5));
color: #fff;
display: none;
left: 50%;
margin-left: -(grid-width(6)) / 2;
padding: 8px;
position: absolute;
top: 170px;
width: grid-width(6);
z-index: 10;
&.visible {
display: block;
}
.login-modal { .inner-wrapper {
background: rgba(0,0,0, 0.6); background: rgb(240,240,240);
@include border-radius(0px);
border: 1px solid rgba(0, 0, 0, 0.9); border: 1px solid rgba(0, 0, 0, 0.9);
@include border-radius(4px); @include box-shadow(inset 0 1px 0 0 rgba(255, 255, 255, 0.7));
@include box-shadow(0 10px 60px 10px rgba(0,0,0, 0.5)); overflow: hidden;
color: #fff; padding-bottom: 30px;
padding: 10px; position: relative;
width: grid-width(7);
@include vertically-and-horizontally-centered(400px, grid-width(7)); header {
z-index: 10; margin-bottom: 30px;
.inner-wrapper {
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
@include border-radius(4px);
border: 1px solid rgba(0, 0, 0, 0.9);
@include box-shadow(inset 0 1px 0 0 rgba(255, 255, 255, 0.7));
height: 380px;
overflow: hidden; overflow: hidden;
padding: 30px; padding: 28px 20px 0px;
position: relative; position: relative;
z-index: 2;
&::before { &::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 1) 0%, rgba(255,255,255, 0) 100%)); @include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 0.8) 0%, rgba(255,255,255, 0) 100%));
content: ""; content: "";
display: block; display: block;
height: 400px; height: 400px;
left: 0px; left: 0px;
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
bottom: -140px; top: -140px;
width: 100%; width: 100%;
z-index: 1;
} }
header { hr {
margin-bottom: 30px; @extend .faded-hr-divider-light;
padding-top: 5px; border: none;
margin: 0px;
position: relative; position: relative;
z-index: 2; z-index: 2;
...@@ -58,120 +76,177 @@ ...@@ -58,120 +76,177 @@
content: ""; content: "";
display: block; display: block;
position: absolute; position: absolute;
top: -1px;
} }
}
h3 { h3 {
color: $lighter-base-font-color; color: $lighter-base-font-color;
font: normal 1.4rem/1.8rem $serif; font: normal 1.4rem/1.8rem $serif;
padding-bottom: 20px; padding-bottom: 20px;
text-align: center; text-align: center;
text-shadow: 0 1px rgba(255,255,255, 0.4); text-shadow: 0 1px rgba(255,255,255, 0.4);
text-transform: uppercase; text-transform: uppercase;
vertical-align: middle; vertical-align: middle;
position: relative;
z-index: 2;
}
}
form {
margin-bottom: 12px;
padding: 0px 40px;
position: relative;
z-index: 2;
label {
display: none;
}
input[type="checkbox"] {
margin-right: 5px;
}
input[type="email"],
input[type="text"],
input[type="password"] {
background: rgb(255,255,255);
display: block;
height: 45px;
margin-bottom: 20px;
width: 100%;
}
label.remember-me,
label.terms-of-service,
label.honor-code {
background: rgb(233,233,233);
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
display: block;
margin-bottom: 20px;
padding: 8px 10px;
&:hover {
background: rgb(230,230,230);
} }
a {
font: normal 1.2rem/1.6rem $serif;
text-decoration: underline;
&:hover {
}
}
} }
form { .honor-code-summary {
@include clearfix; margin-bottom: 20px;
padding: 0px;
position: relative; position: relative;
z-index: 2;
label { p {
display: none; color: $lighter-base-font-color;
font: 300 1.2rem/1.6rem $sans-serif;
} }
label.remember-me { hr {
background: rgb(230,230,230); @extend .faded-hr-divider-light;
border: 1px solid rgb(200,200,200); border: none;
@include border-radius(3px); margin-top: 30px;
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
display: block;
margin-bottom: 60px;
padding: 8px 10px;
position: relative; position: relative;
z-index: 2;
&::before { &::after {
@extend .faded-hr-divider; @extend .faded-hr-divider;
bottom: -30px; bottom: 0px;
content: ""; content: "";
display: block; display: block;
position: absolute; position: absolute;
top: -1px;
} }
} }
input[type="checkbox"] { ul {
margin-right: 5px; @include box-sizing(border-box);
} margin: 0;
padding: 0 0 0 20px;
input[type="email"],
input[type="password"] {
display: block;
height: 45px;
margin-bottom: 20px;
width: 100%; width: 100%;
li {
color: $lighter-base-font-color;
font: 300 1.2rem/1.6rem $sans-serif;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0px;
}
}
} }
}
.submit {
padding-top: 10px;
input[type="submit"] { input[type="submit"] {
display: block; display: block;
height: 45px; height: 45px;
margin: 0 auto; margin: 0 auto;
width: 70%; width: 100%;
} }
} }
}
.login-extra { .login-extra {
padding: 15px 0px; position: relative;
position: relative; z-index: 2;
p {
color: $lighter-base-font-color;
font: normal italic 1.2rem/1.6rem $serif;
text-align: center;
p { a {
color: $lighter-base-font-color; color: $lighter-base-font-color;
font: normal italic 1.2rem/1.6rem $serif; font: normal italic 1.2rem/1.6rem $serif;
text-align: center; text-decoration: underline;
a { &:hover {
color: $lighter-base-font-color; color: $base-font-color;
font: normal italic 1.2rem/1.6rem $serif;
text-decoration: underline;
} }
}
span + a { span + a {
margin-left: 15px; margin-left: 15px;
}
} }
} }
}
.close-modal { .close-modal {
//background: rgb(240,240,240); @include border-radius(2px);
//border: 1px solid rgba(180,180,180, 0.7); cursor: pointer;
@include border-radius(2px); @include inline-block;
//@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.4), inset 0 0 2px 0 rgba(0,0,0, 0.1)); padding: 10px;
cursor: pointer; position: absolute;
@include inline-block; right: 2px;
padding: 5px 10px; top: 0px;
position: absolute; z-index: 3;
right: 5px;
top: 5px; .inner {
@include transition(all, 0.15s, ease-out); p {
color: $lighter-base-font-color;
.inner { font: normal 1.2rem/1.2rem $sans-serif;
p { text-align: center;
color: $lighter-base-font-color; text-shadow: 0 1px rgba(255,255,255, 0.8);
font: normal 1.2rem/1.2rem $sans-serif; @include transition(all, 0.15s, ease-out);
text-align: center;
text-shadow: 0 1px rgba(255,255,255, 0.8);
@include transition(all, 0.15s, ease-out);
}
} }
}
&:hover { &:hover {
//background: rgb(235,235,235); p {
//@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.4), inset 0 0 2px 0 rgba(0,0,0, 0.125)); color: $base-font-color;
p {
color: $base-font-color;
}
} }
} }
} }
......
lms/static/sass/application.scss
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
@import 'shared_header'; @import 'shared_header';
@import 'shared_list_of_courses'; @import 'shared_list_of_courses';
@import 'shared_course_filter'; @import 'shared_course_filter';
@import 'shared_login_modal'; @import 'shared_modal';
@import 'index'; @import 'index';
@import 'dashboard'; @import 'dashboard';
......
lms/templates/about.html 0 → 100644
<%inherit file="main.html" />
<h1>About Us</h1>
lms/templates/index.html
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<div class="signup-wrapper"> <div class="signup-wrapper">
<section class="sign-up"> <section class="sign-up">
<a href="#" class="find-courses">Find Courses</a> <a href="#" class="find-courses">Find Courses</a>
<a href="#" class="create-account">Sign Up</a>
</section> </section>
</div> </div>
</section> </section>
......
lms/templates/jobs.html 0 → 100644
<%inherit file="main.html" />
<h1>Jobs</h1>
lms/templates/login_modal.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<section class="modal-wrapper"> <section class="modal login-modal">
<section class="login-modal"> <div class="inner-wrapper">
<div class="inner-wrapper"> <header>
<header> <h3>Log In</h3>
<h3>Log In</h3> <hr>
</header> </header>
<form id="login_form" method="post"> <form id="login_form" method="post">
<label>E-mail</label> <label>E-mail</label>
<input name="email" type="email" placeholder="e-mail"> <input name="email" type="email" placeholder="E-mail">
<label>Password</label> <label>Password</label>
<input name="password" type="password" placeholder="password"> <input name="password" type="password" placeholder="Password">
<label class="remember-me"> <label class="remember-me">
<input name="remember" type="checkbox"> <input name="remember" type="checkbox">
Remember me Remember me
</label> </label>
<div class="submit">
<input name="submit" type="submit" value="Submit"> <input name="submit" type="submit" value="Submit">
</form> </div>
</form>
<section class="login-extra"> <section class="login-extra">
<p> <p>
<span>Not enrolled? <a href="#">Sign up.</a></span> <span>Not enrolled? <a href="#">Sign up.</a></span>
<a href="#" class="pwd-reset">Forgot password?</a> <a href="#" class="pwd-reset">Forgot password?</a>
</p> </p>
</section> </section>
<div class="close-modal"> <div class="close-modal">
<div class="inner"> <div class="inner">
<p>&#10005;</p> <p>&#10005;</p>
</div>
</div> </div>
</div> </div>
</section> </div>
</section> </section>
<script type="text/javascript"> <script type="text/javascript">
function getCookie(name) { function getCookie(name) {
var cookieValue = null; var cookieValue = null;
...@@ -68,7 +70,7 @@ function postJSON(url, data, callback) { ...@@ -68,7 +70,7 @@ function postJSON(url, data, callback) {
submit_data, submit_data,
function(json) { function(json) {
if(json.success) { if(json.success) {
location.href="/info"; location.href="/courses";
} 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 {
......
lms/templates/navigation.html
...@@ -7,21 +7,35 @@ ...@@ -7,21 +7,35 @@
<a href="${ MITX_ROOT_URL }" class="logo"> <a href="${ MITX_ROOT_URL }" class="logo">
<img src="${static.url('images/logo.png')}" /> <img src="${static.url('images/logo.png')}" />
</a> </a>
<a href="/courses" class="discover-courses">Find Courses</a> <nav class="find-courses">
<ol>
<li class="primary">
<div class="divider"></div>
<a href="/courses">Find Courses</a>
<div class="divider"></div>
</li>
<li class="secondary">
<a href="/about">About</a>
<a href="#">Blog</a>
<a href="/jobs">Jobs</a>
</li>
</ol>
</nav>
%if user.is_authenticated(): %if user.is_authenticated():
<h1>${ settings.COURSE_TITLE }</h1>
<nav class="user"> <nav class="user">
<ol> <ol>
<li> <li class="primary">
<div class="divider"></div>
<a href="/dashboard" class="user-link"> <a href="/dashboard" class="user-link">
<span class="avatar"><img src="${static.url('images/profile.jpg')}" /></span> <span class="avatar"><img src="${static.url('images/profile.jpg')}" /></span>
Neil deGrasse Tyson Neil deGrasse Tyson
</a> </a>
</li> <div class="divider"></div>
<li>
<a href="#" class="options">&#9662</a> <a href="#" class="options">&#9662</a>
<div class="divider"></div>
<ol class="user-options"> <ol class="user-options">
<li><a href="#">Account Settings</a></li>
<li><a href="#">Help</a></li> <li><a href="#">Help</a></li>
<li><a href="/logout">Log Out</a></li> <li><a href="/logout">Log Out</a></li>
</ol> </ol>
...@@ -32,20 +46,12 @@ ...@@ -32,20 +46,12 @@
%else: %else:
<nav class="guest"> <nav class="guest">
<ol> <ol>
<li> <li class="primary">
<a href="#">About</a> <div class="divider"></div>
</li> <a href="#" id="login">Log In</a>
<li> <div class="divider"></div>
<a href="#">Blog</a> <a href="#" id="signup">Sign Up</a>
</li> <div class="divider"></div>
<li>
<a href="#">Jobs</a>
</li>
<li>
<a href="#" class="login">Log In</a>
</li>
<li>
<a href="#">Sign Up</a>
</li> </li>
</ol> </ol>
</nav> </nav>
...@@ -55,4 +61,8 @@ ...@@ -55,4 +61,8 @@
%if not user.is_authenticated(): %if not user.is_authenticated():
<%include file="login_modal.html" /> <%include file="login_modal.html" />
<%include file="signup_modal.html" />
<section class="modal-overlay">
</section>
%endif %endif
lms/templates/signup_modal.html 0 → 100644
<%namespace name='static' file='static_content.html'/>
<section class="modal signup-modal">
<div class="inner-wrapper">
<header>
<h3>Sign Up for edX</h3>
<hr>
</header>
<form id="login_form" method="post">
<label>E-mail</label>
<input name="email" type="email" placeholder="E-mail">
<label>Password</label>
<input name="password" type="password" placeholder="Password">
<label>Public Username</label>
<input name="username" type="text" placeholder="Public Username">
<label>Full Name</label>
<input name="fullname" type="text" placeholder="Full Name">
<label>Your Location</label>
<input name="location" type="text" placeholder="Your Location">
<label>Prefered Language</label>
<input name="language" type="text" placeholder="Prefered Language">
<label class="terms-of-service">
<input name="terms-of-service" type="checkbox">
I agree to the
<a href="#">Terms of Service</a>
</label>
<label class="honor-code">
<input name="honor-code" type="checkbox">
I agree to the
<a href="#">Honor Code</a>
, sumarized below as:
</label>
<div class="honor-code-summary">
<ul>
<li>
<p>Complete all mid-terms and final exams with only my own work.</p>
</li>
<li>
<p>Maintain only one account, and not share the username or password.</p>
</li>
<li>
<p>Not engage in any activity that would dishonestly improve my results, or improve or hurt those of others.</p>
</li>
<li>
<p>Not post answers to problems that are being used to assess student performance.</p>
</li>
</ul>
<hr>
</div>
<div class="submit">
<input name="submit" type="submit" value="Create My Account">
</div>
</form>
<section class="login-extra">
<p>
<span>Already have an account? <a href="#">Login.</a></span>
</p>
</section>
<div class="close-modal">
<div class="inner">
<p>&#10005;</p>
</div>
</div>
</div>
</section>
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