+This set of questions and answers accompanies MIT’s February 13, +2012, announcement regarding MITx’s prototype course — +6.002x: Circuits and Electronics. +
+ +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. +
+ ++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. +
+ ++To enroll, visit http://mitx.mit.edu +and sign up. +
+ ++6.002x will become available online on Monday, March 5. +
+ ++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. +
+ ++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. +
+ ++There are four instructors for 6.002x: Anant Agarwal, Chris Terman, +Gerald Sussman and Piotr Mitros. The team also includes several +teaching assistants (TAs). +
+ ++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. +
+ ++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. +
+ ++Yes. 6.002x will offer modest support for collaborative work through a +prototype wiki and discussion forum. +
+ ++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 +an AP or college-level physics course in electricity and +magnetism. 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. +
+ ++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. +
+ ++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. +
+ ++MITx courses will use automated technologies to check student work +including practice exercises, homework assignments, labs and exams. +
+ ++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. +
+ ++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. +
+ ++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. +
+ ++ Additional courses will be announced + on mitx.mit.edu as they become + available. We expect this will happen in fall 2012. +
+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. +
+ ++Enrollment in 6.002x is limited, and registrations will be taken on a +first-come, first-served basis. Further courses are expected to become +available beginning in the fall. +
+ + ++ + 6.002x FAQ + +
+ ++MITx; students; education, teaching, academics; innovation and +invention; faculty; mit administration; learning; electrical +engineering and computer science; csail +
+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.
@@ -102,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/marketing.html b/marketing.html index e941ab38fe..84e5b50666 100644 --- a/marketing.html +++ b/marketing.html @@ -100,7 +100,6 @@ function postJSON(url, data, callback) { % if settings.COURSEWARE_ENABLED:Education has entered an era of rapid, exciting, +technology-enabled change. At MIT, we welcome the opportunity to +harness the power of on-line technology for our students and for the +world. On December 19, 2011, we announced MITx, an initiative to +offer exciting, challenging, and enriching courses to anyone, +anywhere, who has the motivation and ability to engage MIT’s +educational content.
+ +Ten years ago, MIT +launched OpenCourseware, +which places online the course materials for substantially the entire +MIT curriculum, and was the genesis of today’s worldwide +movement in free, open educational resources. MITx is the next step +in opening MIT’s educational doors to the world. Through OCW and +MITx, MIT invites the world to join it in the passion, hard work, and +thrill of learning and discovery.
+ +MITx students who demonstrate their mastery of a subject can earn +a certificate of completion awarded by MITx.
+ +MITx courses will be available to the world through an Internet +platform that MIT will make freely available. MIT hopes that other +educational institutions, anywhere in the world, will adapt and use +the platform to publish their own educational content online for the +benefit of learners. Because the platform will be open-source and +scalable, adopters and users can continuously improve it, for the +benefit of everyone.
+ +Excellence in teaching and learning. MIT must always provide its +students the very best teaching and learning tools possible. MIT +began experimenting with online technologies in its educational +programs long before we launched OCW in 2001. We have only increased +our emphasis in recent years, as several MIT committees have studied +how MIT might enhance the learning experience of its students and +expand its impact worldwide through new online offerings.
+ +These efforts, combined with those of numerous individual MIT +faculty members, confirmed MIT’s conviction that digital +technologies enrich learning. Many other innovative institutions and +enterprises believe the same and are bringing creative online +offerings forward. Having brain-stormed, investigated, and studied, +we were ready to act and eager to start. We announced our MITx +aspiration to capture and encourage the energy of our faculty in +creating new online teaching and learning tools.
+ +Once up and running, MITx will be a laboratory for online +learning. Whether MITx learners are MIT’s on-campus students, +university students elsewhere, or independent learners, MITx will help +us understand how online learning occurs and how virtual communities +of learners assemble -- information that in turn will allow us to +improve both MITx and our on-campus teaching.
+ +Access to higher education. MITx will help shatter barriers to +education. The constraints of MIT’s physical campus allow us to +admit less than 10 percent of our undergraduate applicants. We teach +on-campus only a tiny fraction of the people in the world with the +ability and motivation to learn MIT content. Online technology +provides a new and different portal into MIT-quality education. +Through MITx, MIT educational content can reach, augment, and enrich +the education and livelihood of many learners who cannot attend +MIT.
+ +MITx does not provide a full MIT education. Our residential +campus is the heart of MIT’s knowledge creation and +dissemination. MIT students enjoy a comprehensive curriculum and +distinct educational environment. Without MIT, there would be no +MITx.
+ +Advancing the public good. MITx is an opportunity to help +preserve and expand higher education as a public good. Historically, +the investment of public and private assets in enormous amounts has +produced the public benefits of knowledge creation and dissemination, +leading to capable citizens, innovation, job creation, economic +development, and broader welfare.
+ +Today, as computation and Internet technologies enable higher +education to migrate online, MIT sees the opportunity to democratize +education with unprecedented efficiency and scalability. We possess a +strong desire and feel a compelling obligation to offer a +not-for-profit, mission-driven, open-technology approach to online +learning. MITx is our contribution.
+ +Press & links: 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,
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_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/_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 4e4fe8e3fa..2d3f911633 100644 --- a/sass/_index-extends.scss +++ b/sass/_index-extends.scss @@ -14,6 +14,10 @@ > div { padding-left: flex-grid(4) + flex-gutter(); + @media screen and (max-width: 940px) { + padding-left: 0; + } + p { margin-bottom: lh(); } 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/_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_instructions.html b/simplewiki_instructions.html index a1a7273692..8b579feda2 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/view/ArticleName)
+[Article Name](wiki:ArticleName)
Other useful examples:[Link](http://google.com)
Huge Header