diff --git a/6002x-faq.html b/6002x-faq.html new file mode 100644 index 0000000000..c33cb5e966 --- /dev/null +++ b/6002x-faq.html @@ -0,0 +1,261 @@ +<%inherit file="marketing.html" /> +<%block name="login_area"> + + +
+
+ +

+More about 6.002x +

+ +

Answering common questions about the first course on MITx, the +Institute’s online-learning initiative.

+ +

+This set of questions and answers accompanies MIT’s February 13, +2012, announcement regarding MITx’s prototype course — +6.002x: Circuits and Electronics. +

+ +

+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 +that MITx develops will benefit the educational experience of +residential students by supplementing and reinforcing the classroom +and laboratory experiences.

+ +

+Beyond the MIT campus, MITx will endeavor to break down barriers to +education in two ways. First, it will offer the online teaching of MIT +courses to people around the world and the opportunity for able +learners to gain certification of mastery of MIT material. Second, it +will make freely available to educational institutions everywhere the +open-source software infrastructure on which MITx courses are based. +

+ +

+Since it launched OpenCourseWare 10 years ago, MIT has been committed +to using technology to improve and greatly widen access to +education. The launch of MITx represents a next step forward in that +effort. +

+ +

+What is 6.002x, and how is it different from the on-campus version of +6.002? +

+ +

+At MIT, each course is assigned a number. All courses in the +Department of Electrical Engineering and Computer Science (EECS) start +with the number 6, and 6.002 (also known as Circuits and Electronics) +is one of the introductory courses for EECS +undergraduates. MITx’s 6.002x is modeled on the on-campus +version of 6.002. +

+ +

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

+ +

+6.002x is built on the content created collaboratively by MIT +professors Anant Agarwal and Jeffrey H. Lang for 6.002. +

+ +

+How do I enroll in 6.002x? +

+

+To enroll, visit http://mitx.mit.edu +and sign up. +

+ +

+When will the course be available online? +

+ +

+6.002x will become available online on Monday, March 5. +

+ +

+Do I need to follow a set timeline in completing 6.002x? +

+ +

+In this pilot course of MITx, learners seeking a certificate will have +weekly deadlines for homework and labs. Similarly, the midterm and +final exam will be given within a specific range of days. However, +faster-paced learners can proceed multiple weeks ahead if they choose. +

+ +

+How much time is required to complete the course? +

+

+Students should expect to spend approximately 10 hours per week on the +course. However, the time taken by individual students might vary +considerably depending on background and skill. +

+ +

+Who are the instructors for 6.002x? +

+

+There are four instructors for 6.002x: Anant Agarwal, Chris Terman, +Gerald Sussman and Piotr Mitros. The team also includes several +teaching assistants (TAs). +

+ +

+What is the work like in 6.002x? +

+

+Students taking 6.002x will have weekly video lectures, readings from +the textbook, practice exercises and homework; design and laboratory +exercises are also significant components of the course. The course +will also provide additional tutorial material. There will be a +midterm and a final exam. An interactive laboratory playground will +also be made available for students to experiment creatively. +

+ +

+In general, for any given week, learners are expected to work through +a couple of lecture sequences containing a few videos (each 5 to 10 +minutes in length) and a few interactive practice exercises. Learners +can also read appropriate parts of the textbook linked to the +videos. Lab and homework exercises will round out the week. Tutorials +are also provided as additional reference material. +

+ +

+What if I have a question during the course? +

+

+The course will include a discussion forum for learners to ask +questions, to post answers, and for discussions. Several helpful +documents, FAQs, tutorials and videos on using the various components +of the course will also be provided. +

+ +

+Will 6.002x offer any means for collaboration among online learners? +

+

+Yes. 6.002x will offer modest support for collaborative work through a +prototype wiki and discussion forum. +

+ +

+Are there prerequisites to take the course? +

+

+While MITx courses are open to all, there are some skills required to +succeed in taking the course. +

+ +

+In 6.002x, students are encouraged to have the knowledge obtained from +a college-level physics course in electricity and +magnetism (or from an advanced secondary-education course in electricity and magnetism, as with an Advanced Placement course in the United States). Students must know basic calculus and linear algebra, and +have some basic background in 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. +

+ +

+How much does the course cost? +

+

+All of the courses on MITx will be free of charge. Those who have the +ability and motivation to demonstrate mastery of content can receive a +credential for a modest fee. For this prototype course, the fee for a +credential will be waived. +

+ +

+What is a credential? +

+

