Skip to content

E
edx-platform
Commit 5d257f7d by Reda Lemeden
Options

Merge with Head

parents 41e1415a a02f9c65
Showing with 142 additions and 358 deletions
.DS_Store
No preview for this file type
copyright.html
<%inherit file="marketing.html" />
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="copyright">
<div>
......
honor.html
<%inherit file="marketing.html" />
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="honor-code">
<div>
<h1> Honor Code </h1>
......
index.html
<%inherit file="marketing.html" />
<%block name="header">
<header class="announcement course">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="" rel="leanModal" href="#login">Log In</a>
</nav>
${parent.header_nav()}
<section class="course">
<section>
......@@ -16,23 +14,22 @@
<p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
</section>
</div>
</header>
</%block>
<section class="index-content">
<section class="about-course">
<section class="about-info">
<h1>About 6.002</h1>
<p>6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>
<p>The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. Students should expect to spend approximately 10 hours per week on the course. The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.</p>
<!-- <p> The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. San Mateo, CA: Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant section will be provided electronically as part of the on-line course.</p> -->
</section>
<section class="on-mitx">
<h1>6.002 on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
......@@ -45,7 +42,7 @@
<h1> Requirements </h1>
<p>In order to succeed in this course, students must have taken an AP level physics course in electricity and magnetism. Students must know basic calculus and linear algebra, and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for students with weaker math backgrounds.</p>
<p>The course web site was developed and tested primarily with Google Chrome. We support Mozilla Firefox as well. While we will attempt to make it possible to complete the course with Internet Explorer, portions of the web site functionality will be unavailable. The videos require Flash.</p>
</section>
......@@ -102,18 +99,13 @@
</section>
<div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>
<div id="login" class="leanModal_box"><%include file="login.html" /></div>
<div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
<div id="reset_done" class="leanModal_box"></div>
<script>
<script>
$(function() {
/* Set up FancyBox pop-ups */
// TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
/* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
/* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
Either shows error, or shows success. */
$('#create_account_button').click(function() {
......@@ -137,34 +129,6 @@ $(function() {
);
});
/* Handles when the user tries to log in. Grabs form data. Does AJAX.
Either shows error, or redirects. */
$('#login_button').click(function() {
var submit_data={};
$.each($("[id^=li_]"), function(index,value){
submit_data[value.name]=value.value;
});
submit_data["remember"] = ($('#remember').attr("checked")? true : false);
postJSON('/login',
submit_data,
function(json) {
if(json.success) {
location.href="/courseware";
} else {
$('#login_error').html("Invalid Login");
}
}
);
});
$('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
"email" : $('#id_email').val()}, function(data){
$('#pwd_reset').html(data);
});
});
/* Activate stupid spinner drop-downs in enrollment form */
var spinner_array=$("[id^=spinner_]");
spinner_array.each(function(i) {
......
main.html
......@@ -12,7 +12,7 @@
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script>
<script type="text/javascript" src="/static/js/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
......@@ -32,11 +32,11 @@
</script>
<script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/>
</head>
......@@ -48,7 +48,7 @@
<footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
<p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<p> Copyright &copy; 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<ul>
<li><a href="#feedback_div" rel="leanModal">Feedback</a></li>
......@@ -59,7 +59,7 @@
</footer>
<div id="feedback_div" class="leanModal_box">
<p>Found a bug? Got an idea for improving our system? Let us know.</p>
<p>Found a bug? Got an idea for improving our system? Let us know.</p>
<form>
<ol>
......@@ -71,8 +71,8 @@
</div>
<div id="calculator_div" class="leanModal_box">
<input type="text" id="calculator_input">
<div id="calculator_div" class="leanModal_box">
<input type="text" id="calculator_input">
<input id="calculator_button" type=button value="=&gt;">
<input type="text" id="calculator_output" readonly>
......
marketing.html
......@@ -12,23 +12,41 @@
<!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
<script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
<link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script>
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<script type="text/javascript">
$(function(){
$("a[rel*=leanModal]").leanModal();
});
</script>
<%block name="headextra"/>
</head>
<body>
<%block name="header">
<header class="announcement">
<div class="anouncement-wrapper">
<%block name="header_nav">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a rel="leanModal" class="login" href="#login">Log In</a>
</nav>
</%block>
<%block name="header_text">
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</%block>
</div>
</header>
</%block>
${self.body()}
<%block name="bodyextra"/>
......@@ -36,66 +54,51 @@
<footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
<div class="footer-wrapper">
<p> Copyright (c). 2011. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
<p> Copyright &copy; 2011. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
<ul>
<li><a href="/t/tos.html">Terms of service</a></li>
<li><a href="/t/tos.html">Terms of Service</a></li>
<li><a href="/t/privacy.html">Privacy Policy</a></li>
<li><a href="/t/honor.html">Honor Code</a></li>
</ul>
</div>
</footer>
<div style="display:none">
<div id="feedback_div">
Found a bug? Got an idea for improving our system? Let us know.
<form>
<ol>
<li><label>Subject:</label> <input id="feedback_subject" size=40></li>
<li><label>Feedback: </label><textarea id="feedback_message" cols="40" rows="5"></textarea></li>
<li><input id="feedback_button" type="button" value="Submit"></li>
</ol>
</form>
</div>
</div>
<div style="display:none">
<div id="calculator_div">
<input id="calculator_input" >
<input id="calculator_button" type=button value="=&gt;">
<input id="calculator_output" readonly>
<p>Supported operations: ^ * / + - || ()</p>
<p>Supported suffixes: %kMGTcmunp</p>
</div>
</div>
<div id="login" class="leanModal_box"><%include file="login.html" /></div>
<div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
<div id="reset_done" class="leanModal_box"></div>
<script>
// Feedback form
$(function() {
$("#feedback_button").click(function(){
postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
"url":document.URL,
"message":$("#feedback_message").attr("value")},
function(data){
$("#feedback_subject").attr("value","");
$("#feedback_message").attr("value","");
$("#feedback_div").html("Feedback submitted. Thank you");
});
});
$(document).ready(function(){
/* Handles when the user tries to log in. Grabs form data. Does AJAX.
Either shows error, or redirects. */
$('#login_button').click(function() {
var submit_data={};
$.each($("[id^=li_]"), function(index,value){
submit_data[value.name]=value.value;
});
// Calculator
$(function() {
$("#calculator_button").click(function(){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){
$("#calculator_output").attr("value",data.result);
});
});
submit_data["remember"] = ($('#remember').attr("checked")? true : false);
postJSON('/login',
submit_data,
function(json) {
if(json.success) {
location.href="/courseware";
} else {
$('#login_error').html("Invalid Login");
}
}
);
});
$('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
"email" : $('#id_email').val()}, function(data){
$('#pwd_reset').html(data);
});
});
});
</script>
</body>
......
mitx_global.html
<%inherit file="marketing.html" />
<header class="announcement home">
<div class="anouncement-wrapper">
<nav>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1><em>MITx</em></h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<section class="about">
<h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>
......@@ -49,29 +36,14 @@
<p>Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
</section>
<div style="display:none">
<div id="login"><%include file="login.html" /></div>
</div>
<div style="display:none">
<div id="pwd_reset"><%include file="password_reset_form.html" /></div>
</div>
<div style="display:none">
<div id="reset_done"></div>
</div>
</section>
<script>
$(function() {
/* Set up FancyBox pop-ups */
// TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
/* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
/* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
Either shows error, or shows success. */
$('#create_account_button').click(function() {
......@@ -95,34 +67,6 @@ $(function() {
);
});
/* Handles when the user tries to log in. Grabs form data. Does AJAX.
Either shows error, or redirects. */
$('#login_button').click(function() {
var submit_data={};
$.each($("[id^=li_]"), function(index,value){
submit_data[value.name]=value.value;
});
submit_data["remember"] = ($('#remember').attr("checked")? true : false);
postJSON('/login',
submit_data,
function(json) {
if(json.success) {
location.href="/courseware";
} else {
$('#login_error').html("Invalid Login");
}
}
);
});
$('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
"email" : $('#id_email').val()}, function(data){
$('#pwd_reset').html(data);
});
});
/* Activate stupid spinner drop-downs in enrollment form */
var spinner_array=$("[id^=spinner_]");
spinner_array.each(function(i) {
......
privacy.html
<%inherit file="marketing.html" />
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="privacy-policy">
<div>
<h1> Privacy Policy </h1>
......
sass/.DS_Store
No preview for this file type
sass/_fancybox.scss deleted 100644 → 0
div#fancybox-overlay {
background: #333 !important;
}
div#fancybox-wrap {
width: auto !important;
div#fancybox-outer {
background: none;
max-width: 600px;
div.fancybox-bg {
display: none;
background: none;
}
div#fancybox-content {
@include border-radius(3px);
@include box-shadow(0 0 6px #000);
@include box-sizing(border-box);
background: #fff;
border: none;
padding: lh(2);
max-width: 600px;
width: auto !important;
h1 {
font-size: 24px;
margin-top: 0;
padding-bottom: lh();
border-bottom: 1px solid #eee;
margin-bottom: lh();
}
form {
text-align: left;
div#enroll_error, div#login_error {
-webkit-font-smoothing: antialiased;
background-color: #F50200;
color: #fff;
font-weight: bold;
letter-spacing: 1px;
margin-bottom: lh();
padding: lh(.2);
text-transform: uppercase;
&:empty {
padding: 0;
}
}
label {
display: block;
font-weight: bold;
}
#{$all-text-inputs} {
width: 100%;
@include box-sizing(border-box);
}
input[type="checkbox"] {
margin-right: 10px;
}
ol {
li {
margin-bottom: lh();
&.terms, &.remember {
padding-top: lh();
border-top: 1px solid #eee;
}
&.honor-code {
width: auto;
float: none;
}
}
}
input[type="button"] {
@include button($mit-red);
font-size: 18px;
padding: lh(.5);
}
}
div#login {
min-width: 300px;
ol {
li {
width: auto;
float: none;
}
}
}
div.lost-password {
text-align: left;
margin-top: lh();
a {
color: #999;
&:hover {
color: #444;
}
}
}
div#pwd_reset {
p {
margin-bottom: lh();
}
input[type="email"] {
margin-bottom: lh();
}
}
}
}
}
sass/_wiki-create.scss
form#wiki_revision {
float: left;
width: flex-grid(7, 9);
margin-right: flex-gutter(9);
label {
display: block;
margin-bottom: 7px ;
}
textarea {
@include box-sizing(border-box);
margin-bottom: 20px;
min-height: 300px;
min-height: 450px;
width: 100%;
}
input[type="text"] {
display: block;
width: 50%;
}
#submit_delete {
float: right;
}
input[type="submit"] {
display: block;
margin-top: 20px;
}
}
#wiki_edit_instructions {
float: left;
width: flex-grid(2, 9);
.markdown-example {
background-color: $light-gray;
padding-top: 5px;
padding-right: 2px;
padding-bottom: 5px;
padding-left: 5px;
margin-top: 5px;
margin-bottom: 7px;
margin-left: 5px;
line-height: 1.0;
}
}
sass/_wiki.scss
......@@ -77,7 +77,7 @@ div.wiki-wrapper {
section.wiki-body {
@extend .content;
header {
@extend .topbar;
......
simplewiki_create.html
......@@ -16,4 +16,7 @@ Create article
<input type="submit" value="Create article" /></td>
</form>
<%include file="simplewiki_instructions.html"/>
</%block>
simplewiki_edit.html
......@@ -8,13 +8,14 @@ ${ wiki_article.title }
<%block name="wiki_body">
<form method="POST" id="wiki_revision">
<div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div>
<div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div>
${wiki_form}
<input type="submit" name="edit" value="Edit article" />
<input type="submit" name="delete" value="Delete article" />
<input type="submit" id="submit_edit" name="edit" value="Edit article" />
<input type="submit" id="submit_delete" name="delete" value="Delete article" />
</form>
<%include file="simplewiki_instructions.html"/>
</%block>
simplewiki_instructions.html 0 → 100644
<div id="wiki_edit_instructions">
This wiki uses <strong>Markdown</strong> for styling. There are several <a href="http://daringfireball.net/projects/markdown/basics">useful</a> <a href="http://greg.vario.us/doc/markdown.txt">guides</a> <a href="http://www.lowendtalk.com/discussion/6/miniature-markdown-guide">online</a>.
<br>
<br>MITx Additions:
<p class="markdown-example">circuit:basic</p>
<p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p>
To create a new wiki article, create a link to it. Clicking the link gives you the creation page.
<p class="markdown-example">[Article](/wiki/view/Article/Child/)</p>
Other useful examples:<br>
<p class="markdown-example">[Link](http://google.com)</p>
<p class="markdown-example">Huge Header
<br>====</p>
<p class="markdown-example">Smaller Header
<br>-------</p>
<p class="markdown-example">*emphasis* or _emphasis_</p>
<p class="markdown-example">**strong** or __strong__</p>
<p class="markdown-example">- Unordered List
<br>&nbsp&nbsp- Sub Item 1
<br>&nbsp&nbsp- Sub Item 2</p>
<p class="markdown-example">1. Ordered
<br>2. List</p>
</div>
tos.html
<%inherit file="marketing.html" />
<header class="announcement">
<div class="anouncement-wrapper">
<nav>
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="tos">
<div>
<h1>MITx Terms of Service</h1>
......
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