diff --git a/.DS_Store b/.DS_Store index a511c81699..6e5576ca7e 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/6002x-faq.html b/6002x-faq.html index ccbe473b4e..4a13a532b8 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -26,6 +26,7 @@ someone else already signed up with that username. Try a different, more unique username. For example, try adding a random number to the end.

+

I am interested in a different subject. What other courses do you offer?

@@ -33,6 +34,7 @@ you offer? range of courses in the future, at present, 6.002x is the only course available.

+

How will I know that the course has started?

The course will start on March 5. Check the website @@ -41,30 +43,44 @@ the course website 6.002x.mitx.mit.edu on or slightly before March 5 so you can login, begin to get familiar with the site and start the course.

+

Why is there no log-in button?

You will not be able to log into the course until either the starting date, or shortly before.

+

Does the class have a schedule?

The lectures are on-line videos, and may be watched at your own pace and schedule. The course will have fixed deadlines for homework assignments and exams.

+

I just enrolled for the course. I have not received any form of acknowledgement that I have enrolled.

-

You should receive a single activation e-mail. If you did not, -check your spam folder, or try to register again with your correct -e-mail address and a new username (most errors are from typos in -e-mail addresses).

+

You should receive a single activation e-mail. If you did not, the +most common issues are: +

+

If you run into issues, try recreating your account. There is no need +to do anything about the old account, if any. If it is not activated +through the link in the e-mail, it will disappear later. + +

How do I drop the course?

You do not have to do anything. You can simply stop working on the course at any time you choose to do so.

+

What happens if I drop the course?

For the prototype course, learners achieving grades of "A," "B," @@ -76,6 +92,7 @@ will be disclosed outside of MITx. You can also choose to opt for a no record at any time. However, the posts you make while enrolled in the class will remain visible.

+

What is MITx?

@@ -104,6 +121,7 @@ education. The launch of MITx represents a next step forward in that effort.

+

What is 6.002x, and how is it different from the on-campus version of 6.002? @@ -133,6 +151,7 @@ version of 6.002. professors Anant Agarwal and Jeffrey H. Lang for 6.002.

+

How do I enroll in 6.002x?

@@ -141,6 +160,7 @@ To enroll, visit http://mitx.mit.edu and sign up.

+

When will the course be available online?

@@ -149,6 +169,7 @@ When will the course be available online? 6.002x will become available online on Monday, March 5.

+

Do I need to follow a set timeline in completing 6.002x?

@@ -160,6 +181,7 @@ final exam will be given within a specific range of days. However, faster-paced learners can proceed multiple weeks ahead if they choose.

+

How much time is required to complete the course?

@@ -169,6 +191,7 @@ course. However, the time taken by individual students might vary considerably depending on background and skill.

+

Who are the instructors for 6.002x?

@@ -178,6 +201,7 @@ Gerald Sussman and Piotr Mitros. The team also includes several teaching assistants (TAs).

+

What is the work like in 6.002x?

@@ -199,6 +223,7 @@ videos. Lab and homework exercises will round out the week. Tutorials are also provided as additional reference material.

+

What if I have a question during the course?

@@ -209,6 +234,7 @@ documents, FAQs, tutorials and videos on using the various components of the course will also be provided.

+

Will 6.002x offer any means for collaboration among online learners?

@@ -217,6 +243,7 @@ Yes. 6.002x will offer modest support for collaborative work through a prototype wiki and discussion forum.

+

Are there prerequisites to take the course?

@@ -239,6 +266,7 @@ remedial differential equations component for students with weaker math backgrounds.

+

How much does the course cost?

@@ -246,9 +274,10 @@ How much does the course cost? All of the courses on MITx 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. +credential will be waived.

+

What is a credential?

@@ -261,6 +290,7 @@ testing center or otherwise have your identity certified in order to receive this certificate.

+

Who is grading the course?

@@ -269,6 +299,7 @@ Who is grading the course? including practice exercises, homework assignments, labs and exams.

+

What is a passing grade?

@@ -279,6 +310,7 @@ affecting a student’s grade and the grade thresholds will be posted on the course website when the course comes online.

+

Do I need to buy a textbook?

@@ -290,23 +322,28 @@ 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. +on Amazon.

+

Do I need to have special software to access 6.002x?

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. +website was developed and tested primarily with the current version of +Google Chrome. We support current versions of Mozilla Firefox as +well. The video player is based on Youtube, and is designed to work +with Flash. We provide a partial non-Flash fallback for the video, but +this uses Google's experimental HTML5 API, and hence we cannot +guarantee those will continue to function for the duration of the +semester. We provide partial support for Internet Explorer, as well as +other browsers and tablets, but portions of the functionality will be +unavailable.

+

When will the next courses become available and what topics will they be on?

