diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_animation.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_animation.scssc deleted file mode 100644 index 9f65b466b7..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_animation.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_appearance.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_appearance.scssc deleted file mode 100644 index 38daf2542d..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_appearance.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_background-image.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_background-image.scssc deleted file mode 100644 index 1b0135a461..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_background-image.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_background-size.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_background-size.scssc deleted file mode 100644 index 2af3d7fb06..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_background-size.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_border-image.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_border-image.scssc deleted file mode 100644 index 6c705696e7..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_border-image.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_border-radius.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_border-radius.scssc deleted file mode 100644 index 706de53362..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_border-radius.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_box-shadow.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_box-shadow.scssc deleted file mode 100644 index 388875d07f..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_box-shadow.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_box-sizing.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_box-sizing.scssc deleted file mode 100644 index c0e6f6ad4e..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_box-sizing.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_columns.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_columns.scssc deleted file mode 100644 index 2e55fc5dc0..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_columns.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_flex-box.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_flex-box.scssc deleted file mode 100644 index 15a62362ed..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_flex-box.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_inline-block.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_inline-block.scssc deleted file mode 100644 index 16ccd57e69..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_inline-block.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_linear-gradient.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_linear-gradient.scssc deleted file mode 100644 index 5f02a42ad0..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_linear-gradient.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_radial-gradient.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_radial-gradient.scssc deleted file mode 100644 index 8e5b5c49d4..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_radial-gradient.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_transform.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_transform.scssc deleted file mode 100644 index 212fe947c2..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_transform.scssc and /dev/null differ diff --git a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_transition.scssc b/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_transition.scssc deleted file mode 100644 index 77089fc94a..0000000000 Binary files a/.sass-cache/3880f4eb5d804120948cf97cf33cca286b65912d/_transition.scssc and /dev/null differ diff --git a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_deprecated-webkit-gradient.scssc b/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_deprecated-webkit-gradient.scssc deleted file mode 100644 index e1a3ebf05e..0000000000 Binary files a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_deprecated-webkit-gradient.scssc and /dev/null differ diff --git a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_golden-ratio.scssc b/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_golden-ratio.scssc deleted file mode 100644 index 6757862678..0000000000 Binary files a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_golden-ratio.scssc and /dev/null differ diff --git a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_grid-width.scssc b/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_grid-width.scssc deleted file mode 100644 index 7bd3fc7559..0000000000 Binary files a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_grid-width.scssc and /dev/null differ diff --git a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_linear-gradient.scssc b/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_linear-gradient.scssc deleted file mode 100644 index 04a533e659..0000000000 Binary files a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_linear-gradient.scssc and /dev/null differ diff --git a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_radial-gradient.scssc b/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_radial-gradient.scssc deleted file mode 100644 index 65b7f66025..0000000000 Binary files a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_radial-gradient.scssc and /dev/null differ diff --git a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_tint-shade.scssc b/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_tint-shade.scssc deleted file mode 100644 index b8e9ef83e4..0000000000 Binary files a/.sass-cache/39942612fcff3338e5188be4e77119bcd3d1e55d/_tint-shade.scssc and /dev/null differ diff --git a/.sass-cache/454319bd2251634ce4a0d8035ab87ff9a089ca51/_bourbon.scssc b/.sass-cache/454319bd2251634ce4a0d8035ab87ff9a089ca51/_bourbon.scssc deleted file mode 100644 index 68ac906368..0000000000 Binary files a/.sass-cache/454319bd2251634ce4a0d8035ab87ff9a089ca51/_bourbon.scssc and /dev/null differ diff --git a/.sass-cache/47c2162753299d6160744ee2ad10f568b60c57a1/_base.scssc b/.sass-cache/47c2162753299d6160744ee2ad10f568b60c57a1/_base.scssc deleted file mode 100644 index ee4e461374..0000000000 Binary files a/.sass-cache/47c2162753299d6160744ee2ad10f568b60c57a1/_base.scssc and /dev/null differ diff --git a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_button.scssc b/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_button.scssc deleted file mode 100644 index 39b26791ea..0000000000 Binary files a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_button.scssc and /dev/null differ diff --git a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_font-family.scssc b/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_font-family.scssc deleted file mode 100644 index edcb905e91..0000000000 Binary files a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_font-family.scssc and /dev/null differ diff --git a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_html5-input-types.scssc b/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_html5-input-types.scssc deleted file mode 100644 index 69d95d8f0d..0000000000 Binary files a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_html5-input-types.scssc and /dev/null differ diff --git a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_position.scssc b/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_position.scssc deleted file mode 100644 index 621868f1f6..0000000000 Binary files a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_position.scssc and /dev/null differ diff --git a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_timing-functions.scssc b/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_timing-functions.scssc deleted file mode 100644 index 1b8042621c..0000000000 Binary files a/.sass-cache/84004ce618e571a697a1850fe7ac090ae72a9c1d/_timing-functions.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc deleted file mode 100644 index 4d23c8bb78..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-extends.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc deleted file mode 100644 index 7975d6b23b..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base-variables.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc deleted file mode 100644 index c0bf1b4a65..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_base.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc deleted file mode 100644 index 2c36fe2704..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc deleted file mode 100644 index 7cbf7718a2..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_font-face.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc deleted file mode 100644 index a04a7966da..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_layout.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc deleted file mode 100644 index 42d1a7db67..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_local.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc deleted file mode 100644 index ec62964b12..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_profile.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_reset.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_reset.scssc deleted file mode 100644 index 38bc887589..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_reset.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc deleted file mode 100644 index 399ae4170b..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_textbook.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc deleted file mode 100644 index b51fa075b8..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_theme.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki-create.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki-create.scssc deleted file mode 100644 index a7f4fd7275..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki-create.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki.scssc deleted file mode 100644 index d900b93045..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_wiki.scssc and /dev/null differ diff --git a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc b/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc deleted file mode 100644 index 07c7fa661c..0000000000 Binary files a/.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/application.scssc and /dev/null differ diff --git a/activation_complete.html b/activation_complete.html index 578bffacf2..c74af930d5 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,3 +1,8 @@ -

