From fd0023448f3890f3140099f02ca25eeb9bed2f47 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Feb 2012 13:54:08 -0500 Subject: [PATCH 01/43] Added new styles for errors and added flash to show the user resubmitted the form --HG-- branch : kf-login-errors --- login.html | 1 - marketing.html | 4 +++- sass/_leanmodal.scss | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/login.html b/login.html index 601df0a4c6..a36dc2ed28 100644 --- a/login.html +++ b/login.html @@ -4,7 +4,6 @@ ${ error }

Log in to MITx

-
  1. diff --git a/marketing.html b/marketing.html index d32a24e798..91401659cc 100644 --- a/marketing.html +++ b/marketing.html @@ -122,8 +122,10 @@ $(document).ready(function(){ function(json) { if(json.success) { location.href="/courseware"; + } else if($('#login_error').length == 0) { + $('#login_form').prepend('
    Email or password is incorrect.
    '); } else { - $('#login_error').html("Invalid Login"); + $('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); } } ); diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index db8b0950f5..32b45bb7de 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -65,14 +65,17 @@ div.leanModal_box { text-align: left; div#enroll_error, div#login_error, div#pwd_error { + $error-color: #333; -webkit-font-smoothing: antialiased; - background-color: #F50200; + background-color: $error-color; + border: darken($error-color, 20%); color: #fff; + text-shadow: 0 1px 0 darken($error-color, 10%); + font-family: "Open sans"; font-weight: bold; letter-spacing: 1px; - margin-bottom: lh(); - padding: lh(.2); - text-transform: uppercase; + margin: (-(lh())) (-(lh())) lh(); + padding: lh(.5); &:empty { padding: 0; From a2f1928404e86713722da0064bac286ca10bcfb4 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Wed, 8 Feb 2012 15:49:10 -0500 Subject: [PATCH 02/43] update leanmodal scss and add feedback for reset password in profile --HG-- branch : templates_ernie_leanmodal_closebox --- profile.html | 11 +++++++---- sass/_leanmodal.scss | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/profile.html b/profile.html index c653e61a6d..422d21f2b8 100644 --- a/profile.html +++ b/profile.html @@ -72,7 +72,7 @@ $(function() { $('#pwd_reset_button').click(function() { $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", "email" : $('#id_email').val()}, function(data){ - $('#pwd_reset').html(data); + $("#password_reset_complete_link").click(); log_event("profile", {"type":"password_send"}); }); }); @@ -155,9 +155,7 @@ $(function() {

    Password change

    -

    We'll e-mail you a password reset link at ${email}. Follow - the link in the confirmation email to change your - password.

    +

    We'll e-mail a password reset link to ${email}.

    @@ -167,3 +165,8 @@ $(function() {
    +
    + +

    Password Reset Email Sent

    + An email has been sent to ${email}. Follow the link in the email to change your password. +
    diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index db8b0950f5..40471d7403 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -18,12 +18,28 @@ div.leanModal_box { background: #fff; padding: lh(2); + a.modal_close { + position: absolute; + top: 12px; + right: 12px; + display: block; + width: 14px; + height: 14px; + z-index: 2; + color: #000; + + &:hover{ + text-decoration: none; + } + } + h1 { font-size: 24px; margin-top: 0; padding-bottom: lh(); border-bottom: 1px solid #eee; margin-bottom: lh(); + text-align: left; } &#enroll { From 42b9898572deb39d1f84a98d64ecfc880062294c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Feb 2012 16:46:41 -0500 Subject: [PATCH 03/43] Edited styles for the leanmodal x --HG-- branch : templates_ernie_leanmodal_closebox --- sass/_leanmodal.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index 40471d7403..93e7216182 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -26,10 +26,12 @@ div.leanModal_box { width: 14px; height: 14px; z-index: 2; - color: #000; + color: #aaa; + font-style: normal; &:hover{ text-decoration: none; + color: $mit-red; } } From 78b198e359efb06460a37e00013ce98e00c87f94 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Feb 2012 16:49:14 -0500 Subject: [PATCH 04/43] Close templates_ernie_leanmodal_closebox --HG-- extra : close : 1 From acab3d2ee95f21083f9a229e3a485488d85c4b19 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 8 Feb 2012 18:41:48 -0500 Subject: [PATCH 05/43] Changed article creation to *not* create child articles --- simplewiki_base.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/simplewiki_base.html b/simplewiki_base.html index 2770013771..17f110bf1a 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -102,10 +102,7 @@
    <% 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=["/"]) %> From 0585fd43fed62c4d7daa154f4cec5ed903af1adb Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 8 Feb 2012 22:21:33 -0500 Subject: [PATCH 06/43] Changed editing instruction to not have wiki: shortcut, as that is incompatible right now. --- simplewiki_instructions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html index 8b579feda2..a1a7273692 100644 --- a/simplewiki_instructions.html +++ b/simplewiki_instructions.html @@ -5,7 +5,7 @@

    circuit:basic

    $LaTeX Math Expression$

    To create a new wiki article, create a link to it. Clicking the link gives you the creation page. -

    [Article Name](wiki:ArticleName)

    +

    [Article Name](/wiki/view/ArticleName)

    Other useful examples:

    [Link](http://google.com)

    Huge Header From 28d32757244da49e156f8d7cb9133e67eb611d8b Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 9 Feb 2012 11:09:59 -0500 Subject: [PATCH 07/43] Refactored html for calc and restyled --- main.html | 27 +++++++++++++----------- sass/_leanmodal.scss | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/main.html b/main.html index d0e18f0e96..05d00112f5 100644 --- a/main.html +++ b/main.html @@ -71,21 +71,24 @@

    - + - - - - - -
    Suffixes :  %kMGTcmunp
    Operations :  ^ * / + - ()
    Functions :  sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
    Constants :  e
    +
    +
    Suffixes:
    +
    %kMGTcmunp
    +
    Operations:
    +
    ^ * / + - ()
    +
    Functions:
    +
    sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
    +
    Constants
    +
    e
    + + +
    From b30dc6fed69ff42fa0e40944166fb2af1d5e87a2 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 15:09:57 -0500 Subject: [PATCH 38/43] 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 39/43] 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 40/43] 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 41/43] 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 42/43] 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 43/43] 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) {
  2. Terms of Service
  3. Privacy Policy
  4. Honor Code
    5. +
  5. Help
    6. 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 @@
  6. 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.
    7. -

    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); + } + } } }