diff --git a/Lab2A.html b/Lab2A.html deleted file mode 120000 index 3eeed8320d..0000000000 --- a/Lab2A.html +++ /dev/null @@ -1 +0,0 @@ -../data/problems/Lab2A.html \ No newline at end of file diff --git a/book_toc.html b/book_toc.html index 44904d8f60..35ef650b21 100644 --- a/book_toc.html +++ b/book_toc.html @@ -1,339 +1,356 @@ +
  • Contents ix +
  • Preamble i + -
  • The Circuit Abstraction -
  • A1 Maxwell's Equations and the LMD 927 +
  • B Trigonometric Functions & Identities 941 +
  • C Complex Numbers 947 +
  • D Solving Simultaneous Linear Equations 957 + + +
  • Answers to Selected Problems 959 +
  • Figure Acknowledgments 971 +
  • Index 973 diff --git a/courseware.html b/courseware.html index b77806f3e1..67e596545e 100644 --- a/courseware.html +++ b/courseware.html @@ -1,37 +1,23 @@ <%inherit file="main.html" /> +<%block name="js_extra"> + <%include file="navigation.html" args="active_page='courseware'" />
    -
    +

    Courseware Index

    close -
    +
    ${accordion} diff --git a/create_account.html b/create_account.html index e50c26d748..3a57707693 100644 --- a/create_account.html +++ b/create_account.html @@ -2,6 +2,9 @@

    Enroll in 6.002x Circuits & Electronics

    + +

    Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can’t enroll without upgrading, since you couldn’t take the course without upgrading. Feel free to download the latest version of Mozilla Firefox or Google Chrome, for free, to enroll and take this course.

    +
    <% if 'error' in locals(): e = error %> diff --git a/custom_tags b/custom_tags deleted file mode 120000 index ec1dac8fbe..0000000000 --- a/custom_tags +++ /dev/null @@ -1 +0,0 @@ -../data/custom_tags \ No newline at end of file diff --git a/index.html b/index.html index 3cbb0bf84d..d6fe0d288d 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,15 @@ <%inherit file="marketing.html" /> +<%block name="title">MITx 6.002x: Circuits & Electronics +<%block name="description">6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT's first undergraduate analog design course: 6.002. +<%block name="keywords">MITx, circuits, electronics, EECS, electrical engineering, analog circuits, digital circuits, online learning, MIT, online laboratory, education, learners, undergraduate, certificate + <%block name="header_text">

    Circuits & Electronics

    6.002x

    - Enroll in 6.002x Circuits & Electronics + Enroll in 6.002x Circuits & Electronics

    6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT’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.

    @@ -48,7 +52,7 @@
    - Enroll in 6.002x Circuits & Electronics + Enroll in 6.002x Circuits & Electronics
    @@ -58,17 +62,17 @@ diff --git a/main.html b/main.html index 2a3f2cca32..76a035c449 100644 --- a/main.html +++ b/main.html @@ -1,7 +1,7 @@ - <%block name="title">MITx 6.002 + <%block name="title">MITx 6.002x @@ -27,11 +27,6 @@ - <%block name="headextra"/> @@ -116,5 +111,13 @@ $(function() { }); + + +<%block name="js_extra"/> + diff --git a/marketing.html b/marketing.html index 9f59ef88f0..f612ade780 100644 --- a/marketing.html +++ b/marketing.html @@ -1,10 +1,15 @@ - <%block name="title">MITx 6.002 + <%block name="title">MITx: MIT's new online learning initiative</%block> + + MITx will offer a portfolio of MIT courses for free to a virtual community of learners around the world" /> + + MITx, online learning, MIT, online laboratory, education, learners, undergraduate, certificate" /> + @@ -22,11 +27,6 @@ - <%block name="headextra"/> @@ -151,7 +151,20 @@ $(document).ready(function(){ }); }); + +$(function(){ + $("a[rel*=leanModal]").leanModal(); + + $("a.login").click(function(){ + $("#login_form #li_email").focus(); + }); + + $("a.enroll").click(function(){ + $("#enroll_form #ca_email").focus(); + }); + }); +<%block name="js_extra"/> diff --git a/mitx_global.html b/mitx_global.html index 3cc3b302e7..2f57a2efa1 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -12,7 +12,7 @@
    - Watch intro video + Link to MITx introduction video Watch intro video
    @@ -40,7 +40,7 @@

    - More information & Enroll + More information & Enroll ‣

    Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT’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 MITx.

    @@ -51,6 +51,8 @@ + +<%block name="js_extra"> + diff --git a/navigation.html b/navigation.html index 3b4b50d314..bba364d18b 100644 --- a/navigation.html +++ b/navigation.html @@ -7,7 +7,6 @@