Activation Complete

-

Now go log in and try the course!

+<%inherit file="main.html" /> + +
+

Activation Complete!

+ +

Thanks for activating your email. We will notify you as soon as the course starts.

+
diff --git a/activation_invalid.html b/activation_invalid.html index 68b7cddd45..ba246ea3a1 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,5 +1,7 @@ -

Activation Invalid

+<%inherit file="main.html" /> +
+

Activation Invalid

-

Something went wrong. Did you already activate the account? If so, -go log in and try the course. Otherwise, e-mail us to -let us know what happened.

+

Something went wrong. Did you already activate the account? Otherwise, e-mail us to + let us know what happened at bugs@mitx.mit.edu.

+
diff --git a/courseinfo.html b/courseinfo.html new file mode 100644 index 0000000000..03acfa6646 --- /dev/null +++ b/courseinfo.html @@ -0,0 +1,182 @@ +<%inherit file="main.html" /> + +
+
+ + +
+

6.002

+

Circuits & Electronics

+

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.

+ Enroll in 6.002 Circuits & Electronics +
+
+ +
+ + +
+
+ +
+

About 6.002

+ +

6.002 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.

+ +

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. 6.002 is worth 4 Engineering Design Points. The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.

+ + +
+ +
+

6.002 on MITx

+ +

Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Students will not receive course credit, but students successfully finishing the course will be well-placed to take an exam to pass out of 6.002 should they ever enroll at MIT, and potentially, similar courses at other schools.

+ +

In order to succeed in this course, students must have some background in calculus and 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.

+
+ +
+

Requirements

+ +

Students entering the course are expected to know how basic calculus and differential equations, as well as basic linear algebra. In addition, a background in E&M is helpful, although not critical.

+ +

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.

+
+ +
+
+

About the course staff

+ + + +
+ +
+ + + + + + + + + + + + + + +
+ Enroll in Circuits & Electronics +
+
+
+ +
+
<%include file="create_account.html" />
+
+ +
+
<%include file="login.html" />
+
+ +
+
<%include file="password_reset_form.html" />
+
+ +
+
+
+ + + diff --git a/create_account.html b/create_account.html index 56c45425df..435d4604a4 100644 --- a/create_account.html +++ b/create_account.html @@ -1,74 +1,68 @@ - +
-
-<% - if 'error' in locals(): - e = error -%> - - - +

Enroll in 6.002 Circuits & Electronics

