diff --git a/.hgignore b/.hgignore index c93aa7128d..e2ae8c91cb 100644 --- a/.hgignore +++ b/.hgignore @@ -5,3 +5,5 @@ syntax: glob *.swp *.orig *.DS_Store +#* +.#* \ No newline at end of file diff --git a/6002x-faq.html b/6002x-faq.html index 2cbe5ade4a..c33cb5e966 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -19,9 +19,10 @@ This set of questions and answers accompanies MIT’s February 13,

-What is MITx? MIT seeks through the development of MITx to improve +What is MITx?

+ +

MIT seeks through the development of MITx to improve education both on the MIT campus and around the world. -

On campus, MITx will be coupled with an Institute-wide research initiative on online teaching and learning. The online learning tools diff --git a/6002x-press-release.html b/6002x-press-release.html index 8cb394db99..439c234edd 100644 --- a/6002x-press-release.html +++ b/6002x-press-release.html @@ -70,7 +70,7 @@ be found here.

about 6.002x can be found here.

- + FAQs about MITx as a whole can be found here.

diff --git a/activation_active.html b/activation_active.html index 5b5e42478f..5f2af64c21 100644 --- a/activation_active.html +++ b/activation_active.html @@ -1,9 +1,13 @@ +<%inherit file="marketing.html" /> -<%inherit file="main.html" /> +
+

Account already active!

This account has already been activated. We will notify you as soon as the course starts.

+

For now you can go to the MITx homepage or the 6.002x course page.

+
diff --git a/activation_complete.html b/activation_complete.html index 0e13733778..f976f00239 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,9 +1,10 @@ +<%inherit file="marketing.html" /> -<%inherit file="main.html" /> - -
+
+

Activation Complete!

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

-

For now you can got to the MITx homepage or the 6.002x course page.

+

For now you can go to the MITx homepage or the 6.002x course page.

+
diff --git a/activation_invalid.html b/activation_invalid.html index 583c5d9a90..419f7a0ae6 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,9 +1,14 @@ -<%inherit file="main.html" /> -
+<%inherit file="marketing.html" /> + +
+

Activation Invalid

Something went wrong. Check to make sure the URL you went to was 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 at bugs@mitx.mit.edu.

+ +

Or you can go back to the 6.002x course page.

+
diff --git a/custom_tags b/custom_tags new file mode 120000 index 0000000000..ec1dac8fbe --- /dev/null +++ b/custom_tags @@ -0,0 +1 @@ +../data/custom_tags \ No newline at end of file diff --git a/index.html b/index.html index ff32f6a336..3cbb0bf84d 100644 --- a/index.html +++ b/index.html @@ -31,7 +31,7 @@

If you successfully complete the course, you will receive an electronic certificate of accomplishment from MITx. This certificate will indicate that you earned it from MITx’s pilot course. In this prototype version, MITx will not require that you be tested in a testing center or otherwise have your identity certified in order to receive this certificate.

-

The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on Amazon.

+

The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on Amazon.

diff --git a/login.html b/login.html index 798817047a..abf59aae74 100644 --- a/login.html +++ b/login.html @@ -1,6 +1,4 @@ -${ error } -

Log in to MITx

