Skip to content

E
edx-platform
Commit 13482e2f by Piotr Mitros
Options

Merge

parents a6ca113a 7c12d9c2
Showing with 219 additions and 407 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" />
<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>
<%block name="header_text">
<section class="course">
<section>
<h1>Circuits &amp; Electronics</h1>
......@@ -15,10 +9,8 @@
</section>
<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>
<%block name="header_class">course</%block>
<section class="index-content">
<section class="about-course">
......@@ -102,14 +94,9 @@
</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>
$(function() {
/* Set up FancyBox pop-ups */
// TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
......@@ -137,34 +124,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
......@@ -21,9 +21,6 @@
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- 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/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {inlineMath: [["\\(","\\)"]],
......@@ -48,7 +45,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>
......
marketing.html
......@@ -9,9 +9,6 @@
<script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
<!-- 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//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
......@@ -29,6 +26,24 @@
</head>
<body>
<%block name="header">
<header class="announcement <%block name="header_class"/>">
<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 +51,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;
});
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
$(function() {
$("#calculator_button").click(function(){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){
$("#calculator_output").attr("value",data.result);
});
$('#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>
<%block name="header_class">home</%block>
<section class="index-content">
<section class="about">
......@@ -49,25 +38,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>
</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
......@@ -95,34 +69,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/_askbot-original.scss
......@@ -417,17 +417,17 @@ body.anon #searchBar {
padding-left: 0px; }
.contributorback {
background: #eceeeb url(../images/contributorsback.png) no-repeat center left; }
label {
color: #707070;
font-size: 15px;
display: block;
float: right;
text-align: left;
font-family: 'Yanone Kaffeesatz',sans-serif;
width: 80px;
margin-right: 18px; }
#displayTagFilterControl label {
width: 160px; }
// label {
// color: #707070;
// font-size: 15px;
// display: block;
// float: right;
// text-align: left;
// font-family: 'Yanone Kaffeesatz',sans-serif;
// width: 80px;
// margin-right: 18px; }
// #displayTagFilterControl label {
// width: 160px; }
ul {
margin-left: 22px; }
li {
......@@ -640,15 +640,15 @@ body.anon #searchBar {
// &:hover {
// color: #F4A731 !important; } }
#questionCount {
font-weight: bold;
font-size: 23px;
color: #7ea9b3;
width: 200px;
float: left;
margin-bottom: 8px;
padding-top: 6px;
font-family: 'Yanone Kaffeesatz',sans-serif; }
// #questionCount {
// font-weight: bold;
// font-size: 23px;
// color: #7ea9b3;
// width: 200px;
// float: left;
// margin-bottom: 8px;
// padding-top: 6px;
// font-family: 'Yanone Kaffeesatz',sans-serif; }
#listSearchTags {
float: left;
......@@ -773,14 +773,14 @@ ul#searchTags {
background: #eab243;
color: yellow; } }
.evenMore {
font-size: 13px;
color: #707070;
padding: 15px 0px 10px 0px;
clear: both;
a {
text-decoration: underline;
color: #1b79bd; } }
// .evenMore {
// font-size: 13px;
// color: #707070;
// padding: 15px 0px 10px 0px;
// clear: both;
// a {
// text-decoration: underline;
// color: #1b79bd; } }
.pager {
margin-top: 10px;
......@@ -2679,29 +2679,29 @@ pre.prettyprint {
padding: 3px;
border: 0px solid #888; }
@media print {
.str {
color: #060; }
.kwd {
color: #006;
font-weight: bold; }
.com {
color: #600;
font-style: italic; }
.typ {
color: #404;
font-weight: bold; }
.lit {
color: #044; }
.pun {
color: #440; }
.pln {
color: #000; }
.tag {
color: #006;
font-weight: bold; }
.atn {
color: #404; }
.atv {
color: #060; } }
// @media print {
// .str {
// color: #060; }
// .kwd {
// color: #006;
// font-weight: bold; }
// .com {
// color: #600;
// font-style: italic; }
// .typ {
// color: #404;
// font-weight: bold; }
// .lit {
// color: #044; }
// .pun {
// color: #440; }
// .pln {
// color: #000; }
// .tag {
// color: #006;
// font-weight: bold; }
// .atn {
// color: #404; }
// .atv {
// color: #060; } }
sass/_discussion.scss
......@@ -18,7 +18,7 @@ body.askbot {
&.question-filter {
font-size:16px;
margin-top: 4px;
width: grid-width(4);
width: flex-grid(4);
ul {
@include border-radius(35px);
......@@ -52,26 +52,30 @@ body.askbot {
&.search-box {
margin-left:2%;
text-align:right;
width: grid-width(8);
width: flex-grid(8);
input[type="text"] {
margin-right: 6px;
width: flex-grid(2,8);
}
}
}
}
}
.main-content {
.discussion-wrapper {
display: table;
width: 100%;
section.main-content {
div.discussion-wrapper {
@extend .table-wrapper;
.discussion-content {
div.discussion-content {
@include box-sizing(border-box);
display: table-cell;
padding: $gw-gutter;
vertical-align: top;
width: grid-width(9);
width: flex-grid(9);
.order-sort {
div.order-sort {
@include border-radius(35px);
background-color: lighten(#F6EFD4, 5%) ;
height: 30px;
......@@ -95,12 +99,38 @@ body.askbot {
}
}
}
p.tabula-rasa {
@include border-radius(5px);
background-color: #f6f6f6;
color: #888;
margin: 10px auto;
padding: 20px;
text-align: center;
width: flex-grid(5);
&:first-child {
margin-top: 70px;
}
&:last-child {
margin-bottom: 70px;
}
a {
text-decoration: none;
color: #888;
font-weight: bold;
}
}
}
aside {
@extend .sidebar;
width: grid-width(3);
@include box-shadow(inset 1px 0 0 #f6f6f6);
border-left: 1px solid #d3d3d3;
border-right: 1px solid #f6f6f6;
padding: $gw-gutter;
width: flex-grid(3);
h2 {
font-size: 16px;
......@@ -112,7 +142,7 @@ body.askbot {
}
input[type="text"] {
width: 68%;
width: 76%;
}
#displayTagFilterControl {
......@@ -126,7 +156,7 @@ body.askbot {
margin: 0 auto;
padding: 0;
.footer-wrapper {
div.footer-wrapper {
@extend .clearfix;
@extend .wrapper;
@include box-shadow(0 1px 0 #fff);
......
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
......@@ -129,5 +129,11 @@ div.wiki-wrapper {
p {
line-height: 1.6em;
}
#wiki_history_table {
tr.dark {
background-color: $light-gray;
}
}
}
}
\ No newline at end of file
sass/application.scss
......@@ -14,7 +14,7 @@
@import "wiki-create", "wiki";
@import "activation";
@import "help";
@import "discussion", "askbot-original";
@import "discussion", "discussion-questions", "askbot-original";
// left over
@import "theme";
......
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
......@@ -11,10 +11,11 @@ ${ wiki_article.title }
<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_history.html
......@@ -60,10 +60,10 @@ ${ wiki_article.title }
<tr>
<td colspan="4">
%if wiki_prev_page:
<a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_prev_page])}">trans "Previous page"</a>
<a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_prev_page])}">Previous page</a>
%endif
%if wiki_next_page:
<a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_next_page])}">"Next page"</a>
<a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_next_page])}">Next page</a>
%endif
</td>
</tr>
......
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