From e4b1e0588f2acf4ab23b1a432f978ccfb5e062f1 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Thu, 9 Feb 2012 15:06:32 -0500 Subject: [PATCH 01/16] enable space bar to pause video --HG-- branch : templates-ernie-video-spacebar --- video_init.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/video_init.js b/video_init.js index 42dddad573..e10d85095f 100644 --- a/video_init.js +++ b/video_init.js @@ -70,3 +70,11 @@ $("#video_control").click(function(){ $(this).removeClass().addClass("play"); } }); +// space bar to pause video +$(".video-wrapper").keyup(function(e){ + active = document.activeElement; + if (e.which == 32) { + e.preventDefault(); + $("#video_control").click(); + } +}); From bb7d1615b5e86892a2a5c595796a85d159066213 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Fri, 10 Feb 2012 12:10:01 -0500 Subject: [PATCH 02/16] put video control toggle into a function --HG-- branch : templates-ernie-html5-buttontoggle --- video_init.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/video_init.js b/video_init.js index e10d85095f..0ec2fe2e2c 100644 --- a/video_init.js +++ b/video_init.js @@ -58,18 +58,18 @@ for(var i=0; i Date: Mon, 13 Feb 2012 13:52:23 -0500 Subject: [PATCH 03/16] Minor bug fixes --- 6002x-faq.html | 5 +++-- 6002x-press-release.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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.

From 89fbab77f7708482ab41b848f9c037fe70a21ee9 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 14:01:52 -0500 Subject: [PATCH 04/16] Fixed links and added them to other pages --- activation_active.html | 1 + activation_complete.html | 2 +- activation_invalid.html | 2 ++ sass/_index.scss | 7 ------- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/activation_active.html b/activation_active.html index 5b5e42478f..2861784cff 100644 --- a/activation_active.html +++ b/activation_active.html @@ -6,4 +6,5 @@

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..ff988da1c6 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -5,5 +5,5 @@

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..f8afc8233b 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -6,4 +6,6 @@ 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/sass/_index.scss b/sass/_index.scss index d579eb8ea6..0c7360f015 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -53,13 +53,6 @@ header.announcement { &.home { 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 { padding: lh(10) lh() lh(3); From 0c83d18761cf20f8a67c582031cf3b2848cb88f3 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Mon, 13 Feb 2012 14:55:28 -0500 Subject: [PATCH 05/16] switch intro video to (experimental) iframe player so closing overlay stops video, and hitting play autoplays video. still buggy if clicked within 1 second of loading page --HG-- branch : templates-ernie-global-intro-video --- mitx_global.html | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/mitx_global.html b/mitx_global.html index ee89e655f8..70fa2b7145 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -12,7 +12,7 @@
- Watch intro video + Watch intro video
@@ -48,12 +48,32 @@
- +
From b30dc6fed69ff42fa0e40944166fb2af1d5e87a2 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 15:09:57 -0500 Subject: [PATCH 06/16] Hide footer links for activation pages --- activation_active.html | 2 ++ activation_complete.html | 1 + activation_invalid.html | 2 ++ index.html | 2 ++ main.html | 2 +- sass/_activation.scss | 15 ++++++++ sass/_layout.scss | 78 ++++++++++++++++++++++------------------ 7 files changed, 66 insertions(+), 36 deletions(-) diff --git a/activation_active.html b/activation_active.html index 2861784cff..e28d0f1205 100644 --- a/activation_active.html +++ b/activation_active.html @@ -1,6 +1,8 @@ <%inherit file="main.html" /> +<%block name="bodyclass">activation +

Account already active!

diff --git a/activation_complete.html b/activation_complete.html index ff988da1c6..04878c118e 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,6 +1,7 @@ <%inherit file="main.html" /> +<%block name="bodyclass">activation

Activation Complete!

diff --git a/activation_invalid.html b/activation_invalid.html index f8afc8233b..f327fbaa67 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,4 +1,6 @@ <%inherit file="main.html" /> +<%block name="body-class">activation +

Activation Invalid

diff --git a/index.html b/index.html index ff32f6a336..a8e716d3f9 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,7 @@ <%inherit file="marketing.html" /> +<%block name="body-class">activation + <%block name="header_text">
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/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/_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; } } } From 2db960a2b3c993a717baf431367da8df0d8184ee Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 15:26:55 -0500 Subject: [PATCH 07/16] unused css class --- index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.html b/index.html index a8e716d3f9..ff32f6a336 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,5 @@ <%inherit file="marketing.html" /> -<%block name="body-class">activation - <%block name="header_text">
From 0b424b4bd8024aee53cc46671c191fa60a7a3905 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 15:40:02 -0500 Subject: [PATCH 08/16] Fixed errorn on invalid activation --- activation_invalid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activation_invalid.html b/activation_invalid.html index f327fbaa67..d2e7086592 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,5 +1,5 @@ <%inherit file="main.html" /> -<%block name="body-class">activation +<%block name="bodyclass">activation

