Skip to content

E
edx-platform
Commit 5d257f7d by Reda Lemeden
Options

Merge with Head

parents 41e1415a a02f9c65
Showing with 113 additions and 329 deletions
.DS_Store
No preview for this file type
copyright.html
<%inherit file="marketing.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"> <section class="copyright">
<div> <div>
......
honor.html
<%inherit file="marketing.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"> <section class="honor-code">
<div> <div>
<h1> Honor Code </h1> <h1> Honor Code </h1>
......
index.html
<%inherit file="marketing.html" /> <%inherit file="marketing.html" />
<%block name="header">
<header class="announcement course"> <header class="announcement course">
<div class="anouncement-wrapper"> <div class="anouncement-wrapper">
<nav> ${parent.header_nav()}
<h1><a href="/t/mitx_global.html">MITx</a></h1>
<a class="" rel="leanModal" href="#login">Log In</a>
</nav>
<section class="course"> <section class="course">
<section> <section>
...@@ -16,9 +14,8 @@ ...@@ -16,9 +14,8 @@
<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> <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> </section>
</div> </div>
</header> </header>
</%block>
<section class="index-content"> <section class="index-content">
<section class="about-course"> <section class="about-course">
...@@ -102,14 +99,9 @@ ...@@ -102,14 +99,9 @@
</section> </section>
<div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div> <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() { $(function() {
/* Set up FancyBox pop-ups */
// TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
...@@ -137,34 +129,6 @@ $(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 */ /* Activate stupid spinner drop-downs in enrollment form */
var spinner_array=$("[id^=spinner_]"); var spinner_array=$("[id^=spinner_]");
spinner_array.each(function(i) { spinner_array.each(function(i) {
......
main.html
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<footer> <footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. --> <!-- 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> <ul>
<li><a href="#feedback_div" rel="leanModal">Feedback</a></li> <li><a href="#feedback_div" rel="leanModal">Feedback</a></li>
......
marketing.html
...@@ -29,6 +29,24 @@ ...@@ -29,6 +29,24 @@
</head> </head>
<body> <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()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
...@@ -36,66 +54,51 @@ ...@@ -36,66 +54,51 @@
<footer> <footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. --> <!-- 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"> <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> <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/privacy.html">Privacy Policy</a></li>
<li><a href="/t/honor.html">Honor Code</a></li> <li><a href="/t/honor.html">Honor Code</a></li>
</ul> </ul>
</div> </div>
</footer> </footer>
<div style="display:none"> <div id="login" class="leanModal_box"><%include file="login.html" /></div>
<div id="feedback_div"> <div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
Found a bug? Got an idea for improving our system? Let us know. <div id="reset_done" class="leanModal_box"></div>
<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>
<script> <script>
// Feedback form $(document).ready(function(){
$(function() { /* Handles when the user tries to log in. Grabs form data. Does AJAX.
$("#feedback_button").click(function(){ Either shows error, or redirects. */
postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"), $('#login_button').click(function() {
"url":document.URL, var submit_data={};
"message":$("#feedback_message").attr("value")}, $.each($("[id^=li_]"), function(index,value){
function(data){ submit_data[value.name]=value.value;
$("#feedback_subject").attr("value","");
$("#feedback_message").attr("value","");
$("#feedback_div").html("Feedback submitted. Thank you");
});
}); });
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");
}
}
);
}); });
// Calculator $('#pwd_reset_button').click(function() {
$(function() { $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
$("#calculator_button").click(function(){ "email" : $('#id_email').val()}, function(data){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")}, $('#pwd_reset').html(data);
function(data){
$("#calculator_output").attr("value",data.result);
});
}); });
}); });
});
</script> </script>
</body> </body>
......
mitx_global.html
<%inherit file="marketing.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="index-content">
<section class="about"> <section class="about">
<h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1> <h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>
...@@ -49,25 +36,10 @@ ...@@ -49,25 +36,10 @@
<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> <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> </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> </section>
<script> <script>
$(function() { $(function() {
/* Set up FancyBox pop-ups */
// TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
...@@ -95,34 +67,6 @@ $(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 */ /* Activate stupid spinner drop-downs in enrollment form */
var spinner_array=$("[id^=spinner_]"); var spinner_array=$("[id^=spinner_]");
spinner_array.each(function(i) { spinner_array.each(function(i) {
......
privacy.html
<%inherit file="marketing.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"> <section class="privacy-policy">
<div> <div>
<h1> Privacy Policy </h1> <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 { form#wiki_revision {
float: left;
width: flex-grid(7, 9);
margin-right: flex-gutter(9);
label { label {
display: block; display: block;
margin-bottom: 7px ; margin-bottom: 7px ;
} }
textarea { textarea {
@include box-sizing(border-box); @include box-sizing(border-box);
margin-bottom: 20px; margin-bottom: 20px;
min-height: 300px; min-height: 450px;
width: 100%; width: 100%;
} }
input[type="text"] { input[type="text"] {
display: block;
width: 50%; width: 50%;
} }
#submit_delete {
float: right;
}
input[type="submit"] { input[type="submit"] {
display: block;
margin-top: 20px; 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;
}
}
simplewiki_create.html
...@@ -16,4 +16,7 @@ Create article ...@@ -16,4 +16,7 @@ Create article
<input type="submit" value="Create article" /></td> <input type="submit" value="Create article" /></td>
</form> </form>
<%include file="simplewiki_instructions.html"/>
</%block> </%block>
simplewiki_edit.html
...@@ -11,10 +11,11 @@ ${ wiki_article.title } ...@@ -11,10 +11,11 @@ ${ wiki_article.title }
<div style="display:none"> <div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/> <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div> </div>
${wiki_form} ${wiki_form}
<input type="submit" id="submit_edit" name="edit" value="Edit article" />
<input type="submit" name="edit" value="Edit article" /> <input type="submit" id="submit_delete" name="delete" value="Delete article" />
<input type="submit" name="delete" value="Delete article" />
</form> </form>
<%include file="simplewiki_instructions.html"/>
</%block> </%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" /> <%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"> <section class="tos">
<div> <div>
<h1>MITx Terms of Service</h1> <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