+Any learner who successfully completes 6.002x will receive an +electronic certificate indicating a grade. 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. +

+ +

+Who is grading the course? +

+

+MITx courses will use automated technologies to check student work +including practice exercises, homework assignments, labs and exams. +

+ +

+What is a passing grade? +

+

+Grading schemes for each course will be announced with the +course. 6.002x will be graded on an absolute scale. The components +affecting a student’s grade and the grade thresholds will be +posted on the course website when the course comes online. +

+ +

+Do I need to buy a textbook? +

+

+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. Relevant sections will be +provided electronically as part of the online course. While the +textbook is recommended, it is not required. The electronic text is +provided 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. +

+ +

+Do I need to have special software to access 6.002x? +

+

+No, you do not need special software to access 6.002x, as you will +access the online interactive course through your browser. The course +website 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 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. +

+ +

+When will the next courses become available and what topics will they be on? +

+

+ Additional courses will be announced + on mitx.mit.edu as they become + available. We expect this will happen in fall 2012. +

+
+
diff --git a/6002x-press-release.html b/6002x-press-release.html new file mode 100644 index 0000000000..439c234edd --- /dev/null +++ b/6002x-press-release.html @@ -0,0 +1,130 @@ +<%inherit file="marketing.html" /> +<%block name="login_area"> + + +
+
+ +

MITx prototype course opens for enrollment—Online-learning +initiative’s first offering, ‘6.002x: Circuits and +Electronics,’ accepting registrants now.

+ +

MIT News Office

+ +

In December, +MIT announced the +launch of an online learning initiative called “MITx.” +Starting this week, interested learners can now enroll for free in the +initiative”s prototype course -- 6.002x: Circuits and +Electronics.

+ +

Students can sign up for the course +at mitx.mit.edu. The course will +officially begin on March 5 and run through June 8.

+ +

Modeled after MIT’s 6.002 — an introductory course for +undergraduate students in MIT’s Department of Electrical +Engineering and Computer Science (EECS) — 6.002x will introduce +engineering in the context of the lumped circuit abstraction, helping +students make the transition from physics to the fields of electrical +engineering and computer science. It will be taught by Anant Agarwal, +EECS professor and director of MIT's Computer Science and +Artificial Intelligence Laboratory (CSAIL); Chris Terman, CSAIL +co-director; EECS Professor Gerald Sussman; and CSAIL Research +Scientist Piotr Mitros.

+ +
+

+ “We are very excited to begin MITx with this prototype + class,” says MIT Provost L. Rafael Reif. “We will use + this prototype course to optimize the tools we have built by + soliciting and acting on feedback from learners.” +

+
+ +

+To access the course, registered students will log in +at mitx.mit.edu, where they will +find a course schedule, an e-textbook for the course, and a discussion +board. Each week, students will watch video lectures and +demonstrations, work with practice exercises, complete homework +assignments, and participate in an online interactive lab specifically +designed to replicate its real-world counterpart. Students will also +take exams and be able to check their grades as they progress in the +course. Overall, students can expect to spend approximately 10 hours +each week on the course. +

+ +
+“We invite you to join us for this pilot course of MITx,” +Agarwal says. “The 6.002x team of professors and teaching +assistants is excited to work with you on the discussion forum, and we +look forward to your feedback to improve the learning +experience.” +
+ +

A video introduction to 6.002x can +be found here.

+ +

A set of Frequently Asked Questions +about 6.002x can be found here.

+ +

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

+ +

+At the end of the prototype course, students who demonstrate their +mastery will be able to receive a certificate of completion for +free. In future MITx courses, students who complete the mastery +requirement on MITx will be able to receive the credential for a +modest fee. +

+ +

+Further courses are expected to become +available beginning in the fall. +

+ + +

+RELATED: +

+

+ + 6.002x course website + +

+ +

+ + 6.002x FAQ + +

+ +

+ARCHIVE: "MIT launches online learning initiative" +

+ +http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html + + +

+MITx website +

+ +http://mitx.mit.edu + + + +
+
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 c74af930d5..f976f00239 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,8 +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 go to the MITx homepage or the 6.002x course page.