Activation Invalid

From 06d241c5144464a6c33f02b6b6eef806c0022f6d Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 15:57:31 -0500 Subject: [PATCH 09/16] Standard forms for templates --- activation_active.html | 7 ++++--- activation_complete.html | 8 ++++---- activation_invalid.html | 7 ++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/activation_active.html b/activation_active.html index e28d0f1205..5f2af64c21 100644 --- a/activation_active.html +++ b/activation_active.html @@ -1,7 +1,7 @@ +<%inherit file="marketing.html" /> -<%inherit file="main.html" /> - -<%block name="bodyclass">activation +
+

Account already active!

@@ -9,4 +9,5 @@

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 04878c118e..f976f00239 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,10 +1,10 @@ +<%inherit file="marketing.html" /> -<%inherit file="main.html" /> - -<%block name="bodyclass">activation -
+
+

Activation Complete!

Thanks for activating your email. 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_invalid.html b/activation_invalid.html index d2e7086592..419f7a0ae6 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,7 +1,7 @@ -<%inherit file="main.html" /> -<%block name="bodyclass">activation +<%inherit file="marketing.html" /> -
+
+

Activation Invalid

Something went wrong. Check to make sure the URL you went to was @@ -10,4 +10,5 @@ at bugs@mitx.mit.edu.

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

+
From 4cd5720abaa379307076d0ba9b46c089ea77212a Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 16:16:25 -0500 Subject: [PATCH 10/16] Removed obsolete error code -- now AJAX --- login.html | 2 -- 1 file changed, 2 deletions(-) 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

From 872b2af4c94ee13b0b903ab7df2fe8ac05948881 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 16:32:15 -0500 Subject: [PATCH 11/16] Added help page for outside the app, link to help in footer and Opencourseware link --- marketing.html | 1 + mitx_global.html | 2 +- mitx_help.html | 24 ++++++++++++++++++++++++ sass/_index-extends.scss | 8 ++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 mitx_help.html 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 6c8449da81..3cc3b302e7 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -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

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

    Help & Feedback

    +

    If run into any problems, we have several e-mail addresses set up:

    +
    +
    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/_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); + } + } } } From 31c63455e1a1c70c9c07094f2d62f26e9119a3c1 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 16:42:38 -0500 Subject: [PATCH 12/16] Slightly better text --- mitx_help.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mitx_help.html b/mitx_help.html index e67fd1255d..ab0c28a23e 100644 --- a/mitx_help.html +++ b/mitx_help.html @@ -4,7 +4,8 @@

    Help & Feedback

    -

    If run into any problems, we have several e-mail addresses set up:

    +

    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
    From 647407ad45a2c25ac5e7b801d2f27fec5aa68ff9 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 17:20:33 -0500 Subject: [PATCH 13/16] hg ignore update --- .hgignore | 2 ++ 1 file changed, 2 insertions(+) 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 From 56858e6498ec855f3b5921e8f710f1f8f24d4ae4 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 18:42:13 -0500 Subject: [PATCH 14/16] Undid Kyle's Chrome bug fix, since it resulted in worse Firefox bugs --- sass/_index.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sass/_index.scss b/sass/_index.scss index 0c7360f015..d579eb8ea6 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -53,6 +53,13 @@ header.announcement { &.home { 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 { padding: lh(10) lh() lh(3); From e3e1a37bc27d0876e0a0b204eef22df98a1ebe7c Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 20:24:08 -0500 Subject: [PATCH 15/16] Missed commit for custom tags --- custom_tags | 1 + 1 file changed, 1 insertion(+) create mode 120000 custom_tags 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 From 48650b131b97634ad621bbfb0deb9dc30f3e1383 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 14 Feb 2012 11:31:23 -0500 Subject: [PATCH 16/16] Changed amazon link --- index.html | 2 +- sass/_index.scss | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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/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);