Commit 07f328f6 by Bridger Maxwell

merge

parents 7200ca0d 25cb4673
No preview for this file type
<%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>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Licensing Information </h1>
<table><tr><td> Videos and Ungraded Exercises </td> <td> <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />The videos on this page are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Graded Exercises</td><td>Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Textbook</td><td>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </td></tr>
<tr><td>Student-generated content</td><td>Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT. </td></tr>
<tr><td>Source Code</td><td>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </td></tr>
</table>
<p>MIT and MITx are trademarks of the Massachusetts Instititute of
Technology, and may not be used without permission.
</section>
<%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>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Honor Code </h1>
<ul>
<li> I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
<l1> I agree to never post answers to problems.
<li> I agree to maintain only one account.
</ul>
</section>
......@@ -6,6 +6,7 @@
<link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
<link href="/static/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
<link href="/static/css/print.css" rel="stylesheet" type="text/css" media="print"/>
<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>
......@@ -13,6 +14,7 @@
<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" src="/static/js/cktsim.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>
......
<!DOCTYPE html>
<html>
<head>
<%block name="title"><title>MITX 6.002</title></%block>
<link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
<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//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>
$(function() {
// Set up FancyBox pop-ups
$("a.modal").fancybox({
'hideOnContentClick': false
});
});
</script>
<%block name="headextra"/>
</head>
<body>
${self.body()}
<%block name="bodyextra"/>
<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>
<ul>
<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>
<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");
});
});
});
// Calculator
$(function() {
$("#calculator_button").click(function(){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){
$("#calculator_output").attr("value",data.result);
});
});
});
</script>
</body>
</html>
<%inherit file="main.html" />
<%inherit file="marketing.html" />
<header class="announcement">
<header class="announcement home">
<div class="anouncement-wrapper">
<nav>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>An MIT Education Anywhere. <br />For free.</h1>
<p>MITx is an open learning software available free of cost, so that others &mdash; whether other universities or different educational institutions, such as K&ndash;12 school systems &mdash; can leverage the same software for their online education offerings.</p>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<section class="about">
<h1>About MITx</h1>
<p>MITx is a portfolio of MIT courses through an online interactive learning platform that:</p>
<h1>MITx is MIT&rsquo;s online learning initiative.</h1>
<section class="intro">
<p>This learning platform will enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences. It will also be host to a virtual community of learners around the world.</p>
<p>The first course offered by MITx in an experimental prototype form is 6.002x Circuits and Electronics. Watch this space for the next set of courses that will become available in Fall 2012.</p>
</section>
<ul>
<li>organizes and presents course material to enable students to learn at their own pace</li>
<li>features interactivity, online laboratories and student-to-student communication</li>
<li>allows for the individual assessment of any student&rsquo;s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by MITx</li>
<li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions.</li>
</ul>
<section class="features">
<h2>It will offer a portfolio of MIT courses for free on an online learning platform that:</h2>
<p>This learning platform will enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences. It will also be host to a virtual community learners around the world.</p>
<ul>
<li>organizes and presents course material to enable students to learn at their own pace</li>
<li>features interactivity, online laboratories and student-to-student communication</li>
<li>allows for the individual assessment of any student&rsquo;s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by MITx</li>
<li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions.</li>
</ul>
<p><strong>Press &amp; links:</strong> <a href="http://www.boston.com/news/local/massachusetts/articles/2011/12/19/mit_to_launch_online_only_graded_courses_free_to_all/?page=full" target="_blank">Boston Globe</a>, <a href="http://www.nytimes.com/2011/12/19/education/mit-expands-free-online-courses-offering-certificates.html?_r=3&hpw=" target="_blank">New York Times</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html" target="_blank">MIT Press Release</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219" target="_blank">MITx FAQ</a></p>
</section>
</section>
<section>
<h1>Course offering</h1>
<h2>6.002 Circuits and Electronics</h2>
<p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, "6.002 Circuits and Electronics" is an on-line adaption of MIT's first undergraduate analog design course. This course will run, free of charge, for students worldwide from February 1, 2012 through July 1, 2012.</p>
<section class="course">
<hgroup>
<h1>Spring 2012 Course offering</h1>
<h2>Circuits and Electronics</h2>
<h3>6.002x</h3>
</hgroup>
<p>
<a href="/" class="more-info">More information about Circuits and Electronics</a>
<a href="/" class="more-info">More information <span>&amp;</span> Enroll</a>
</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 MITx.</p>
</section>
<div style="display:none">
......@@ -52,7 +64,8 @@
</section>
<script>
<script>
$(function() {
/* Set up FancyBox pop-ups */
......@@ -122,5 +135,4 @@ $(function() {
/*$("sregion"+$("[id^=spinner_]")[1].id.substring(7)) */
});
</script>
<%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>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Privacy Policy </h1>
</section>
// Functions
//---------------------------------------- //
// Flexible grid
@function flex-grid($columns, $container-columns: $fg-max-columns) {
$width: $columns * $fg-column + ($columns - 1) * $fg-gutter;
$container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
@return percentage($width / $container-width);
}
// Flexible grid gutter
@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) {
$container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
@return percentage($gutter / $container-width);
}
// Line-height
@function lh($amount: 1) {
@return $lh * $amount;
}
// Variables
//---------------------------------------- //
// // grid
$fg-column: 60px;
$fg-gutter: 25px;
$fg-max-columns: 12;
$fg-max-width: 1400px;
$fg-min-width: 810px;
$gw-column: 60px;
$gw-gutter: 25px;
$body-font-family: Georgia, serif;
$header-font-family: "Open Sans", Helvetica, Arial, sans-serif;
// @media screen and (min-width: 940px) {
$body-font-size: 16px;
// }
// @media screen and (max-width: 939px) {
// $body-font-size: 14px;
// }
$lh: golden-ratio($body-font-size, 1);
$mit-red: #990000;
......@@ -12,7 +12,6 @@
@import "textbook";
@import "profile";
@import "wiki-create", "wiki";
@import "index";
@import "activation";
// left over
......
@import "bourbon/bourbon";
@import "reset";
// pages
@import "index-functions", "index-variables", "index";
@import "fancybox";
<span>
<input type="hidden" class="schematic" height="${height}" width="${width}" name="input_${id}" id="input_${id}" value="" />
<div id="hidden_${id}" style="display:none">
${value}
</div>
<input type="hidden" class="schematic" height="${height}" width="${width}" parts="${parts}" analyses="${analyses}" name="input_${id}" id="input_${id}" value="" initial_value=""/>
<div id="value_${id}" style="display:none">${value}</div>
<div id="initial_value_${id}" style="display:none">${initial_value}</div>
<script>
$("#input_${id}").attr("value",$("#hidden_${id}").text())
$("#input_${id}").attr("value",$("#value_${id}").text());
$("#input_${id}").attr("initial_value",$("#initial_value_${id}").text());
</script>
<span id="answer_${id}"></span>
% if state == 'unsubmitted':
......
......@@ -30,6 +30,10 @@ var ${ id }loc = -1;
function ${ id }goto(i) {
log_event("seq_goto", {'old':${id}loc, 'new':i,'id':'${id}'});
postJSON('/modx/sequential/${ id }/goto_position',
{'position' : i });
if (${ id }loc!=-1)
${ id }destroy_functions[ ${ id }loc ]();
$('#seq_content').html(${ id }contents[i]);
......@@ -72,5 +76,5 @@ $(function() {
}
$('#${ id }next').click(function(eo) { ${ id }next();});
$('#${ id }prev').click(function(eo) { ${ id }prev();});
${ id }goto(1);
${ id }goto( ${ position } );
});
<%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>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Terms of Service </h1>
<table><tr><td> Videos and Ungraded Exercises </td> <td> <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />The videos on this page are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Graded Exercises</td><td>Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Textbook</td><td>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </td></tr>
<tr><td>Student-generated content</td><td>Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT. </td></tr>
<tr><td>Source Code</td><td>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </td></tr>
</table>
<p>MIT and MITx are trademarks of the Massachusetts Instititute of
Technology, and may not be used without permission.
</section>
......@@ -30,7 +30,7 @@ function good() {
ajax_video=good;
loadNewVideo(streams["1.0"], ${ video_time });
loadNewVideo(streams["1.0"], ${ position });
function add_speed(key, stream) {
var id = 'speed_' + stream;
......
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