diff --git a/activation_active.html b/activation_active.html new file mode 100644 index 0000000000..5b5e42478f --- /dev/null +++ b/activation_active.html @@ -0,0 +1,9 @@ + +<%inherit file="main.html" /> + +
+

Account already active!

+ +

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

+
diff --git a/activation_invalid.html b/activation_invalid.html index ba246ea3a1..583c5d9a90 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -2,6 +2,8 @@

Activation Invalid

-

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

+

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.

diff --git a/index.html b/index.html index 7e879ddbdb..b7abcd84e3 100644 --- a/index.html +++ b/index.html @@ -41,9 +41,9 @@

The course web site 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 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.

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

diff --git a/main.html b/main.html index ad1d7bd2de..d0e18f0e96 100644 --- a/main.html +++ b/main.html @@ -1,7 +1,7 @@ - <%block name="title">MITX 6.002 + <%block name="title">MITx 6.002 diff --git a/marketing.html b/marketing.html index d32a24e798..606fb3cb12 100644 --- a/marketing.html +++ b/marketing.html @@ -1,7 +1,7 @@ - <%block name="title">MITX 6.002 + <%block name="title">MITx 6.002 diff --git a/privacy.html b/privacy.html index 463712678b..715578b36a 100644 --- a/privacy.html +++ b/privacy.html @@ -19,10 +19,9 @@ released in a manner that is inconsistent with this policy.

through the Site and does not apply to information that we may collect from you in other ways (for example, this policy does not apply to information that you may provide to us over the phone, by fax or -through conventional mail). In addition, please note that this policy -does not apply to your educational records -- those records are protected -by the Family Educational Rights and Privacy Act ("FERPA") -with which we are committed to comply.

+through conventional mail). In addition, please note your educational +records are protected by the Family Educational Rights and Privacy Act +("FERPA") to the extent FERPA applies.

Usernames and Postings

@@ -37,16 +36,17 @@ identifiable information to those forums (or other public areas).

Please understand that by submitting any Personally Identifiable Information to us, you consent and agree that we may collect, use and disclose such Personally Identifiable Information in accordance with -this Privacy Policy and our TOS, and as permitted or required by -law. If you do not agree with these terms, then please do not provide -any Personally Identifiable Information to us. As used herein, -"Personally Identifiable Information" means your full name, -email address and your student identification number. If you refuse, -or if you choose not to provide us with any required Personally -Identifiable Information, we may not be able to provide you with the -services that can be offered on our Site.

+this Privacy Policy and our Terms of Service ("TOS"), and as +permitted or required by law. If you do not agree with these terms, +then please do not provide any Personally Identifiable Information to +us. As used herein, "Personally Identifiable Information" +means your full name, email address, your physical address (if you +provide it) and your student identification number, if applicable. If +you refuse, or if you choose not to provide us with any required +Personally Identifiable Information, we may not be able to provide you +with the services that can be offered on our Site.

-

What Information We Collect

+

Information We Collect and How We Use It

We collect information, including Personally Identifiable Information, when you sign up for a User Account, participate in @@ -103,6 +103,14 @@ with the following:

collection. +

In addition to the above situations where your information may be +shared with others, there is also the possibility that MITx +will affiliate with other educational institutions and/or +that MITx will become a (or part of a) nonprofit entity +separate from MIT. In those events, the other educational +institutions and/or separate entity will have access to the +information you provide, to the extent permitted by FERPA. +

Sharing with Third Parties

We may share the information we collect with third parties @@ -125,9 +133,9 @@ otherwise, for marketing purposes, or in any other way. If we do use your postin we will use them without your real name and e-mail (except with explicit permission), but we may use your username.