+ + <% if 'error' in locals(): e = error %> - - +
+ +
    + +
  1. + + +
  2. + +
  3. + + +
  4. + +
  5. + + + + +
  6. -
- +
  • + + -
  • - + + - - +
  • + + -
  • + - - - -
    -
    E-mail
    Password
    Public Name
    Nickname you'd like to use on forums. We recommend -some variant of your real name (e.g. first name, last initial), but we -allow you to be fully anonymous as well.
    Full name
    Location
    Preferred Language
    I agree to the Terms of -Service
    I agree -to:
    -
    -Not engage in any activities that would dishonestly improve my -results, or improve or hurt those of others -

    -Never post answers to problems -

    -Maintain only one account -

    - -
    -
    + + +
  • + + + + + +
  • + +
  • + +
  • + +
  • + +
  • + + + +
    diff --git a/credits.html b/credits.html deleted file mode 100644 index c0c4f96bc0..0000000000 --- a/credits.html +++ /dev/null @@ -1,57 +0,0 @@ -<%inherit file="main.html" /> - -
    -
    -
    - -
    - -
    - - -
    -
    - -
    - - -
    - -
    - -

    Credits

    - -

    The team of instructors is Anant Agarwal, Piotr Mitros, Chris - Terman, and Gerald Sussman. Our intrepid team of TAs is - -

    The main codebase was crammed out in two months by Piotr - Mitros. Evgeny Fadeev helped integrate Askbot into the - system. Schematic entry and circuit simulation are by Chris - Terman. Jean-Michel Claus designed the applets. IT and infrastructure - are managed by Scott Bloomquist of TechSquare, Inc.

    - -

    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 dotemplate.com, 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.

    - -

    The system is running in the Amazon cloud, which allows us to hold up to anticipated loads.

    - -
    -
    diff --git a/credits.html.orig b/credits.html.orig deleted file mode 100644 index 67485cf1e0..0000000000 --- a/credits.html.orig +++ /dev/null @@ -1,53 +0,0 @@ -<%inherit file="main.html" /> - -
    - -
    - - -
    -
    - -
    - - -
    - -
    - -

    Credits

    - -

    The team of instructors is Anant Agarwal, Piotr Mitros, Chris - Terman, and Gerald Sussman. Our intrepid team of TAs is - -

    The main codebase was crammed out in two months by Piotr - Mitros. Evgeny Fadeev helped integrate Askbot into the - system. Schematic entry and circuit simulation are by Chris - Terman. Jean-Michel Claus designed the applets. IT and infrastructure - are managed by Scott Bloomquist of TechSquare, Inc.

    - -

    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 dotemplate.com, 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.

    - -

    The system is running in the Amazon cloud, which allows us to hold up to anticipated loads.

    - -
    -
    diff --git a/index.html b/index.html index b653bb46e6..fbe5fdabd0 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,57 @@ -<%inherit file="main.html" /> +<%inherit file="main.html" /> + +
    +
    + + +
    +

    An MIT Education Anywhere.
    For free.

    +

    MITx is an open learning software available free of cost, so that others — whether other universities or different educational institutions, such as K–12 school systems — can leverage the same software for their online education offerings.

    +
    +
    + +
    + +
    +
    +

    About MITx

    +

    MITx is a portfolio of MIT courses through an online interactive learning platform that:

    + +
      +
    • organizes and presents course material to enable students to learn at their own pace
    • +
    • features interactivity, online laboratories and student-to-student communication
    • +
    • allows for the individual assessment of any student’s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by MITx
    • +
    • operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions.
    • +
    + +

    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.

    +
    + +
    +

    Course offering

    +

    6.002 Circuits and Electronics

    +

    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.

    +

    + More information about Circuits and Electronics +

    +
    + +
    +
    <%include file="login.html" />
    +
    + +
    +
    <%include file="password_reset_form.html" />
    +
    + +
    +
    +
    +
    + + - -
    -
    -
    - -
    - -
    - - -
    -
    - -
    - -
    - -
    - -
    - -
    Enroll >>


    - Log In >>
    -
    - Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris - Terman, "6.002 Circuits and Electronics" is an 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. - -

    Students who successfully complete the course will receive an - electronic certificate of accomplishment from MIT. Students will not - receive course credit, but students successfully finishing the course - will be well-placed to take an exam to pass out of 6.002 should they - ever enroll at MIT, and potentially, similar courses at other schools. - -

    In order to succeed in this course, students must have some - background in calculus and 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. - -
    - -
    <%include file="create_account.html" />
    -
    <%include file="login.html" />
    -
    <%include file="password_reset_form.html" />
    -
    - - -
    - - - -
    - -
    - -
    -
    -
    -
    diff --git a/index.html.orig b/index.html.orig deleted file mode 100644 index 6e354074b7..0000000000 --- a/index.html.orig +++ /dev/null @@ -1,151 +0,0 @@ -<%inherit file="main.html" /> - - -
    -
    -
    - -
    - -
    - - -
    -
    - -
    - -
    - -
    - -
    - -
    Enroll >>


    - Log In >>
    -
    - Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris - Terman, "6.002 Circuits and Electronics" is an 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. - -

    Students who successfully complete the course will receive an - electronic certificate of accomplishment from MIT. Students will not - receive course credit, but students successfully finishing the course - will be well-placed to take an exam to pass out of 6.002 should they - ever enroll at MIT, and potentially, similar courses at other schools. - -

    In order to succeed in this course, students must have some - background in calculus and 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. - -
    - -
    <%include file="create_account.html" />
    -
    <%include file="login.html" />
    -
    <%include file="password_reset_form.html" />
    -
    - - -
    - - - -
    - -
    - -
    -
    -
    -
    diff --git a/info.html b/info.html deleted file mode 100644 index f525946589..0000000000 --- a/info.html +++ /dev/null @@ -1,83 +0,0 @@ -<%inherit file="main.html" /> - -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    -
    -

    About 6.002

    - -

    6.002 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. - -

    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. 6.002 is worth 4 Engineering Design Points. The 6.002 -content was created collaboratively by Profs. Anant Agarwal and -Jeffrey H. Lang. - -

    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. - -

    Requirements

    - -

    Students entering the course are expected to know how basic -calculus and differential equations, as well as basic linear -algebra. In addition, a background in E&M is helpful, although not -critical. - -

    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. - -

    - - - -
    - -
    - -
    -
    -
    -
    diff --git a/login.html b/login.html index 643eec371c..50cbd6ad1f 100644 --- a/login.html +++ b/login.html @@ -1,16 +1,18 @@ - ${ error } +${ error } +
    - - - - - - -
    -
    -
    E-mail
    Password
    Remember me
    - +
    +
    + E-mail + + Password + + Remember me + +
    + +
    diff --git a/main.html.orig b/main.html.orig deleted file mode 100644 index 769ef5e21f..0000000000 --- a/main.html.orig +++ /dev/null @@ -1,97 +0,0 @@ - - - - MITX 6.002 - - - - - - - - - - - - - - - - - - - - - - - - - ${self.body()} - -
    -

    Copyright (c). 2011. MIT. Some rights reserved. Please give us feedback. Try our calculator. - - -

    - -
    Found a bug? Got an -idea for improving our system? Let us know. -
    Subject:
    -
    Feedback:
    -
    - - - -
    - -
    - - - -
    -Supported operations: ^ * / + - || () -
    -Supported suffixes: %kMGTcmunp - -
    - - -
    - - diff --git a/profile.html.orig b/profile.html.orig deleted file mode 100644 index eeff106431..0000000000 --- a/profile.html.orig +++ /dev/null @@ -1,116 +0,0 @@ -<%inherit file="main.html" /> - - - -<%include file="navigation.html" /> - -
    -
    - - -
    -

    Course Progress

    - - - -
      - % for hw in homeworks: -
    1. -

      ${ hw['chapter'] }

      -

      ${ hw['section'] }

      - -
        - % for score in hw['scores']: -
      • ${ score[0] }/${ score[1] }
      • - % endfor -
      -
    2. - % endfor -
    -
    -
    -
    diff --git a/sass/_activation.scss b/sass/_activation.scss new file mode 100644 index 0000000000..0ec5ea837a --- /dev/null +++ b/sass/_activation.scss @@ -0,0 +1,11 @@ +section.activation { + @extend .wrapper; + @include box-shadow(0 1px 0 #fff); + @include box-sizing(border-box); + background: #fff; + border-top: 0; + border: 1px solid #ccc; + max-width: 600px; + padding: lh(); + margin-top: lh(); +} diff --git a/sass/_base-variables.scss b/sass/_base-variables.scss index 356869ada3..0e2241999b 100644 --- a/sass/_base-variables.scss +++ b/sass/_base-variables.scss @@ -5,7 +5,7 @@ // Line-height @function lh($amount: 1) { - @return $base-line-height * $amount; + @return $body-line-height * $amount; } // Variables diff --git a/sass/_fancybox.scss b/sass/_fancybox.scss new file mode 100644 index 0000000000..9747d1e880 --- /dev/null +++ b/sass/_fancybox.scss @@ -0,0 +1,91 @@ +div#fancybox-overlay { + background: #333 !important; +} + +div#fancybox-wrap { + div#fancybox-outer { + background: none; + max-width: 600px; + + div.fancybox-bg { + display: none; + background: none; + } + + div#fancybox-content { + @include border-radius(3px); + @include box-shadow(0 0 6px #000); + @include box-sizing(border-box); + background: #fff; + border: none; + padding: lh(2); + max-width: 600px; + + h1 { + font-size: 24px; + margin-top: 0; + font-family: "Oswald"; + padding-bottom: lh(); + border-bottom: 1px solid #eee; + margin-bottom: lh(); + } + + form { + text-align: left; + + div#enroll_error { + padding-bottom: lh(); + color: #DF8B2C; + text-transform: uppercase; + letter-spacing: 1px; + font-weight: bold; + } + + ol { + li { + margin-bottom: lh(); + width: grid-width(6); + float: left; + + &:nth-child(odd) { + margin-right: $gw-gutter; + } + + &.terms { + float: none; + width: auto; + clear: both; + padding-top: lh(); + border-top: 1px solid #eee; + } + + &.honor-code { + width: auto; + float: none; + } + + label { + display: block; + font-weight: bold; + } + + #{$all-text-inputs} { + width: 100%; + @include box-sizing(border-box); + } + + input[type="checkbox"] { + margin-right: 10px; + } + } + } + + input[type="button"] { + @include button($mit-red); + font-size: 18px; + padding: lh(.5); + } + } + } + } +} diff --git a/sass/_index.scss b/sass/_index.scss new file mode 100644 index 0000000000..48418821ff --- /dev/null +++ b/sass/_index.scss @@ -0,0 +1,193 @@ +@font-face { + font-family: 'Oswald'; + font-style: normal; + font-weight: normal; + src: local('Oswald '), local('Oswald'), url('http://themes.googleusercontent.com/static/fonts/oswald/v3/qpy-UiLNKP-VfOdbcs6r6-vvDin1pK8aKteLpeZ5c0A.woff') format('woff'); +} + +header.announcement { + background: $mit-red; + border-top: 3px solid darken($mit-red, 10%); + color: #fff; + + div { + @extend .wrapper; + padding: 80px $body-line-height 60px; + position: relative; + @include box-sizing(border-box); + + nav { + position: absolute; + top: 20px; + right: 0; + + a.login { + text-transform: uppercase; + color: #fff; + font-size: 12px; + margin-right: 20px; + text-shadow: 0 -1px 0 darken($mit-red, 10%); + + &:hover { + color: rgba(#fff, .6); + } + } + } + + section { + @extend .clearfix; + padding-left: grid-width(3); + + h1 { + font-family: "Oswald"; + font-size: 62px; + line-height: 1.2em; + margin: 0; + text-transform: uppercase; + text-shadow: 0 -2px 0 darken($mit-red, 10%); + } + + p { + line-height: 1.6em; + max-width: 700px; + margin: 2em 0 0; + } + + &.course { + padding-left: grid-width(4) + $gw-gutter; + + a.enroll { + @include button(#fff); + @include inline-block(); + @include box-shadow(0 1px 0 lighten($mit-red, 10%)); + margin-top: lh(); + font-size: 18px; + padding: lh(.5); + border-color: darken($mit-red, 10%); + + &:hover { + text-decoration: none; + } + } + } + } + } +} + +section.index-content { + @extend .main-content; + @extend .wrapper; + @include box-sizing(border-box); + padding: lh(); + + section { + width: grid-width(6); + @extend .clearfix; + float: left; + + &.about { + margin-right: $gw-gutter; + } + + &.about-course { + width: grid-width(12); + float: none; + @extend .clearfix; + + section { + width: grid-width(4); + margin-right: $gw-gutter; + + &.requirements { + margin-right: 0; + } + } + } + + &.staff { + @extend .clearfix; + border-top: 1px solid #eee; + float: none; + width: grid-width(12); + margin-top: lh(); + padding-top: lh(); + + ul { + list-style: none; + margin: 0; + + li { + width: grid-width(3); + list-style: none; + float: left; + margin-right: $gw-gutter; + + img { + float: left; + margin: 0 1em 1em 0; + } + + &:last-child { + margin-right: 0; + } + } + } + } + + h1 { + font-size: 34px; + margin-top: 0; + font-family: "Oswald"; + } + + ul { + margin: 0 grid-width(1) 1em; + list-style: disc outside none; + + li { + list-style: disc outside none; + } + } + + p { + line-height: 1.5; + } + + a.more-info { + // @extend .button; + @include button(simple, $mit-red); + @include inline-block(); + margin-top: lh(); + font-size: 18px; + padding: lh(.5); + + &:hover { + text-decoration: none; + } + } + } + + div.secondary { + border-top: 1px solid #eee; + margin-top: lh(); + padding-top: lh(); + + section { + text-align: center; + width: auto; + float: none; + + a.enroll { + @include button(simple, $mit-red); + @include inline-block(); + margin-top: lh(); + font-size: 18px; + padding: lh(.5); + + &:hover { + text-decoration: none; + } + } + } + } +} diff --git a/sass/_layout.scss b/sass/_layout.scss index 4e7dd4fa42..ff82cabc80 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -69,8 +69,8 @@ html { @include box-shadow(0 1px 0 #fff); @include box-sizing(border-box); background: #fff; - border-top: 0; border: 1px solid #ccc; + border-top: 0; } img { diff --git a/sass/application.scss b/sass/application.scss index f758769c41..01300635b6 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -5,12 +5,15 @@ // Base layout @import "base-variables", "base-extends", "base"; @import "layout"; +@import "fancybox"; // pages @import "courseware"; @import "textbook"; @import "profile"; @import "wiki-create", "wiki"; +@import "index"; +@import "activation"; // left over @import "theme"; diff --git a/simplewiki_base.html.orig b/simplewiki_base.html.orig deleted file mode 100644 index 714edf5a9b..0000000000 --- a/simplewiki_base.html.orig +++ /dev/null @@ -1,177 +0,0 @@ -##This file is based on the template from the SimpleWiki source which carries the GPL license - -<%inherit file="main.html"/> - -<%block name="title">${"wiki_title"} - -<%block name="headextra"> - - - - - - - <%! - from django.core.urlresolvers import reverse - %> - - - - - - -<%block name="bodyextra"> - <%block name="wiki_head"/> - - -<%include file="navigation.html" /> - -
    -
    - <%block name="wiki_panel"> - -
    - <% - if (wiki_article is not UNDEFINED): - baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) - else: - baseURL = reverse("wiki_view", args=[""]) - %> - -
      -
    • -
      Search
      -
      -
      - -
      - - -
      -
    • -
    • - -
    • - -
    • -

      - Create Article -

      - -
      - <% - theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'" - if (wiki_article is not UNDEFINED): - baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) - else: - baseURL = reverse("wiki_view", args=[""]) - %> - -
      - -
      - -
      - - -
      - -
        - -
      • - -
      • - -
      -
      -
      -
    • -
    - -
    - - -
    -
    - %if wiki_article is not UNDEFINED: - %if wiki_article.locked: -

    This article has been locked

    - %endif -

    Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

    - %endif - - %if wiki_article is not UNDEFINED: -
      - -
    • - -
    • - -
    • - -
    • - -
    • - -
    • -
    - %endif -
    - -

    <%block name="wiki_page_title"/>

    - - <%block name="wiki_body"/> -
    -
    -
    - - diff --git a/staff.html b/staff.html deleted file mode 100644 index 3b951cac56..0000000000 --- a/staff.html +++ /dev/null @@ -1,73 +0,0 @@ -<%inherit file="main.html" /> -
    -
    -
    -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    - - - - - - - - - - - -

    About the course staff

    Anant Agarwal is Director the 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."

    Chris Terman is 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.

    Gerald Sussman is 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 -artifical intelligence, to physics and chaotic systems, to -supercomputer design.

    Piotr Mitros is 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.

    - - - -
    - -
    - -
    -
    -
    -