diff --git a/main.html b/main.html index 05d00112f5..96f2a32cd4 100644 --- a/main.html +++ b/main.html @@ -38,7 +38,7 @@ - +"> ${self.body()} <%block name="bodyextra"/> diff --git a/marketing.html b/marketing.html index f34150fcf0..9f59ef88f0 100644 --- a/marketing.html +++ b/marketing.html @@ -96,6 +96,7 @@ function postJSON(url, data, callback) {
  • Terms of Service
  • Privacy Policy
  • Honor Code
    • +
  • Help
    • diff --git a/mitx_global.html b/mitx_global.html index 4da2cf7ab5..3cc3b302e7 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -12,7 +12,7 @@
    - Watch intro video + Watch intro video
    @@ -27,7 +27,7 @@
  • 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.
    • -

    Press & links: 6.002x Press Release, 6.002x FAQ, MITx overview, Boston Globe, New York Times, MIT Press Release, MITx FAQ

    +

    Press & links: 6.002x Press Release, 6.002x FAQ, MITx overview, Boston Globe, New York Times, MIT Press Release, MITx FAQ, OpenCourseWare

    @@ -48,12 +48,32 @@
    - +
    diff --git a/mitx_help.html b/mitx_help.html new file mode 100644 index 0000000000..ab0c28a23e --- /dev/null +++ b/mitx_help.html @@ -0,0 +1,25 @@ +<%inherit file="marketing.html" /> + +
    +
    +
    +

    Help & Feedback

    +

    If run into problems signing up for the web site which you + cannot resolve on your own, you can reach us at:

    +
    +
    System-related questions
    +
    technical@mitx.mit.edu
    +
    Content-related questions
    +
    content@mitx.mit.edu
    +
    Bug reports
    +
    bugs@mitx.mit.edu
    +
    Suggestions
    +
    suggestions@mitx.mit.edu
    +
    + +

    Please bear in mind that while we read them, we do not expect to + have time to respond to all e-mails.

    +
    +
    +
    + diff --git a/sass/_activation.scss b/sass/_activation.scss index 0ec5ea837a..8ae293200e 100644 --- a/sass/_activation.scss +++ b/sass/_activation.scss @@ -1,3 +1,18 @@ +body.activation { + footer { + max-width: 600px; + text-align: center; + + p { + float: none; + } + + ul { + display: none; + } + } +} + section.activation { @extend .wrapper; @include box-shadow(0 1px 0 #fff); diff --git a/sass/_index-extends.scss b/sass/_index-extends.scss index f3e79430d8..47f16352ad 100644 --- a/sass/_index-extends.scss +++ b/sass/_index-extends.scss @@ -41,6 +41,14 @@ line-height: lh(); } } + + dl { + margin-bottom: lh(); + + dd { + margin-bottom: lh(.5); + } + } } } diff --git a/sass/_index.scss b/sass/_index.scss index d579eb8ea6..163c46305e 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -57,9 +57,6 @@ header.announcement { background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg"); } - // @media screen and (max-width: 1199px) { - // } - div { padding: lh(10) lh() lh(3); diff --git a/sass/_layout.scss b/sass/_layout.scss index 6984531ff9..e124f0f62f 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -133,49 +133,57 @@ html { max-width: 100%; height: auto; } - } - footer { - @extend .clearfix; - @extend .wrapper; - @include box-sizing(border-box); - color: #777; - margin-top: $body-line-height; - padding: 0 $body-line-height; + footer { + @extend .clearfix; + @extend .wrapper; + @include box-sizing(border-box); + color: #777; + margin-top: $body-line-height; + padding: 0 $body-line-height; - p { - float: left; - - a { - color: #444; - - &:link, &:visited { - color: #444; - } - - &:hover, &:focus { - color: #000; - } - } - } - - ul { - float: right; - - li { - display: inline-block; - margin-right: 20px; + p { + float: left; a { color: #444; - &:link, &:visited { - color: #444; - } + &:link, &:visited { + color: #444; + } - &:hover, &:focus { - color: #000; + &:hover, &:focus { + color: #000; + } } + } + + ul { + float: right; + + li { + display: inline-block; + margin-right: 20px; + + a { + color: #444; + + &:link, &:visited { + color: #444; + } + + &:hover, &:focus { + color: #000; + } + } + } + } + } + + &.activation { + footer { + ul { + display: none; } } } diff --git a/video_init.js b/video_init.js index 42dddad573..0ec2fe2e2c 100644 --- a/video_init.js +++ b/video_init.js @@ -58,15 +58,23 @@ for(var i=0; i