Skip to content

E
edx-platform
Commit 4bf5e4e1 by Reda Lemeden
Options

Merge with head

parents 0e3c4871 9f21488a
Showing with 67 additions and 61 deletions
.DS_Store
No preview for this file type
index.html
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<section> <section>
<h1>Circuits &amp; Electronics</h1> <h1>Circuits &amp; Electronics</h1>
<h2>6.002x</h2> <h2>6.002x</h2>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002 Circuits <span>&amp;</span> Electronics</a> <a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x Circuits <span>&amp;</span> Electronics</a>
</section> </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> <p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012.</p>
</section> </section>
</%block> </%block>
<%block name="header_class">course</%block> <%block name="header_class">course</%block>
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
<section class="about-info"> <section class="about-info">
<h1>About 6.002x</h1> <h1>About 6.002x</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>6.002x (Circuits and Electronics) 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 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. You should expect to spend approximately 10 hours per week on the course.</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> --> <!-- <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>
...@@ -28,21 +28,21 @@ ...@@ -28,21 +28,21 @@
<section class="on-mitx"> <section class="on-mitx">
<h1>6.002x 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 --> <h1>6.002x 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 -->
<p>Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.</p> <p>If you successfully complete the course, you will receive an electronic certificate of accomplishment from <em>MITx</em>. This certificate will indicate that you earned it from <em>MITx&rsquo;s</em> pilot course. In this prototype version, <em>MITx</em> will not require that you be tested in a testing center or otherwise have your identity certified in order to receive this certificate.</p>
<p> The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant sections will be provided electronically as part of the on-line course. The book can be purchased on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim" target="_blank">Amazon</a>. Copyright for the book is with Elsevier and the book cannot be printed etc.</p> <p>The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim" target="_blank">Amazon</a>.</p>
</section> </section>
<section class="requirements"> <section class="requirements">
<h1> Requirements </h1> <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>In order to succeed in this course, you must have taken an AP level physics course in electricity and magnetism. You 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 those who need it.</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> <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> </section>
<section class="cta"> <section class="cta">
<a class="enroll" rel="leanModal" href="#enroll">Enroll in Circuits &amp; Electronics</a> <a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x Circuits &amp; Electronics</a>
</section> </section>
</section> </section>
...@@ -54,43 +54,20 @@ ...@@ -54,43 +54,20 @@
<li> <li>
<img src="/static/staff/agarwal-mit-news-small.jpg"> <img src="/static/staff/agarwal-mit-news-small.jpg">
<h2>Anant Agarwal</h2> <h2>Anant Agarwal</h2>
<p>The Director of MIT's Computer Science and Artificial Intelligence Laboratory. His research focus is in parallel computer architectures, and he is the founder of several successful startups. Most recently, he founded Tilera, which produces scalable multicore embedded processors. He co-author the course textbook "Foundations of Analog and Digital Electronic Circuits."</p></li> <p>Director of MIT&rsquo;s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including Tilera, a company that produces scalable multicore processors. Prof. Agarwal won MIT&rsquo;s Smullin and Jamieson prizes for teaching and co-authored the course textbook &ldquo;Foundations of Analog and Digital Electronic Circuits.&rdquo;</p></li>
<li>
<img src="/static/staff/cjt-small.jpg">
<h2>Chris Terman</h2>
<p>The Co-Director MIT CSAIL, and a highly regarded instructor. He is the author of JSim, an educational package for on-line circuit schematic entry and simulation, and XTutor, and on-line question-and-answer tutoring system.</p></li>
<li> <li>
<img src="/static/staff/gjs-small.jpg"> <img src="/static/staff/gjs-small.jpg">
<h2>Gerald Sussman</h2> <h2>Gerald Sussman</h2>
<p>A Professor of Electrical Engineering at MIT. He is a well know educator in the computer science community, perhaps best know as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textboooks in computer science, or as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.</p></li> <p>Professor of Electrical Engineering at MIT. He is a well known educator in the computer science community, perhaps best known as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textbooks in computer science, and as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.</p></li>
<li> <li>
<img src="/static/staff/pmitros-small.jpg"> <img src="/static/staff/pmitros-small.jpg">
<h2>Piotr Mitros</h2> <h2>Piotr Mitros</h2>
<p>A Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Piotr has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.</p></li> <p>Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Dr. Mitros has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.</p></li>
</ul> </ul>
</section> </section>
<!-- <div class="secondary"> -->
<!-- <section class="credits"> -->
<!-- <h1> Credits </h1> -->
<!-- <p> The codebase was made possible by Django, JQuery, JQueryUI, -->
<!-- MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the -->
<!-- original FancyBox. Graphic design and css started from a free template -->
<!-- from <a href="http://www.dotemplate.com/">dotemplate.com</a>, one of -->
<!-- the few, genuinely free template web sites (although you have to -->
<!-- e-mail the owner to find that out), and was heavily modified by Piotr -->
<!-- Mitros, and later, thoughtbot.</p> -->
<!-- <p> The system is running in the Amazon cloud, which allows us to hold up to anticipated loads. </p> -->
<!-- </section> -->
<!-- </div> -->
</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>
......
marketing.html
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /--> <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
<!--[if lt IE 8]>
<link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
<![endif]-->
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
...@@ -72,8 +75,8 @@ function postJSON(url, data, callback) { ...@@ -72,8 +75,8 @@ function postJSON(url, data, callback) {
<%block name="header_text"> <%block name="header_text">
<section> <section>
<h1>MITx</h1> <h1><em>MITx</em></h1>
<h2>An MIT Education Anywhere. For free.</h2> <h2>MIT&rsquo;s new online learning initiative</h2>
</section> </section>
</%block> </%block>
</div> </div>
......
mitx_global.html
...@@ -4,21 +4,20 @@ ...@@ -4,21 +4,20 @@
<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>
<section class="intro"> <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><em>MITx</em> will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.</p>
<p>The first course offered by <em>MITx</em> 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> <p>The first <em>MITx</em> course, 6.002x (Circuits and Electronics), will be launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.</p>
</section> </section>
<section class="features"> <section class="features">
<h2>It will offer a portfolio of MIT courses for free on an online learning platform that:</h2> <h2><em>MIT<span>x</span></em> courses will be offered on an online learning platform that:</h2>
<ul> <ul>
<li>organizes and presents course material to enable students to learn at their own pace</li> <li>organizes and presents course material to enable students to learn worldwide</li>
<li>features interactivity, online laboratories and student-to-student communication</li> <li>features interactive instruction, online laboratories and student-to-student and student-to-professor 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 <em>MITx</em></li> <li>allows for the individual assessment of any student&rsquo;s work and allows students who demonstrate their mastery of subjects to earn certificates awarded by <em>MITx</em></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> <li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions, such as universities and K-12 school systems.</li>
</ul> </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"><em>MITx</em> FAQ</a></p> <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"><em>MITx</em> FAQ</a></p>
...@@ -36,7 +35,7 @@ ...@@ -36,7 +35,7 @@
<a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll</a> <a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll</a>
</p> </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> <p>Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT&rsquo;s first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 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>
</section> </section>
<script> <script>
......
sass/_courseware-video.scss
...@@ -62,7 +62,7 @@ section.course-content { ...@@ -62,7 +62,7 @@ section.course-content {
background: #c2c2c2; background: #c2c2c2;
border: none; border: none;
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
height: 22px; height: 20px;
a.ui-slider-handle { a.ui-slider-handle {
@include border-radius(0); @include border-radius(0);
...@@ -71,10 +71,10 @@ section.course-content { ...@@ -71,10 +71,10 @@ section.course-content {
border-right: 1px solid darken($mit-red, 20%); border-right: 1px solid darken($mit-red, 20%);
border-left: 1px solid darken($mit-red, 20%); border-left: 1px solid darken($mit-red, 20%);
cursor: pointer; cursor: pointer;
height: 22px; height: 20px;
margin: 0; margin: 0;
top: 0; top: 0;
width: 22px; width: 20px;
} }
} }
...@@ -146,6 +146,7 @@ section.course-content { ...@@ -146,6 +146,7 @@ section.course-content {
ol.subtitles { ol.subtitles {
float: left; float: left;
width: flex-grid(3, 9); width: flex-grid(3, 9);
min-height: 570px;
li { li {
margin-bottom: 0px; margin-bottom: 0px;
......
sass/_index.scss
...@@ -247,6 +247,10 @@ section.index-content { ...@@ -247,6 +247,10 @@ section.index-content {
letter-spacing: 1px; letter-spacing: 1px;
color: #666; color: #666;
margin-bottom: lh(); margin-bottom: lh();
span {
text-transform: none;
}
} }
p { p {
...@@ -354,7 +358,7 @@ section.index-content { ...@@ -354,7 +358,7 @@ section.index-content {
&.requirements { &.requirements {
clear: both; clear: both;
width: auto; width: 100%;
border-top: 1px solid #E5E5E5; border-top: 1px solid #E5E5E5;
padding-top: lh(); padding-top: lh();
margin-bottom: 0; margin-bottom: 0;
......
sass/_wiki-create.scss
...@@ -21,7 +21,13 @@ form#wiki_revision { ...@@ -21,7 +21,13 @@ form#wiki_revision {
} }
#submit_delete { #submit_delete {
@include box-shadow(none);
background: none;
border: none;
color: #999;
float: right; float: right;
text-decoration: underline;
font-weight: normal;
} }
input[type="submit"] { input[type="submit"] {
...@@ -32,18 +38,25 @@ form#wiki_revision { ...@@ -32,18 +38,25 @@ form#wiki_revision {
#wiki_edit_instructions { #wiki_edit_instructions {
float: left; float: left;
width: flex-grid(3, 9); width: flex-grid(3, 9);
margin-top: lh();
color: #666;
&:hover {
color: #333;
}
.markdown-example { .markdown-example {
background-color: $light-gray; background-color: #e3e3e3;
padding-top: 5px; text-shadow: 0 1px 0 #fff;
padding-right: 2px;
padding-bottom: 5px; padding: {
padding-left: 5px; top: 5px;
right: 2px;
margin-top: 5px; bottom: 5px;
margin-bottom: 7px; left: 5px;
margin-left: 5px; }
margin: 5px 0 7px;
line-height: 1.0; line-height: 1.0;
} }
} }
sass/marketing-ie.scss 0 → 100644
body {
margin: 0;
padding: 0;
}
.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
margin: 0;
overflow: hidden;
}
simplewiki_edit.html
...@@ -12,7 +12,7 @@ ${ wiki_article.title } ...@@ -12,7 +12,7 @@ ${ wiki_article.title }
<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" id="submit_edit" name="edit" value="Save Changes" />
<input type="submit" id="submit_delete" name="delete" value="Delete article" /> <input type="submit" id="submit_delete" name="delete" value="Delete article" />
</form> </form>
......
video.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<li><a class="pause" onclick="pause();">Pause</a></li> <li><a class="pause" onclick="pause();">Pause</a></li>
</ul> </ul>
<div id="vidtime">0:00 / 0:00</div> <div id="vidtime">0:00/0:00</div>
<div class="speeds"> <div class="speeds">
Speed: <div id="video_speeds"></div> Speed: <div id="video_speeds"></div>
......
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