Skip to content

E
edx-platform
Commit 3ee53f68 by Kyle Fiedler
Options

Merged with default 

--HG--
branch : close_sidebar
parents 75f0872e 1b9f3c1f
Showing with 855 additions and 105 deletions
6002x-faq.html 0 → 100644
<%inherit file="marketing.html" />
<%block name="login_area">
</%block>
<section class="subpage">
<div>
<h1>
More about 6.002x
</h1>
<h2> Answering common questions about the first course on <i>MITx</i>, the
Institute&rsquo;s online-learning initiative.</h2>
<p>
This set of questions and answers accompanies MIT&rsquo;s February 13,
2012, announcement regarding <i>MITx</i>&rsquo;s prototype course &mdash;
6.002x: Circuits and Electronics.
</p>
<h2>
What is <i>MITx</i>?</h2>
<p> MIT seeks through the development of <i>MITx</i> to improve
education both on the MIT campus and around the world.
<p> On campus, <i>MITx</i> will be coupled with an Institute-wide research
initiative on online teaching and learning. The online learning tools
that <i>MITx</i> develops will benefit the educational experience of
residential students by supplementing and reinforcing the classroom
and laboratory experiences.</p>
<p>
Beyond the MIT campus, <i>MITx</i> will endeavor to break down barriers to
education in two ways. First, it will offer the online teaching of MIT
courses to people around the world and the opportunity for able
learners to gain certification of mastery of MIT material. Second, it
will make freely available to educational institutions everywhere the
open-source software infrastructure on which <i>MITx</i> courses are based.
</p>
<p>
Since it launched OpenCourseWare 10 years ago, MIT has been committed
to using technology to improve and greatly widen access to
education. The launch of <i>MITx</i> represents a next step forward in that
effort.
</p>
<h2>
What is 6.002x, and how is it different from the on-campus version of
6.002?
</h2>
<p>
At MIT, each course is assigned a number. All courses in the
Department of Electrical Engineering and Computer Science (EECS) start
with the number 6, and 6.002 (also known as Circuits and Electronics)
is one of the introductory courses for EECS
undergraduates. <i>MITx</i>&rsquo;s 6.002x is modeled on the on-campus
version of 6.002.
</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.
</p>
<p>
6.002x is built on the content created collaboratively by MIT
professors Anant Agarwal and Jeffrey H. Lang for 6.002.
</p>
<h2>
How do I enroll in 6.002x?
</h2>
<p>
To enroll, visit <a href="http://mitx.mit.edu">http://mitx.mit.edu</a>
and sign up.
</p>
<h2>
When will the course be available online?
</h2>
<p>
6.002x will become available online on Monday, March 5.
</p>
<h2>
Do I need to follow a set timeline in completing 6.002x?
</h2>
<p>
In this pilot course of <i>MITx</i>, learners seeking a certificate will have
weekly deadlines for homework and labs. Similarly, the midterm and
final exam will be given within a specific range of days. However,
faster-paced learners can proceed multiple weeks ahead if they choose.
</p>
<h2>
How much time is required to complete the course?
</h2>
<p>
Students should expect to spend approximately 10 hours per week on the
course. However, the time taken by individual students might vary
considerably depending on background and skill.
</p>
<h2>
Who are the instructors for 6.002x?
</h2>
<p>
There are four instructors for 6.002x: Anant Agarwal, Chris Terman,
Gerald Sussman and Piotr Mitros. The team also includes several
teaching assistants (TAs).
</p>
<h2>
What is the work like in 6.002x?
</h2>
<p>
Students taking 6.002x will have weekly video lectures, readings from
the textbook, practice exercises and homework; design and laboratory
exercises are also significant components of the course. The course
will also provide additional tutorial material. There will be a
midterm and a final exam. An interactive laboratory playground will
also be made available for students to experiment creatively.
</p>
<p>
In general, for any given week, learners are expected to work through
a couple of lecture sequences containing a few videos (each 5 to 10
minutes in length) and a few interactive practice exercises. Learners
can also read appropriate parts of the textbook linked to the
videos. Lab and homework exercises will round out the week. Tutorials
are also provided as additional reference material.
</p>
<h2>
What if I have a question during the course?
</h2>
<p>
The course will include a discussion forum for learners to ask
questions, to post answers, and for discussions. Several helpful
documents, FAQs, tutorials and videos on using the various components
of the course will also be provided.
</p>
<h2>
Will 6.002x offer any means for collaboration among online learners?
</h2>
<p>
Yes. 6.002x will offer modest support for collaborative work through a
prototype wiki and discussion forum.
</p>
<h2>
Are there prerequisites to take the course?
</h2>
<p>
While <i>MITx</i> courses are open to all, there are some skills required to
succeed in taking the course.
</p>
<p>
In 6.002x, students are encouraged to have the knowledge obtained from
a college-level physics course in electricity and
magnetism (or from an advanced secondary-education course in electricity and magnetism, as with an Advanced Placement course in the United States). Students must know basic calculus and linear algebra, and
have some basic background in differential equations.
</p>
<p>
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>
<h2>
How much does the course cost?
</h2>
<p>
All of the courses on <i>MITx</i> will be free of charge. Those who have the
ability and motivation to demonstrate mastery of content can receive a
credential for a modest fee. For this prototype course, the fee for a
credential will be waived.
</p>
<h2>
What is a credential?
</h2>
<p>
Any learner who successfully completes 6.002x will receive an
electronic certificate indicating a grade. This certificate will
indicate that you earned it from <i>MITx</i>&rsquo;s pilot course. In this
prototype version, <i>MITx</i> will not require that you be tested in a
testing center or otherwise have your identity certified in order to
receive this certificate.
</p>
<h2>
Who is grading the course?
</h2>
<p>
<i>MITx</i> courses will use automated technologies to check student work
including practice exercises, homework assignments, labs and exams.
</p>
<h2>
What is a passing grade?
</h2>
<p>
Grading schemes for each course will be announced with the
course. 6.002x will be graded on an absolute scale. The components
affecting a student&rsquo;s grade and the grade thresholds will be
posted on the course website when the course comes online.
</p>
<h2>
Do I need to buy a textbook?
</h2>
<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. Relevant sections will be
provided electronically as part of the online course. While the
textbook is recommended, it is not required. The electronic text is
provided for personal use in connection with this course only. The
copyright for the book is owned by Elsevier. The book can be purchased
on Amazon.
</p>
<h2>
Do I need to have special software to access 6.002x?
</h2>
<p>
No, you do not need special software to access 6.002x, as you will
access the online interactive course through your browser. The course
website was developed and tested primarily with Google Chrome. We
support current versions of Mozilla Firefox as well. The video player
is designed to work with Flash. While we provide a partial non-Flash
fallback for the video, as well as partial support for Internet
Explorer, other browsers and tablets, portions of the functionality
will be unavailable.
</p>
<h2>
When will the next courses become available and what topics will they be on?
</h2>
<p>
Additional courses will be announced
on <a href="http://mitx.mit.edu">mitx.mit.edu</a> as they become
available. We expect this will happen in fall 2012.
</p>
</div>
</section>
6002x-press-release.html 0 → 100644
<%inherit file="marketing.html" />
<%block name="login_area">
</%block>
<section class="subpage">
<div>
<h1> <i>MITx</i> prototype course opens for enrollment&mdash;Online-learning
initiative&rsquo;s first offering, &lsquo;6.002x: Circuits and
Electronics,&rsquo; accepting registrants now.</h1>
<p> MIT News Office</p>
<p> In December,
MIT <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html">announced </a>the
launch of an online learning initiative called &ldquo;<i>MITx</i>.&rdquo;
Starting this week, interested learners can now enroll for free in the
initiative&rdquo;s prototype course -- 6.002x: Circuits and
Electronics.</p>
<p>Students can sign up for the course
at <a href="http://mitx.mit.edu">mitx.mit.edu</a>. The course will
officially begin on March 5 and run through June 8.</p>
<p> Modeled after MIT&rsquo;s 6.002 &mdash; an introductory course for
undergraduate students in MIT&rsquo;s Department of Electrical
Engineering and Computer Science (EECS) &mdash; 6.002x will introduce
engineering in the context of the lumped circuit abstraction, helping
students make the transition from physics to the fields of electrical
engineering and computer science. It will be taught by Anant Agarwal,
EECS professor and director of MIT's Computer Science and
Artificial Intelligence Laboratory (CSAIL); Chris Terman, CSAIL
co-director; EECS Professor Gerald Sussman; and CSAIL Research
Scientist Piotr Mitros.</p>
<blockquote>
<p>
&ldquo;We are very excited to begin <i>MITx</i> with this prototype
class,&rdquo; says MIT Provost L. Rafael Reif. &ldquo;We will use
this prototype course to optimize the tools we have built by
soliciting and acting on feedback from learners.&rdquo;
</p>
</blockquote>
<p>
To access the course, registered students will log in
at <a href="http://mitx.mit.edu">mitx.mit.edu</a>, where they will
find a course schedule, an e-textbook for the course, and a discussion
board. Each week, students will watch video lectures and
demonstrations, work with practice exercises, complete homework
assignments, and participate in an online interactive lab specifically
designed to replicate its real-world counterpart. Students will also
take exams and be able to check their grades as they progress in the
course. Overall, students can expect to spend approximately 10 hours
each week on the course.
</p>
<blockquote>
&ldquo;We invite you to join us for this pilot course of <i>MITx</i>,&rdquo;
Agarwal says. &ldquo;The 6.002x team of professors and teaching
assistants is excited to work with you on the discussion forum, and we
look forward to your feedback to improve the learning
experience.&rdquo;
</blockquote>
<p> <a href="http://mitx.mit.edu"> A video introduction to 6.002x can
be found here.</a></p>
<p> <a href="/6002x-faq.html"> A set of Frequently Asked Questions
about 6.002x can be found here.</a></p>
<p>
<a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219">
FAQs about <i>MITx</i> as a whole can be found here.
</a>
</p>
<p>
At the end of the prototype course, students who demonstrate their
mastery will be able to receive a certificate of completion for
free. In future <i>MITx</i> courses, students who complete the mastery
requirement on <i>MITx</i> will be able to receive the credential for a
modest fee.
</p>
<p>
Further courses are expected to become
available beginning in the fall.
</p>
<h3>
RELATED:
</h3>
<p>
<a href="/index.html">
6.002x course website
</a>
</p>
<p>
<a href="/6002x-faq.html">
6.002x FAQ
</a>
</p>
<h3>
ARCHIVE: &quot;MIT launches online learning initiative&quot;
</h3>
<a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html">
http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html
</a>
<h3>
<i>MITx</i> website
</h3>
<a href="http://mitx.mit.edu">
http://mitx.mit.edu
</a>
<!--h3>
TAGS:
</h3>
<p>
<i>MITx</i>; students; education, teaching, academics; innovation and
invention; faculty; mit administration; learning; electrical
engineering and computer science; csail
</p-->
</div>
</section>
activation_active.html
<%inherit file="marketing.html" />
<%inherit file="main.html" /> <section class="tos">
<div>
<section class="activation"> <section class="activation">
<h1>Account already active!</h1> <h1>Account already active!</h1>
<!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> --> <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
<p> This account has already been activated. We will notify you as <p> This account has already been activated. We will notify you as
soon as the course starts.</p> soon as the course starts.</p>
<p>For now you can go to the <a href="https://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
</div>
</section> </section>
activation_complete.html
<%inherit file="marketing.html" />
<%inherit file="main.html" /> <section class="tos">
<div>
<section class="activation">
<h1>Activation Complete!</h1> <h1>Activation Complete!</h1>
<!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> --> <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
<p>Thanks for activating your email. We will notify you as soon as the course starts.</p> <p>Thanks for activating your email. We will notify you as soon as the course starts.</p>
<p>For now you can go to the <a href="https://mitx.mit.edu/">MITx homepage</a> or the <a href="/">6.002x course page</a>.</p>
</div>
</section> </section>
activation_email.txt
Someone, hopefully you, signed up for an account for MIT's on-line Someone, hopefully you, signed up for an account for MITx's on-line
offering of 6.002 using this email address. If it was you, and you'd offering of 6.002 using this email address. If it was you, and you'd
like to activate and use your account, copy and paste this address like to activate and use your account, copy and paste this address
into your web browser's address bar: into your web browser's address bar:
......
activation_email_subject.txt
Your account for MIT's on-line 6.002 Your account for MITx's on-line 6.002
activation_invalid.html
<%inherit file="main.html" /> <%inherit file="marketing.html" />
<section class="activation">
<section class="tos">
<div>
<h1>Activation Invalid</h1> <h1>Activation Invalid</h1>
<p>Something went wrong. Check to make sure the URL you went to was <p>Something went wrong. Check to make sure the URL you went to was
correct -- e-mail programs will sometimes split it into two correct -- e-mail programs will sometimes split it into two
lines. If you still have issues, e-mail us to let us know what happened lines. If you still have issues, e-mail us to let us know what happened
at <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a>.</p> at <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a>.</p>
<p>Or you can go back to the <a href="/">6.002x course page</a>.</p>
</div>
</section> </section>
create_account.html
<!-- TODO: Add pattern field to username. See HTML5 cookbook, page 84 for details--> <!-- TODO: Add pattern field to username. See HTML5 cookbook, page 84 for details-->
<div name="enroll_form" id="enroll_form"> <div name="enroll_form" id="enroll_form">
<h1>Enroll in 6.002 Circuits &amp; Electronics</h1> <h1>Enroll in 6.002x Circuits &amp; Electronics</h1>
<form name="enroll" id="enroll_form" method="get"> <form name="enroll" id="enroll_form" method="get">
<fieldset><% if 'error' in locals(): e = error %> <fieldset><% if 'error' in locals(): e = error %>
...@@ -11,26 +11,26 @@ ...@@ -11,26 +11,26 @@
<li class="email"> <li class="email">
<label>E-mail*</label> <label>E-mail*</label>
<input name="email" id="ca_email" type="email" required /> <input name="email" id="ca_email" type="email" />
</li> </li>
<li class="password"> <li class="password">
<label>Password*</label> <label>Password*</label>
<input name="password" id="ca_password" type="password" required /> <input name="password" id="ca_password" type="password" />
</li> </li>
<li class="username"> <li class="username">
<label>Username (public)* <span class="ui-icon ui-icon-help" id="spinner_nick" style="display:inline-block;"></span></label> <label>Username (public)* <span class="ui-icon ui-icon-help" id="spinner_nick" style="display:inline-block;"></span></label>
<input name="username" id="ca_username" type="text" required /> <input name="username" id="ca_username" type="text" />
<div id="sregion_nick" class="tip">Nickname you'd like to use on forums.</div> <div id="sregion_nick" class="tip">Nickname you'd like to use on forums.</div>
</li> </li>
<li class="full-name"> <li class="full-name">
<label>Full name<span class="ui-icon ui-icon-help" id="spinner_name" style="display:inline-block;"></span></label> <label>Full name*<span class="ui-icon ui-icon-help" id="spinner_name" style="display:inline-block;"></span></label>
<input name="name" id="ca_name" type="text" /> <input name="name" id="ca_name" type="text" />
<div class="tip" id="sregion_name">If you would like us to give you a certificate of completion at the end, we need your full legal name, as you would like it to appear on the certificate (e.g. &quot;John Smith, Jr&quot;).</div> <div class="tip" id="sregion_name">If you successfully complete the course, you will receive an electronic certificate of accomplishment from <i>MITx</i> with this name on it.</div>
</li> </li>
<li class="location"> <li class="location">
...@@ -49,16 +49,17 @@ ...@@ -49,16 +49,17 @@
</li> </li>
<li class="terms"> <li class="terms">
<label> <input name="terms_of_service" id="cb_terms_of_service" type="checkbox" value="terms_of_service" required />I agree to the Terms of Service*</label> <label> <input name="terms_of_service" id="cb_terms_of_service" type="checkbox" value="terms_of_service" />I agree to the <a href="/t/tos.html">Terms of Service</a>*</label>
</li> </li>
<li class="honor-code"> <li class="honor-code">
<label> <label>
<input name="honor_code" id="cb_honor_code" type="checkbox" value="honor_code" required />I agree to the Honor code.*</label> <input name="honor_code" id="cb_honor_code" type="checkbox" value="honor_code" />I agree to the <a href="/t/honor.html">Honor Code</a>, summarized as:*</label>
<ul> <ul>
<li>Complete all mid-terms and final exams with only my own work.</li>
<li>Maintain only one account, and not share the username or password.</li>
<li>Not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.</li> <li>Not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.</li>
<li>Never post answers to problems.</li> <li>Not post answers to problems that are being used to assess student performance.</li>
<li>Maintain only one account.</li>
</ul> </ul>
</li> </li>
......
index.html
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
<h2>6.002x</h2> <h2>6.002x</h2>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x 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>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> <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 5, 2012 through June 8, 2012.</p>
</section> </section>
</%block> </%block>
<%block name="header_class">course</%block> <%block name="header_class">course</%block>
<section class="index-content"> <section class="index-content">
...@@ -101,7 +102,7 @@ $(function() { ...@@ -101,7 +102,7 @@ $(function() {
if(json.success) { if(json.success) {
$('#enroll').html(json.value); $('#enroll').html(json.value);
} else { } else {
$('#enroll_error').html(json.value); $('#enroll_error').html(json.value).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
} }
} }
); );
......
login.html
<!-- TODO: http://docs.jquery.com/Plugins/Validation --> <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
${ error }
<div id="login_div"> <div id="login_div">
<header>
<h1>Log in to MITx</h1> <h1>Log in to MITx</h1>
<p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p>
</header>
<form id="login_form" method="post"> <form id="login_form" method="post">
<div id="login_error"></div>
<ol> <ol>
<li> <li>
<label>E-mail*</label> <label>E-mail*</label>
......
main.html
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</head> </head>
<body> <body class="<%block name="bodyclass"/>">
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
...@@ -71,21 +71,24 @@ ...@@ -71,21 +71,24 @@
<div id="calculator_div" class="leanModal_box"> <div id="calculator_div" class="leanModal_box">
<form id="calculator"> <form id="calculator">
<input type="text" id="calculator_input"> <input type="text" id="calculator_input">
<input id="calculator_button" type="submit" value="=&gt;"> <input id="calculator_button" type="submit" value="=">
<input type="text" id="calculator_output" readonly> <input type="text" id="calculator_output" readonly>
</form> </form>
<table> <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr> <dl>
<tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr> <dt>Suffixes:</dt>
<tr><td align="right">Functions</td><td>&nbsp;:&nbsp;</td><td align="left"> sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </td></tr> <dd> %kMGTcmunp</dd>
<tr><td align="right">Constants</td><td>&nbsp;:&nbsp;</td><td align="left"> e</td></tr> <dt>Operations:</dt>
<!--p> Unsupported: ||, j </p <dd>^ * / + - ()</dd>
Students won't know what parallel means at this time. <dt>Functions:</dt>
Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. <dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
If you read the comments in the source, feel free to use them. If you run into a bug, please <dt>Constants</dt>
let us know. But we can't officially support them right now. <dd>e</dd>
-->
</table> <!-- Students won't know what parallel means at this time. Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now.
<dt>Unsupported:</dt> <dd>||, j </dd> -->
</dl>
</div> </div>
<script> <script>
......
marketing.html
...@@ -68,7 +68,9 @@ function postJSON(url, data, callback) { ...@@ -68,7 +68,9 @@ function postJSON(url, data, callback) {
<nav> <nav>
<h1><a href="http://mitx.mit.edu/">MITx</a></h1> <h1><a href="http://mitx.mit.edu/">MITx</a></h1>
% if settings.COURSEWARE_ENABLED: % if settings.COURSEWARE_ENABLED:
<%block name="login_area">
<a rel="leanModal" class="login" href="#login">Log In</a> <a rel="leanModal" class="login" href="#login">Log In</a>
</%block>
% endif % endif
</nav> </nav>
</%block> </%block>
...@@ -87,7 +89,6 @@ function postJSON(url, data, callback) { ...@@ -87,7 +89,6 @@ function postJSON(url, data, callback) {
<%block name="bodyextra"/> <%block name="bodyextra"/>
<footer> <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"> <div class="footer-wrapper">
<p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p> <p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
...@@ -95,6 +96,7 @@ function postJSON(url, data, callback) { ...@@ -95,6 +96,7 @@ function postJSON(url, data, callback) {
<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>
<li><a href="/t/mitx_help.html">Help</a></li>
</ul> </ul>
</div> </div>
</footer> </footer>
...@@ -122,8 +124,10 @@ $(document).ready(function(){ ...@@ -122,8 +124,10 @@ $(document).ready(function(){
function(json) { function(json) {
if(json.success) { if(json.success) {
location.href="/courseware"; location.href="/courseware";
} else if($('#login_error').length == 0) {
$('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
} else { } else {
$('#login_error').html("Invalid Login"); $('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
} }
} }
); );
...@@ -140,7 +144,7 @@ $(document).ready(function(){ ...@@ -140,7 +144,7 @@ $(document).ready(function(){
if (json.success) { if (json.success) {
$('#pwd_reset').html(json.value); $('#pwd_reset').html(json.value);
} else { } else {
$('#pwd_error').html(json.error); $('#pwd_error').html(json.error).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
} }
} }
); );
......
mitx-overview.html 0 → 100644
<%inherit file="marketing.html" />
<%block name="login_area">
</%block>
<section class="subpage">
<div>
<h1> <i>MITx</i> Advances MIT&rsquo;s Vision for Online Learning</h1>
<p> Education has entered an era of rapid, exciting,
technology-enabled change. At MIT, we welcome the opportunity to
harness the power of on-line technology for our students and for the
world. On December 19, 2011, we announced <i>MITx</i>, an initiative to
offer exciting, challenging and enriching courses to anyone,
anywhere, who has the motivation and ability to engage MIT&rsquo;s
educational content.</p>
<p> Ten years ago, MIT
launched <a href="http://ocw.mit.edu/index.htm">OpenCourseWare</a>,
which places online the course materials for substantially the entire
MIT curriculum, and was the genesis of today&rsquo;s worldwide
movement in free, open educational resources. <i>MITx</i> is the next step
in opening MIT&rsquo;s educational doors to the world. Through OCW and
<i>MITx</i>, MIT invites the world to join it in the passion, hard work and
thrill of learning and discovery.</p>
<h2><i>MITx</i> will e-publish interactive online courses that:</h2>
<ul>
<li>Empower students to learn at their own pace;</li>
<li>Offer online laboratories where students can experiment and apply their learning;</li>
<li>Connect students to each other in online discussion groups and wiki-based collaborative learning; </li>
<li>Challenge learners with MIT-rigor course materials; and</li>
<li>Assess individual student learning as the student progresses through the course.</li>
</ul>
<p> <i>MITx</i> students who demonstrate their mastery of a subject can earn
a certificate of completion awarded by <i>MITx</i>.</p>
<p> <i>MITx</i> courses will be available to the world through an Internet
platform that MIT will make freely available. MIT hopes that other
educational institutions, anywhere in the world, will adapt and use
the platform to publish their own educational content online for the
benefit of learners. Because the platform will be open-source and
scalable, adopters and users can continuously improve it, for the
benefit of everyone.</p>
<h2> Why Is MIT Creating <i>MITx</i>?</h2>
<p> Excellence in teaching and learning. MIT must always provide its
students the very best teaching and learning tools possible. MIT
began experimenting with online technologies in its educational
programs long before we launched OCW in 2001. We have only increased
our emphasis in recent years, as several MIT committees have studied
how MIT might enhance the learning experience of its students and
expand its impact worldwide through new online offerings.</p>
<p> These efforts, combined with those of numerous individual MIT
faculty members, confirmed MIT&rsquo;s conviction that digital
technologies enrich learning. Many other innovative institutions and
enterprises believe the same and are bringing creative online
offerings forward. Having brain-stormed, investigated and studied,
we were ready to act and eager to start. We announced our <i>MITx</i>
aspiration to capture and encourage the energy of our faculty in
creating new online teaching and learning tools. </p>
<p> Once up and running, <i>MITx</i> will be a laboratory for online
learning. Whether <i>MITx</i> learners are MIT&rsquo;s on-campus students,
university students elsewhere, or independent learners, <i>MITx</i> will help
us understand how online learning occurs and how virtual communities
of learners assemble -- information that in turn will allow us to
improve both <i>MITx</i> and our on-campus teaching. </p>
<p> Access to higher education. <i>MITx</i> will help shatter barriers to
education. The constraints of MIT&rsquo;s physical campus allow us to
admit less than 10 percent of our undergraduate applicants. We teach
on-campus only a tiny fraction of the people in the world with the
ability and motivation to learn MIT content. Online technology
provides a new and different portal into MIT-quality education.
Through <i>MITx</i>, MIT educational content can reach, augment, and enrich
the education and livelihood of many learners who cannot attend
MIT. </p>
<p> <i>MITx</i> does not provide a full MIT education. Our residential
campus is the heart of MIT&rsquo;s knowledge creation and
dissemination. MIT students enjoy a comprehensive curriculum and
distinct educational environment. Without MIT, there would be no
<i>MITx</i>. </p>
<p> Advancing the public good. <i>MITx</i> is an opportunity to help
preserve and expand higher education as a public good. Historically,
the investment of public and private assets in enormous amounts has
produced the public benefits of knowledge creation and dissemination,
leading to capable citizens, innovation, job creation, economic
development, and broader welfare.</p>
<p> Today, as computation and Internet technologies enable higher
education to migrate online, MIT sees the opportunity to democratize
education with unprecedented efficiency and scalability. We possess a
strong desire and feel a compelling obligation to offer a
not-for-profit, mission-driven, open-technology approach to online
learning. <i>MITx</i> is our contribution. </p>
</div>
</section>
mitx_global.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</section> </section>
<section class="intro-video"> <section class="intro-video">
<a rel="leanModal" href="#video-overlay"><img src="/static/images/video-image.png" alt="" /><span> Watch intro video</span></a> <a id="video-overlay-link" rel="leanModal" href="#video-overlay"><img src="/static/images/video-image.png" id="video-img" alt="" /><span> Watch intro video</span></a>
</section> </section>
</section> </section>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<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> <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="/6002x-press-release.html">6.002x Press Release</a>, <a href="/6002x-faq.html">6.002x FAQ</a>, <a href="/mitx-overview.html">MITx overview</a>, <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>, <a href="http://ocw.mit.edu/index.htm" target="_blank">OpenCourseWare</a></p>
</section> </section>
</section> </section>
...@@ -43,17 +43,37 @@ ...@@ -43,17 +43,37 @@
<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 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> <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 5, 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>
<div id="video-overlay" class="leanModal_box"> <div id="video-overlay" class="leanModal_box">
<iframe width="560" height="315" src="http://www.youtube.com/embed/p2Q6BrNhdh8?rel=0" frameborder="0" allowfullscreen></iframe> <iframe id="player" type="text/html" width="560" height="390" src="http://www.youtube.com/embed/p2Q6BrNhdh8?enablejsapi=1" frameborder="0">
</iframe>
</div> </div>
<script> <script>
var player;
function onYouTubePlayerAPIReady() {
player = new YT.Player('player', {
});
}
$(function() { $(function() {
var tag = document.createElement('script');
tag.src = "http://www.youtube.com/player_api";
var firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
$("a#video-overlay-link").click(function(){
player.playVideo();
$("a.modal_close, #lean_overlay").click(function(){
player.pauseVideo();
});
});
// 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
/* Handles when the user hits 'enroll'. Grabs form data. Does AJAX. /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
...@@ -89,7 +109,7 @@ $(function() { ...@@ -89,7 +109,7 @@ $(function() {
}); });
}) })
/*$("sregion"+$("[id^=spinner_]")[1].id.substring(7)) */ /*$("sregion"+$("[id^=spinner_]")[1].id.substring(7)) */
}); });
</script> </script>
mitx_help.html 0 → 100644
<%inherit file="marketing.html" />
<section class="tos">
<div>
<section class="help-email">
<h2>Help &amp; Feedback</h2>
<p> If run into any problems, we have several e-mail addresses set up:</p>
<dl>
<dt>System-related questions</dt>
<dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
<dt>Content-related questions</dt>
<dd><a href="mailto:content@mitx.mit.edu">content@mitx.mit.edu</a></dd>
<dt>Bug reports</dt>
<dd><a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a></dd>
<dt>Suggestions</dt>
<dd><a href="mailto:suggestions@mitx.mit.edu">suggestions@mitx.mit.edu</a></dd>
</dl>
<p> Please bear in mind that while we read them, we do not expect to
have time to respond to all e-mails.</p>
</section>
</div>
</section>
profile.html
...@@ -72,7 +72,7 @@ $(function() { ...@@ -72,7 +72,7 @@ $(function() {
$('#pwd_reset_button').click(function() { $('#pwd_reset_button').click(function() {
$.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
"email" : $('#id_email').val()}, function(data){ "email" : $('#id_email').val()}, function(data){
$('#pwd_reset').html(data); $("#password_reset_complete_link").click();
log_event("profile", {"type":"password_send"}); log_event("profile", {"type":"password_send"});
}); });
}); });
...@@ -155,9 +155,7 @@ $(function() { ...@@ -155,9 +155,7 @@ $(function() {
<div id="change_password_pop"> <div id="change_password_pop">
<h2>Password change</h2> <h2>Password change</h2>
<p>We'll e-mail you a password reset link at ${email}. Follow <p>We'll e-mail a password reset link to ${email}.</p>
the link in the confirmation email to change your
password.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" /> <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="submit" id="pwd_reset_button" value="Reset Password" /> <input type="submit" id="pwd_reset_button" value="Reset Password" />
...@@ -167,3 +165,8 @@ $(function() { ...@@ -167,3 +165,8 @@ $(function() {
</div> </div>
</section> </section>
<div id="password_reset_complete" class="leanModal_box">
<a href="#password_reset_complete" rel="leanModal" id="password_reset_complete_link"></a>
<h1>Password Reset Email Sent</h1>
An email has been sent to ${email}. Follow the link in the email to change your password.
</div>
registration/activation_email.txt deleted 100644 → 0
{% load humanize %}
Someone, hopefully you, signed up for a new account at djangoproject.com using this email address. If it was you, and you'd like to activate and use your account, click the link below or copy and paste it into your web browser's address bar:
http://127.0.0.1:8000/accounts/activate/{{ activation_key }}/
If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days|apnumber }} days.
registration/activation_email_subject.txt deleted 100644 → 0
Activate your djangoproject.com account - you have {{ expiration_days }} days!
registration/password_reset_confirm.html
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<h1>Password reset unsuccessful</h1> <h1>Password reset unsuccessful</h1>
<p>The password reset link was invalid, possibly because it has already been used. Please request a new password reset.</p> <p>The password reset link was invalid, possibly because the link has already been used. Please request a new password reset.</p>
{% endif %} {% endif %}
......
registration/password_reset_email.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% trans "Please go to the following page and choose a new password:" %} {% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %} {% block reset_link %}
https://6002x.mitx.mit.edu{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %} {{ protocol }}://{{ site_name }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
{% endblock %} {% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }} {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
......
sass/_activation.scss
body.activation {
footer {
max-width: 600px;
text-align: center;
p {
float: none;
}
ul {
display: none;
}
}
}
section.activation { section.activation {
@extend .wrapper; @extend .wrapper;
@include box-shadow(0 1px 0 #fff); @include box-shadow(0 1px 0 #fff);
......
sass/_base-extends.scss
...@@ -19,6 +19,13 @@ ...@@ -19,6 +19,13 @@
} }
} }
h1.top-header {
margin: (-(lh())) (-(lh())) lh();
padding: lh();
background: #f3f3f3;
border-bottom: 1px solid #e3e3e3;
}
.button { .button {
@include box-shadow(inset 0 1px 0 lighten(#888, 10%), 0 0 3px #ccc); @include box-shadow(inset 0 1px 0 lighten(#888, 10%), 0 0 3px #ccc);
@include linear-gradient(lighten(#888, 5%), darken(#888, 5%)); @include linear-gradient(lighten(#888, 5%), darken(#888, 5%));
......
sass/_discussion-answers.scss
...@@ -44,7 +44,11 @@ div.answer-block { ...@@ -44,7 +44,11 @@ div.answer-block {
} }
div.answered-by-owner { div.answered-by-owner {
color: darken($mit-red, 20%); color: $mit-red;
div.comments-container {
color: #555;
}
} }
} }
...@@ -65,6 +69,7 @@ div.answer-actions { ...@@ -65,6 +69,7 @@ div.answer-actions {
} }
a { a {
text-decoration: none; text-decoration: none;
cursor: pointer;
} }
a.question-edit, a.permant-link { a.question-edit, a.permant-link {
color: #999; color: #999;
......
sass/_discussion.scss
...@@ -123,6 +123,7 @@ body.askbot { ...@@ -123,6 +123,7 @@ body.askbot {
aside { aside {
@extend .sidebar; @extend .sidebar;
@include box-shadow(inset 1px 0 0 #f6f6f6); @include box-shadow(inset 1px 0 0 #f6f6f6);
@include border-radius(0 4px 4px 0);
border-left: 1px solid #d3d3d3; border-left: 1px solid #d3d3d3;
border-right: 1px solid #f6f6f6; border-right: 1px solid #f6f6f6;
padding: $gw-gutter; padding: $gw-gutter;
...@@ -148,18 +149,18 @@ body.askbot { ...@@ -148,18 +149,18 @@ body.askbot {
} }
} }
footer { // footer {
margin: 0 auto; // margin: 0 auto;
padding: 0; // padding: 0;
div.footer-wrapper { // div.footer-wrapper {
@extend .clearfix; // @extend .clearfix;
@extend .wrapper; // @extend .wrapper;
@include box-shadow(0 1px 0 #fff); // @include box-shadow(0 1px 0 #fff);
@include box-sizing(border-box); // @include box-sizing(border-box);
background-color: #000; // background-color: #000;
border-top: 0; // border-top: 0;
padding: $gw-gutter/2; // padding: $gw-gutter/2;
} // }
} // }
} }
sass/_index-extends.scss
...@@ -14,8 +14,13 @@ ...@@ -14,8 +14,13 @@
> div { > div {
padding-left: flex-grid(4) + flex-gutter(); padding-left: flex-grid(4) + flex-gutter();
@media screen and (max-width: 940px) {
padding-left: 0;
}
p { p {
margin-bottom: lh(); margin-bottom: lh();
line-height: lh();
} }
h1 { h1 {
...@@ -33,6 +38,15 @@ ...@@ -33,6 +38,15 @@
li { li {
list-style: disc outside none; list-style: disc outside none;
line-height: lh();
}
}
dl {
margin-bottom: lh();
dd {
margin-bottom: lh(.5);
} }
} }
} }
...@@ -48,19 +62,21 @@ ...@@ -48,19 +62,21 @@
.button { .button {
@include border-radius(3px); @include border-radius(3px);
@include border-radius(3px);
@include inline-block(); @include inline-block();
@include transition(); @include transition();
background-color: $mit-red; background-color: $mit-red;
border: 1px solid darken($mit-red, 10%);
color: #fff; color: #fff;
margin: lh() 0 lh(.5); margin: lh() 0 lh(.5);
padding: lh(.25) lh(.5); padding: lh(.25) lh(.5);
text-decoration: none; text-decoration: none;
font-style: normal; font-style: normal;
@include box-shadow(inset 0 1px 0 lighten($mit-red, 8%));
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
&:hover { &:hover {
background-color: darken($mit-red, 10%); background-color: darken($mit-red, 10%);
border-color: darken($mit-red, 20%);
} }
span { span {
......
sass/_index.scss
...@@ -53,13 +53,6 @@ header.announcement { ...@@ -53,13 +53,6 @@ header.announcement {
&.home { &.home {
background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg"); background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg");
@media screen and (min-width: 1200px) {
background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg");
}
// @media screen and (max-width: 1199px) {
// }
div { div {
padding: lh(10) lh() lh(3); padding: lh(10) lh() lh(3);
...@@ -167,13 +160,16 @@ header.announcement { ...@@ -167,13 +160,16 @@ header.announcement {
a { a {
@extend .button; @extend .button;
@include box-shadow(inset 0 1px 0 darken($mit-red, 10%), 0 1px 0 lighten($mit-red, 5%));
background-color: darken($mit-red, 20%); background-color: darken($mit-red, 20%);
display: block; display: block;
padding: lh(.5) lh(); padding: lh(.5) lh();
border-color: darken($mit-red, 30%);
text-align: center; text-align: center;
&:hover { &:hover {
background-color: darken($mit-red, 10%); background-color: darken($mit-red, 10%);
border-color: darken($mit-red, 20%);
} }
} }
} }
...@@ -410,11 +406,12 @@ section.index-content { ...@@ -410,11 +406,12 @@ section.index-content {
&.cta { &.cta {
width: 100%; width: 100%;
text-align: center;
a.enroll { a.enroll {
@extend .button; @extend .button;
padding: lh(.5) lh(); padding: lh(.5) lh(2);
display: block; @include inline-block();
text-align: center; text-align: center;
font: 800 18px $header-font-family; font: 800 18px $header-font-family;
} }
......
sass/_info.scss
...@@ -3,37 +3,88 @@ div.info-wrapper { ...@@ -3,37 +3,88 @@ div.info-wrapper {
section.updates { section.updates {
@extend .content; @extend .content;
> h1 {
@extend .top-header;
}
> p {
margin-bottom: lh();
}
ol {
list-style: none;
li {
padding-bottom: lh(.5);
margin-bottom: lh(.5);
@extend .clearfix;
border-bottom: 1px solid #e3e3e3;
h2 {
float: left;
width: flex-grid(2, 9);
margin: 0 flex-gutter() 0 0;
}
p {
float: left;
width: flex-grid(7, 9);
margin-bottom: 0;
}
}
}
} }
section.handouts { section.handouts {
@extend .sidebar; @extend .sidebar;
@include border-radius(0px 4px 0px 4px); @include border-radius(0 4px 4px 0);
border-right: 0; border-right: 0;
border-left: 1px solid #d3d3d3; border-left: 1px solid #d3d3d3;
h1 { h1 {
padding: 0 lh(); padding: 0 lh();
font-size: 18px;
} }
ol { ol {
list-style: none; list-style: none;
li { li {
h2 { @include box-shadow(0 1px 0 #eee);
padding: 0 lh(); border-bottom: 1px solid #d3d3d3;
@extend .clearfix;
p {
padding: 7px lh();
margin: 0;
text-transform: none;
letter-spacing: 0;
font-size: $body-font-size;
&:hover {
background: #efefef;
}
a {
display: inline;
padding: 0;
&:hover {
text-decoration: underline;
background: none;
}
}
} }
a { a {
@include box-shadow(0 1px 0 #eee);
@include transition(); @include transition();
border-bottom: 1px solid #d3d3d3;
color: lighten($text-color, 10%); color: lighten($text-color, 10%);
display: block; display: block;
padding: 7px lh(); padding: 7px lh();
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@include box-shadow(0 1px 0 #fff);
background: #efefef; background: #efefef;
} }
} }
......
sass/_layout.scss
...@@ -133,7 +133,6 @@ html { ...@@ -133,7 +133,6 @@ html {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
} }
}
footer { footer {
@extend .clearfix; @extend .clearfix;
...@@ -180,4 +179,13 @@ html { ...@@ -180,4 +179,13 @@ html {
} }
} }
} }
&.activation {
footer {
ul {
display: none;
}
}
}
}
} }
sass/_leanmodal.scss
...@@ -18,12 +18,30 @@ div.leanModal_box { ...@@ -18,12 +18,30 @@ div.leanModal_box {
background: #fff; background: #fff;
padding: lh(2); padding: lh(2);
a.modal_close {
position: absolute;
top: 12px;
right: 12px;
display: block;
width: 14px;
height: 14px;
z-index: 2;
color: #aaa;
font-style: normal;
&:hover{
text-decoration: none;
color: $mit-red;
}
}
h1 { h1 {
font-size: 24px; font-size: 24px;
margin-top: 0; margin-top: 0;
padding-bottom: lh(); padding-bottom: lh();
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
margin-bottom: lh(); margin-bottom: lh();
text-align: left;
} }
&#enroll { &#enroll {
...@@ -65,14 +83,17 @@ div.leanModal_box { ...@@ -65,14 +83,17 @@ div.leanModal_box {
text-align: left; text-align: left;
div#enroll_error, div#login_error, div#pwd_error { div#enroll_error, div#login_error, div#pwd_error {
$error-color: #333;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
background-color: #F50200; background-color: $error-color;
border: darken($error-color, 20%);
color: #fff; color: #fff;
text-shadow: 0 1px 0 darken($error-color, 10%);
font-family: "Open sans";
font-weight: bold; font-weight: bold;
letter-spacing: 1px; letter-spacing: 1px;
margin-bottom: lh(); margin: (-(lh())) (-(lh())) lh();
padding: lh(.2); padding: lh(.5);
text-transform: uppercase;
&:empty { &:empty {
padding: 0; padding: 0;
...@@ -139,6 +160,18 @@ div.leanModal_box { ...@@ -139,6 +160,18 @@ div.leanModal_box {
div#login { div#login {
min-width: 400px; min-width: 400px;
header {
border-bottom: 1px solid #ddd;
margin-bottom: lh();
padding-bottom: lh();
h1 {
border-bottom: 0;
padding-bottom: 0;
margin-bottom: lh(.25);
}
}
ol { ol {
li { li {
width: auto; width: auto;
...@@ -184,3 +217,53 @@ div#feedback_div{ ...@@ -184,3 +217,53 @@ div#feedback_div{
} }
} }
} }
div#calculator_div {
max-width: 500px;
form {
padding-bottom: lh();
margin-bottom: lh();
border-bottom: 1px solid #ddd;
input#calculator_input {
width: 400px;
}
input#calculator_button {
background: 0;
color: $mit-red;
border: 0;
@include box-shadow(none);
padding: 0;
text-shadow: none;
&:hover {
color: #333;
}
}
input#calculator_output {
border: 0;
background: 0;
padding: lh(.35);
width: 60px;
font-size: 24px;
font-weight: bold;
}
}
dl {
dt {
float: left;
clear: both;
padding-right: lh(.5);
font-weight: bold;
}
dd {
float: left;
}
}
}
sass/_profile.scss
...@@ -9,7 +9,8 @@ div.profile-wrapper { ...@@ -9,7 +9,8 @@ div.profile-wrapper {
border-right: 0; border-right: 0;
h1 { h1 {
padding: lh(); padding:0 lh();
font-size: 18px;
} }
ul { ul {
...@@ -52,6 +53,10 @@ div.profile-wrapper { ...@@ -52,6 +53,10 @@ div.profile-wrapper {
section.course-info { section.course-info {
@extend .content; @extend .content;
> h1 {
@extend .top-header;
}
ol { ol {
list-style: none; list-style: none;
......
simplewiki_base.html
...@@ -102,9 +102,6 @@ ...@@ -102,9 +102,6 @@
<div id="wiki_create_form"> <div id="wiki_create_form">
<% <%
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')" theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_create", args=["/"]) baseURL = reverse("wiki_create", args=["/"])
%> %>
......
tos.html
...@@ -215,7 +215,8 @@ risk. Your access to or download of information, materials, or data ...@@ -215,7 +215,8 @@ risk. Your access to or download of information, materials, or data
through the Site or any reference sites is at your own discretion and through the Site or any reference sites is at your own discretion and
risk and that you will be solely responsible for any damage to your risk and that you will be solely responsible for any damage to your
property (including your computer system) or loss of data that results property (including your computer system) or loss of data that results
from the download or use of such material or data.</p> from the download or use of such material or data. We may close or
limit enrollment for pedagogical or technological reasons.</p>
<p><strong>User Postings Disclaimer.</strong> You understand that when <p><strong>User Postings Disclaimer.</strong> You understand that when
using the Site you will be exposed to User Postings from a variety of using the Site you will be exposed to User Postings from a variety of
...@@ -301,6 +302,6 @@ consent to the personal jurisdiction of and exclusive venue in the ...@@ -301,6 +302,6 @@ consent to the personal jurisdiction of and exclusive venue in the
federal and state courts located in and serving Boston, Massachusetts federal and state courts located in and serving Boston, Massachusetts
as the legal forum for any such dispute.</p> as the legal forum for any such dispute.</p>
<p><strong>Effective Date:</strong> February 6, 2012</p><div> <p><strong>Effective Date:</strong> February 10, 2012</p><div>
</div> </div>
</section> </section>
video_init.js
...@@ -58,15 +58,23 @@ for(var i=0; i<l.length; i++) { ...@@ -58,15 +58,23 @@ for(var i=0; i<l.length; i++) {
add_speed(l[i], streams[l[i]]) add_speed(l[i], streams[l[i]])
} }
//toggle video play/pause. the HTML assumes video is always autoplayed function toggleVideo(){
//initially since it starts with class "pause". may want to set that in if ($("#video_control").hasClass("play")){
//javascript
$("#video_control").click(function(){
if ($(this).hasClass("play")){
play(); play();
$(this).removeClass().addClass("pause"); $("#video_control").removeClass().addClass("pause");
} else { } else {
pause(); pause();
$(this).removeClass().addClass("play"); $("#video_control").removeClass().addClass("play");
}
}
$("#video_control").click(toggleVideo);
// space bar to pause video
$(".video-wrapper").keyup(function(e){
active = document.activeElement;
if (e.which == 32) {
e.preventDefault();
$("#video_control").click();
} }
}); });
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