-
  • To connect you to other users of the web site. For instance, we +
  • To connect you to other users of the Site. For instance, we may recommend specific study partners, or connect potential student -mantees and mentors. In such cases, we may use all information +mentees and mentors. In such cases, we may use all information collected to determine who to connect you to, but we will only connect you by username, and not disclose your real name or e-mail address to your contact.

    @@ -170,14 +178,13 @@ data.

    Changing Our Privacy Policy

    Please note that we review our privacy practices from time to time, -and that these practices are subject to change. Any change, update, or -modification will be effective immediately upon posting on our -Site. We will notify you of any material change to this Privacy Policy -by posting a notice on our Site's homepage for a reasonable period of -time following such update, and by changing the effective date -(located at the bottom of this page). Be sure to return to this page -periodically to ensure familiarity with the most current version of -this Privacy Policy.

    +and that these practices are subject to change. We will publish notice +of any such modifications online on this page for a reasonable period +of time following such modifications, and by changing the effective +date of this Privacy Policy. By continuing to access the Site after +such changes have been posted, you signify your agreement to be bound +by them. Be sure to return to this page periodically to ensure +familiarity with the most current version of this Privacy Policy.

    Privacy Concerns

    @@ -185,6 +192,7 @@ this Privacy Policy.

    prefer to keep private, please contact us at privacy@mitx.mit.edu.

    +

    Effective Date: February 6, 2012

    • diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss index c1babea4ec..a1ff71cb0e 100644 --- a/sass/_askbot-original.scss +++ b/sass/_askbot-original.scss @@ -1014,27 +1014,27 @@ ul { font-weight: bold; font-size: 24px; } -#fmask { - margin-bottom: 30px; - width: 100%; } +// #fmask { +// margin-bottom: 30px; +// width: 100%; } -#askFormBar { - display: inline-block; - padding: 4px 7px 5px 0px; - margin-top: 0px; - p { - margin: 0 0 5px 0; - font-size: 14px; - color: #525252; - line-height: 1.4; } - .questionTitleInput { - font-size: 24px; - line-height: 24px; - height: 36px; - margin: 0px; - padding: 0px 0 0 5px; - border: #cce6ec 3px solid; - width: 725px; } } +// #askFormBar { +// display: inline-block; +// padding: 4px 7px 5px 0px; +// margin-top: 0px; +// p { +// margin: 0 0 5px 0; +// font-size: 14px; +// color: #525252; +// line-height: 1.4; } +// .questionTitleInput { +// font-size: 24px; +// line-height: 24px; +// height: 36px; +// margin: 0px; +// padding: 0px 0 0 5px; +// border: #cce6ec 3px solid; +// width: 725px; } } .ask-page div#question-list, .edit-question-page div#question-list { float: none; @@ -1075,12 +1075,12 @@ ul { color: #525252; font-size: 13px; } -.ask-page #id_tags, .edit-question-page #id_tags { - border: #cce6ec 3px solid; - height: 25px; - padding-left: 5px; - width: 395px; - font-size: 14px; } +// .ask-page #id_tags, .edit-question-page #id_tags { +// border: #cce6ec 3px solid; +// height: 25px; +// padding-left: 5px; +// width: 395px; +// font-size: 14px; } .title-desc { color: #707070; @@ -1126,8 +1126,8 @@ ul { // margin-bottom: 10px; // width: 710px; } -#id_title { - width: 100%; } +// #id_title { +// width: 100%; } // .wmd-preview { // margin: 3px 0 5px 0; @@ -2192,10 +2192,11 @@ ins { span { &.text-counter { margin-right: 20px; } - &.form-error { - color: #990000; - font-weight: normal; - margin-left: 5px; } } + // &.form-error { + // color: #990000; + // font-weight: normal; + // margin-left: 5px; } + } p.form-item { margin: 0px; } @@ -2247,11 +2248,11 @@ label.retag-error { margin-top: 10px; padding: 10px; } -span.form-error { - color: #990000; - font-size: 90%; - font-weight: normal; - margin-left: 5px; } +// span.form-error { +// color: #990000; +// font-size: 90%; +// font-weight: normal; +// margin-left: 5px; } .favorites-empty { width: 32px; diff --git a/sass/_discussion-answers.scss b/sass/_discussion-answers.scss index bb57f91789..1743b236a3 100644 --- a/sass/_discussion-answers.scss +++ b/sass/_discussion-answers.scss @@ -44,7 +44,7 @@ div.answer-block { } div.answered-by-owner { - color: darken($mit-red, 10%); + color: darken($mit-red, 20%); } } @@ -54,3 +54,19 @@ div.answer-own { padding-left: flex-grid(1.2); padding-top: 10px; } + +div.answer-actions { + text-align: right; + margin: 0; + padding: 0; + + span.sep { + color: #ddd; + } + a { + text-decoration: none; + } + a.question-edit, a.permant-link { + color: #999; + } +} diff --git a/sass/_discussion-forms.scss b/sass/_discussion-forms.scss index af758bde45..4b6098adf9 100644 --- a/sass/_discussion-forms.scss +++ b/sass/_discussion-forms.scss @@ -12,8 +12,19 @@ form.answer-form { width: 99%; } - span.form-error { - display: block; + div.form-item { + margin: 25px 0; + + label { + display: block; + margin-bottom: -5px; + } + } + + span.form-error, label.form-error { + color: #990000; + display: inline; + font-size: 90%; font-weight: bold; padding: 10px 0; } @@ -50,7 +61,24 @@ form.answer-form { } } } + input.after-editor { margin-bottom: 20px; margin-right: 10px; } + +form.question-form { + @extend .answer-form; + border: none; + padding: 0; + margin-top: -15px; + + input[type="text"] { + width: flex-grid(6); + } + + input[type="checkbox"] { + margin-top: 10px; + } +} + diff --git a/sass/_question-view.scss b/sass/_question-view.scss index 1334c21a58..1fae85f023 100644 --- a/sass/_question-view.scss +++ b/sass/_question-view.scss @@ -213,14 +213,29 @@ div.question-header { } div.comment-votes { - @include transform(rotate(-90deg)); width: 16px; a.upvote { + background: url(../images/askbot/comment-vote-up.png) no-repeat 2px; cursor: pointer; - font-size: 25px; - text-decoration: none; color: green; + display: block; + margin-bottom: 6px; + margin-top: 5px; + overflow: hidden; + text-decoration: none; + text-indent: -9999px; + width: 20px; + } + + a.upvoted { + @include border-radius(3px); + background: #D1E3A8; + color: green; + font-weight: bold; + margin-top: 10px; + padding: 2px; + text-indent: 0px; } } diff --git a/simplewiki_create.html b/simplewiki_create.html index 65ecbff4aa..a2161a22a7 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Create Article - MITX 6.002 Wiki +<%block name="title">Create Article - MITx 6.002 Wiki <%block name="wiki_page_title"> Create article diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 30e2c6ecc0..7d7a9c6bb8 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki +<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> ${ wiki_article.title } diff --git a/simplewiki_error.html b/simplewiki_error.html index f4269f1043..8b7324a998 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse %> -<%block name="title">Oops... - MITX 6.002 Wiki +<%block name="title">Oops... - MITx 6.002 Wiki <%block name="wiki_page_title"> diff --git a/simplewiki_history.html b/simplewiki_history.html index bea5a02284..87daba9f21 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki +<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%! from django.core.urlresolvers import reverse diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index 267a1f921b..c7d43dbeb5 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Search Results - MITX 6.002 Wiki +<%block name="title">Search Results - MITx 6.002 Wiki <%! from django.core.urlresolvers import reverse diff --git a/simplewiki_view.html b/simplewiki_view.html index 05243b0bc1..ef7b02d6b2 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki +<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} diff --git a/tos.html b/tos.html index 769102c026..a815ba8b1b 100644 --- a/tos.html +++ b/tos.html @@ -8,7 +8,7 @@

    Welcome to MITx. You must read and agree to these Terms of Service ("TOS"), MITx’s Privacy Policy, and Honor Code prior to -registering for this Site or using any portion of this site +registering for this site or using any portion of this site (“Site”), including accessing any course materials, chat room, mailing list, or other electronic service. These TOS, the Privacy Policy and the Honor Code are agreements (the @@ -17,13 +17,14 @@ of Technology (“MIT”). If you do not understand or do not agree to be bound by the terms of the Agreements, please immediately exit this site.

    -

    MITx reserves the right to modify these TOS at any time and will -publish notice of any such modifications online on the -Site Terms of Service page for a reasonable -period of time following such modifications, and by changing the -effective date of these TOS. By continuing to access the Site -after notice of such modifications has been published, you signify -your agreement to be bound by them.

    +

    MITx reserves the right to modify these TOS at any time and +will publish notice of any such modifications online on this page for +a reasonable period of time following such modifications, and by +changing the effective date of these TOS. By continuing to access the +Site after notice of such changes have been posted, you signify your +agreement to be bound by them. Be sure to return to this page +periodically to ensure familiarity with the most current version of +these TOS.

    Description of MITx

    @@ -98,10 +99,10 @@ name. You understand and agree that all information provided by you is accurate and current. You agree to maintain and update your information to keep it accurate and current.

    -

    We consider the confidentiality and security of your information to -be of the utmost importance. Please see -our Privacy Policy for more information -about what information about you MITx collects and how MITx uses that +

    We care about the confidentiality and security of your personal +information. Please see our Privacy +Policy for more information about what information about +you MITx collects and how MITx uses that information.

    Your Right to Use Content on the Site

    @@ -121,20 +122,22 @@ and use of that information is subject to certain rules and conditions, which will be posted along with the information. By using this Site you agree to abide by all such rules and conditions. Due to privacy concerns, User Postings shall be licensed to MITx with -the terms discussed below.

    +the terms discussed below. Please +see MITx's Copyright Page for +more information.

    User Postings

    User Postings Representations and Warranties. By -creating your User Postings, you affirm, represent, and warrant that -you are the creator and owner of or have the necessary licenses, -rights, consents, and permissions to reproduce and publish the posted -information, and to authorize MIT and MITx's Users to -reproduce, modify, publish, and otherwise use that infomation and -distribute your User Postings as necessary to exercise the licenses -granted by you below. You, and not MITx, are solely responsible -for your User Postings and the consequences of posting or publishing -them.

    +submitting or distributing your User Postings, you affirm, represent, +and warrant that you are the creator and owner of or have the +necessary licenses, rights, consents, and permissions to reproduce and +publish the posted information, and to authorize MIT and MITx's +Users to reproduce, modify, publish, and otherwise use that infomation +and distribute your User Postings as necessary to exercise the +licenses granted by you below. You, and not MITx, are solely +responsible for your User Postings and the consequences of posting or +publishing them.

    Limited License Grant to MIT. By submitting or distributing User Postings to the Site, you hereby grant to MIT a @@ -169,17 +172,35 @@ are the property of their respective owners. Nothing contained on the Site should be construed as granting, by implication, estoppel, or otherwise, any license or right to use any such Trademark displayed on the Site without the written permission of the third party that may -own the applicable Trademark. -name="id.7dd2c542f51d"> +own the applicable Trademark.

    Digital Millennium Copyright Act

    -

    It is MIT’s policy to respond to notices of alleged copyright -infringement that comply with the Digital Millennium Copyright -Act. For more information, please go to MIT’s DMCA Notification -Guidelines http://web.mit.edu/copyright/dmca-notices.html, -incorporated herein by reference.

    +

    Copyright owners who believe their material has been infringed on +the Site should contact MITx's designated copyright agent at +dcma-agent@mit.edu or at 77 Massachusetts Avenue, Cambridge, MA +02138-4307 Attention: MIT DCMA Agent, W92-263A. + +

    Notification must +include: +

    Disclaimer of Warranty / Indemnification/Limitation of Liabilities

    @@ -280,6 +301,6 @@ consent to the personal jurisdiction of and exclusive venue in the federal and state courts located in and serving Boston, Massachusetts as the legal forum for any such dispute.

    -

    Effective Date: January 30, 2012

    +

    Effective Date: February 6, 2012