+
diff --git a/activation_email.txt b/activation_email.txt index d61da883a2..0bd636428c 100644 --- a/activation_email.txt +++ b/activation_email.txt @@ -1,4 +1,4 @@ -Someone, hopefully you, signed up for an account for MIT's on-line +Someone, hopefully you, signed up for an account for MITx's on-line offering of 6.002 using this email address. If it was you, and you'd like to activate and use your account, copy and paste this address into your web browser's address bar: diff --git a/activation_email_subject.txt b/activation_email_subject.txt index bbe04cd341..00231fa8b1 100644 --- a/activation_email_subject.txt +++ b/activation_email_subject.txt @@ -1 +1 @@ -Your account for MIT's on-line 6.002 +Your account for MITx's on-line 6.002 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/create_account.html b/create_account.html index 0b15a323e2..e50c26d748 100644 --- a/create_account.html +++ b/create_account.html @@ -1,7 +1,7 @@
-

Enroll in 6.002 Circuits & Electronics

+

Enroll in 6.002x Circuits & Electronics

<% if 'error' in locals(): e = error %> @@ -11,26 +11,26 @@
  • - +
  • - +
    Nickname you'd like to use on forums.
  • - - + + -
    If you would like us to give you a certificate of completion at the end, we need your full legal name, as you would like it to appear on the certificate (e.g. "John Smith, Jr").
    +
    If you successfully complete the course, you will receive an electronic certificate of accomplishment from MITx with this name on it.
  • @@ -49,16 +49,17 @@
  • - +
  • + I agree to the Honor Code, summarized as:*
      +
    • Complete all mid-terms and final exams with only my own work.
    • +
    • Maintain only one account, and not share the username or password.
    • 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.
    • +
    • Not post answers to problems that are being used to assess student performance.
  • diff --git a/index.html b/index.html index b7abcd84e3..ff32f6a336 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ -<%inherit file="marketing.html" /> +<%inherit file="marketing.html" /> <%block name="header_text">
    @@ -7,9 +7,10 @@

    6.002x

    Enroll in 6.002x Circuits & Electronics
    -

    6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT’s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 1, 2012 through June 8, 2012.

    +

    6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT’s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 5, 2012 through June 8, 2012.

    + <%block name="header_class">course
    @@ -101,7 +102,7 @@ $(function() { if(json.success) { $('#enroll').html(json.value); } else { - $('#enroll_error').html(json.value); + $('#enroll_error').html(json.value).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); } } ); diff --git a/login.html b/login.html index 601df0a4c6..abf59aae74 100644 --- a/login.html +++ b/login.html @@ -1,10 +1,11 @@ -${ error } -
    -

    Log in to MITx

    +
    +

    Log in to MITx

    + +
    + -
    1. diff --git a/main.html b/main.html index d0e18f0e96..96f2a32cd4 100644 --- a/main.html +++ b/main.html @@ -38,7 +38,7 @@ - +"> ${self.body()} <%block name="bodyextra"/> @@ -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
      + + +
      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/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/registration/activation_email.txt b/registration/activation_email.txt deleted file mode 100644 index b594cd22d3..0000000000 --- a/registration/activation_email.txt +++ /dev/null @@ -1,6 +0,0 @@ -{% load humanize %} -Someone, hopefully you, signed up for a new account at djangoproject.com using this email address. If it was you, and you'd like to activate and use your account, click the link below or copy and paste it into your web browser's address bar: - -http://127.0.0.1:8000/accounts/activate/{{ activation_key }}/ - -If you didn't request this, you don't need to do anything; you won't receive any more email from us, and the account will expire automatically in {{ expiration_days|apnumber }} days. diff --git a/registration/activation_email_subject.txt b/registration/activation_email_subject.txt deleted file mode 100644 index 8ec5ec4413..0000000000 --- a/registration/activation_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Activate your djangoproject.com account - you have {{ expiration_days }} days! diff --git a/registration/password_reset_confirm.html b/registration/password_reset_confirm.html index dea7e8a2d3..fa9538f0e7 100644 --- a/registration/password_reset_confirm.html +++ b/registration/password_reset_confirm.html @@ -18,7 +18,7 @@

    Password reset unsuccessful

    -

    The password reset link was invalid, possibly because it has already been used. Please request a new password reset.

    +

    The password reset link was invalid, possibly because the link has already been used. Please request a new password reset.

    {% endif %} diff --git a/registration/password_reset_email.html b/registration/password_reset_email.html index 7f8cdbe927..d5c4da23c1 100644 --- a/registration/password_reset_email.html +++ b/registration/password_reset_email.html @@ -3,7 +3,7 @@ {% trans "Please go to the following page and choose a new password:" %} {% block reset_link %} -https://6002x.mitx.mit.edu{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %} +{{ protocol }}://{{ site_name }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.username }} 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/_base-extends.scss b/sass/_base-extends.scss index c8c5e4b687..93ef00dd3f 100644 --- a/sass/_base-extends.scss +++ b/sass/_base-extends.scss @@ -19,6 +19,13 @@ } } +h1.top-header { + margin: (-(lh())) (-(lh())) lh(); + padding: lh(); + background: #f3f3f3; + border-bottom: 1px solid #e3e3e3; +} + .button { @include box-shadow(inset 0 1px 0 lighten(#888, 10%), 0 0 3px #ccc); @include linear-gradient(lighten(#888, 5%), darken(#888, 5%)); diff --git a/sass/_discussion-answers.scss b/sass/_discussion-answers.scss index 1743b236a3..17e1df160f 100644 --- a/sass/_discussion-answers.scss +++ b/sass/_discussion-answers.scss @@ -44,7 +44,11 @@ div.answer-block { } div.answered-by-owner { - color: darken($mit-red, 20%); + color: $mit-red; + + div.comments-container { + color: #555; + } } } @@ -65,6 +69,7 @@ div.answer-actions { } a { text-decoration: none; + cursor: pointer; } a.question-edit, a.permant-link { color: #999; diff --git a/sass/_discussion.scss b/sass/_discussion.scss index 844b1b307f..58250f9b73 100644 --- a/sass/_discussion.scss +++ b/sass/_discussion.scss @@ -123,6 +123,7 @@ body.askbot { aside { @extend .sidebar; @include box-shadow(inset 1px 0 0 #f6f6f6); + @include border-radius(0 4px 4px 0); border-left: 1px solid #d3d3d3; border-right: 1px solid #f6f6f6; padding: $gw-gutter; @@ -148,18 +149,18 @@ body.askbot { } } - footer { - margin: 0 auto; - padding: 0; + // footer { + // margin: 0 auto; + // padding: 0; - div.footer-wrapper { - @extend .clearfix; - @extend .wrapper; - @include box-shadow(0 1px 0 #fff); - @include box-sizing(border-box); - background-color: #000; - border-top: 0; - padding: $gw-gutter/2; - } - } + // div.footer-wrapper { + // @extend .clearfix; + // @extend .wrapper; + // @include box-shadow(0 1px 0 #fff); + // @include box-sizing(border-box); + // background-color: #000; + // border-top: 0; + // padding: $gw-gutter/2; + // } + // } } diff --git a/sass/_index-extends.scss b/sass/_index-extends.scss index 15187b73e4..47f16352ad 100644 --- a/sass/_index-extends.scss +++ b/sass/_index-extends.scss @@ -14,8 +14,13 @@ > div { padding-left: flex-grid(4) + flex-gutter(); + @media screen and (max-width: 940px) { + padding-left: 0; + } + p { margin-bottom: lh(); + line-height: lh(); } h1 { @@ -33,6 +38,15 @@ li { list-style: disc outside none; + line-height: lh(); + } + } + + dl { + margin-bottom: lh(); + + dd { + margin-bottom: lh(.5); } } } @@ -47,20 +61,22 @@ } .button { - @include border-radius(3px); @include border-radius(3px); @include inline-block(); @include transition(); background-color: $mit-red; + border: 1px solid darken($mit-red, 10%); color: #fff; margin: lh() 0 lh(.5); padding: lh(.25) lh(.5); text-decoration: none; font-style: normal; + @include box-shadow(inset 0 1px 0 lighten($mit-red, 8%)); -webkit-font-smoothing: antialiased; &:hover { background-color: darken($mit-red, 10%); + border-color: darken($mit-red, 20%); } span { diff --git a/sass/_index.scss b/sass/_index.scss index 44c138d530..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); @@ -167,13 +160,16 @@ header.announcement { a { @extend .button; + @include box-shadow(inset 0 1px 0 darken($mit-red, 10%), 0 1px 0 lighten($mit-red, 5%)); background-color: darken($mit-red, 20%); display: block; padding: lh(.5) lh(); + border-color: darken($mit-red, 30%); text-align: center; &:hover { background-color: darken($mit-red, 10%); + border-color: darken($mit-red, 20%); } } } @@ -410,11 +406,12 @@ section.index-content { &.cta { width: 100%; + text-align: center; a.enroll { @extend .button; - padding: lh(.5) lh(); - display: block; + padding: lh(.5) lh(2); + @include inline-block(); text-align: center; font: 800 18px $header-font-family; } diff --git a/sass/_info.scss b/sass/_info.scss index 687608d0a2..9f0762cd59 100644 --- a/sass/_info.scss +++ b/sass/_info.scss @@ -3,37 +3,88 @@ div.info-wrapper { section.updates { @extend .content; - } - section.handouts { - @extend .sidebar; - @include border-radius(0px 4px 0px 4px); - border-right: 0; - border-left: 1px solid #d3d3d3; + > h1 { + @extend .top-header; + } - h1 { - padding: 0 lh(); + > p { + margin-bottom: lh(); } ol { list-style: none; li { + padding-bottom: lh(.5); + margin-bottom: lh(.5); + @extend .clearfix; + border-bottom: 1px solid #e3e3e3; + h2 { - padding: 0 lh(); + float: left; + width: flex-grid(2, 9); + margin: 0 flex-gutter() 0 0; + } + + p { + float: left; + width: flex-grid(7, 9); + margin-bottom: 0; + } + } + } + } + + section.handouts { + @extend .sidebar; + @include border-radius(0 4px 4px 0); + border-right: 0; + border-left: 1px solid #d3d3d3; + + h1 { + padding: 0 lh(); + font-size: 18px; + } + + ol { + list-style: none; + + li { + @include box-shadow(0 1px 0 #eee); + border-bottom: 1px solid #d3d3d3; + @extend .clearfix; + + p { + padding: 7px lh(); + margin: 0; + text-transform: none; + letter-spacing: 0; + font-size: $body-font-size; + + &:hover { + background: #efefef; + } + + a { + display: inline; + padding: 0; + + &:hover { + text-decoration: underline; + background: none; + } + } } a { - @include box-shadow(0 1px 0 #eee); @include transition(); - border-bottom: 1px solid #d3d3d3; color: lighten($text-color, 10%); display: block; padding: 7px lh(); text-decoration: none; &:hover { - @include box-shadow(0 1px 0 #fff); background: #efefef; } } 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/sass/_leanmodal.scss b/sass/_leanmodal.scss index db8b0950f5..9e754377e2 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -18,12 +18,30 @@ 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: #aaa; + font-style: normal; + + &:hover{ + text-decoration: none; + color: $mit-red; + } + } + h1 { font-size: 24px; margin-top: 0; padding-bottom: lh(); border-bottom: 1px solid #eee; margin-bottom: lh(); + text-align: left; } &#enroll { @@ -65,14 +83,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; @@ -139,6 +160,18 @@ div.leanModal_box { div#login { min-width: 400px; + header { + border-bottom: 1px solid #ddd; + margin-bottom: lh(); + padding-bottom: lh(); + + h1 { + border-bottom: 0; + padding-bottom: 0; + margin-bottom: lh(.25); + } + } + ol { li { width: auto; @@ -184,3 +217,53 @@ div#feedback_div{ } } } + +div#calculator_div { + max-width: 500px; + + + form { + padding-bottom: lh(); + margin-bottom: lh(); + border-bottom: 1px solid #ddd; + + input#calculator_input { + width: 400px; + } + + input#calculator_button { + background: 0; + color: $mit-red; + border: 0; + @include box-shadow(none); + padding: 0; + text-shadow: none; + + &:hover { + color: #333; + } + } + + input#calculator_output { + border: 0; + background: 0; + padding: lh(.35); + width: 60px; + font-size: 24px; + font-weight: bold; + } + } + + dl { + dt { + float: left; + clear: both; + padding-right: lh(.5); + font-weight: bold; + } + + dd { + float: left; + } + } +} diff --git a/sass/_profile.scss b/sass/_profile.scss index b383c61a85..68a93cf73f 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -9,7 +9,8 @@ div.profile-wrapper { border-right: 0; h1 { - padding: lh(); + padding:0 lh(); + font-size: 18px; } ul { @@ -52,6 +53,10 @@ div.profile-wrapper { section.course-info { @extend .content; + > h1 { + @extend .top-header; + } + ol { list-style: none; 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=["/"]) %>
    diff --git a/tos.html b/tos.html index a815ba8b1b..42bab7a235 100644 --- a/tos.html +++ b/tos.html @@ -215,7 +215,8 @@ risk. Your access to or download of information, materials, or data through the Site or any reference sites is at your own discretion and risk and that you will be solely responsible for any damage to your property (including your computer system) or loss of data that results -from the download or use of such material or data.

    +from the download or use of such material or data. We may close or +limit enrollment for pedagogical or technological reasons.

    User Postings Disclaimer. You understand that when using the Site you will be exposed to User Postings from a variety of @@ -301,6 +302,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: February 6, 2012

    +

    Effective Date: February 10, 2012

    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