diff --git a/common/djangoapps/student/management/commands/6002exportusers.py b/common/djangoapps/student/management/commands/6002exportusers.py new file mode 100644 index 0000000000..0ea458408c --- /dev/null +++ b/common/djangoapps/student/management/commands/6002exportusers.py @@ -0,0 +1,61 @@ +## +## One-off script to export 6.002x users into the edX framework +## +## Could be modified to be general by: +## * Changing user_keys and up_keys to handle dates more cleanly +## * Providing a generic set of tables, rather than just users and user profiles +## * Handling certificates and grades +## * Handling merge/forks of UserProfile.meta + + +import datetime +import json + +import os.path + +from lxml import etree + +from django.core.management.base import BaseCommand +from django.conf import settings +from django.contrib.auth.models import User + +from student.models import UserProfile + +import mitxmako.middleware as middleware + +middleware.MakoMiddleware() + +class Command(BaseCommand): + help = \ +'''Exports all users and user profiles. +Caveat: Should be looked over before any run +for schema changes. + +Current version grabs user_keys from +django.contrib.auth.models.User and up_keys +from student.userprofile. ''' + def handle(self, *args, **options): + users = list(User.objects.all()) + user_profiles = list(UserProfile.objects.all()) + user_profile_dict = dict([(up.user_id, up) for up in user_profiles]) + + user_tuples = [(user_profile_dict[u.id], u) for u in users if u.id in user_profile_dict] + + user_keys = ['id', 'username', 'email', 'password', 'is_staff', + 'is_active', 'is_superuser', 'last_login', 'date_joined', + 'password'] + up_keys = ['language', 'location','meta','name', 'id','user_id'] + + def extract_dict(keys, object): + d = {} + for key in keys: + item = object.__getattribute__(key) + if type(item) == datetime.datetime: + item = item.isoformat() + d[key] = item + return d + + extracted = [{'up':extract_dict(up_keys, t[0]), 'u':extract_dict(user_keys, t[1])} for t in user_tuples] + fp = open('transfer_users.txt', 'w') + json.dump(extracted, fp) + fp.close() diff --git a/common/djangoapps/student/management/commands/6002importusers.py b/common/djangoapps/student/management/commands/6002importusers.py new file mode 100644 index 0000000000..e6d801edb5 --- /dev/null +++ b/common/djangoapps/student/management/commands/6002importusers.py @@ -0,0 +1,66 @@ +## +## One-off script to import 6.002x users into the edX framework +## See export for more info + + +import datetime +import json + +import dateutil.parser + +import os.path + +from lxml import etree + +from django.core.management.base import BaseCommand +from django.conf import settings +from django.contrib.auth.models import User + +from student.models import UserProfile + +import mitxmako.middleware as middleware + +middleware.MakoMiddleware() + +def import_user(u): + user_info = u['u'] + up_info = u['up'] + + # HACK to handle dates + user_info['last_login'] = dateutil.parser.parse(user_info['last_login']) + user_info['date_joined'] = dateutil.parser.parse(user_info['date_joined']) + + user_keys = ['id', 'username', 'email', 'password', 'is_staff', + 'is_active', 'is_superuser', 'last_login', 'date_joined', + 'password'] + up_keys = ['language', 'location','meta','name', 'id','user_id'] + + + u = User() + for key in user_keys: + u.__setattr__(key, user_info[key]) + u.save() + + up = UserProfile() + up.user = u + for key in up_keys: + up.__setattr__(key, up_info[key]) + up.save() + +class Command(BaseCommand): + help = \ +'''Exports all users and user profiles. +Caveat: Should be looked over before any run +for schema changes. + +Current version grabs user_keys from +django.contrib.auth.models.User and up_keys +from student.userprofile. ''' + def handle(self, *args, **options): + extracted = json.load(open('transfer_users.txt')) + n=0 + for u in extracted: + import_user(u) + if n%100 == 0: + print n + n = n+1 diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 7d521931a2..9d2ea93049 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -254,8 +254,7 @@ def create_account(request, post_override=None): int(post_vars['date_of_birth__day'])) up.save() - - # TODO (vshnayder): the LMS should probably allow signups without a particular course too + d = {'name': post_vars['name'], 'key': r.activation_key, } diff --git a/common/djangoapps/track/middleware.py b/common/djangoapps/track/middleware.py index 6905ae86f3..3beabeb690 100644 --- a/common/djangoapps/track/middleware.py +++ b/common/djangoapps/track/middleware.py @@ -12,8 +12,32 @@ class TrackMiddleware: if request.META['PATH_INFO'] in ['/event', '/login']: return - event = { 'GET' : dict(request.GET), - 'POST' : dict(request.POST)} + # Removes passwords from the tracking logs + # WARNING: This list needs to be changed whenever we change + # password handling functionality. + # + # As of the time of this comment, only 'password' is used + # The rest are there for future extension. + # + # Passwords should never be sent as GET requests, but + # this can happen due to older browser bugs. We censor + # this too. + # + # We should manually confirm no passwords make it into log + # files when we change this. + + censored_strings = ['password', 'newpassword', 'new_password', + 'oldpassword', 'old_password'] + post_dict = dict(request.POST) + get_dict = dict(request.GET) + for string in censored_strings: + if string in post_dict: + post_dict[string] = '*'*8 + if string in get_dict: + get_dict[string] = '*'*8 + + event = { 'GET' : dict(get_dict), + 'POST' : dict(post_dict)} # TODO: Confirm no large file uploads event = json.dumps(event) diff --git a/lms/djangoapps/static_template_view/views.py b/lms/djangoapps/static_template_view/views.py index 0b28fb4920..d2dd0dbdb7 100644 --- a/lms/djangoapps/static_template_view/views.py +++ b/lms/djangoapps/static_template_view/views.py @@ -16,10 +16,6 @@ if settings.STATIC_GRAB: valid_templates = valid_templates+['server-down.html', 'server-error.html' 'server-overloaded.html', - 'mitx_global.html', - 'mitx-overview.html', - '6002x-faq.html', - '6002x-press-release.html' ] def index(request, template): @@ -47,13 +43,4 @@ def render_404(request): def render_500(request): return render_to_response('static_templates/server-error.html', {}) -valid_auth_templates=[] -def auth_index(request, template): - if not request.user.is_authenticated(): - return redirect('/') - - if template in valid_auth_templates: - return render_to_response(template,{}) - else: - return redirect('/') diff --git a/lms/envs/common.py b/lms/envs/common.py index c8989d1b3c..336c47f715 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -262,7 +262,6 @@ TEMPLATE_LOADERS = ( MIDDLEWARE_CLASSES = ( 'util.middleware.ExceptionLoggingMiddleware', - 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -294,9 +293,13 @@ PIPELINE_CSS = { 'source_filenames': ['sass/application.scss'], 'output_filename': 'css/application.css', }, + 'ie-fixes': { + 'source_filenames': ['sass/ie.scss'], + 'output_filename': 'css/ie.css', + }, } -PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss'] +PIPELINE_ALWAYS_RECOMPILE = ['sass/application.scss', 'sass/ie.scss'] PIPELINE_JS = { 'application': { diff --git a/lms/static/images/contact-page.jpg b/lms/static/images/contact-page.jpg new file mode 100644 index 0000000000..065850c56f Binary files /dev/null and b/lms/static/images/contact-page.jpg differ diff --git a/lms/static/images/courses/edx_hp_video_thumbsmall.jpg b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg new file mode 100644 index 0000000000..8d4fcec72d Binary files /dev/null and b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg differ diff --git a/lms/static/images/courses/video-thumb.jpg b/lms/static/images/courses/video-thumb.jpg new file mode 100644 index 0000000000..b27b8dc750 Binary files /dev/null and b/lms/static/images/courses/video-thumb.jpg differ diff --git a/lms/static/images/homepage-bg.jpg b/lms/static/images/homepage-bg.jpg index 29e408ea6f..c2c1e805b5 100644 Binary files a/lms/static/images/homepage-bg.jpg and b/lms/static/images/homepage-bg.jpg differ diff --git a/lms/static/sass/_about_pages.scss b/lms/static/sass/_about_pages.scss index ef89e21a1e..89263c0f8a 100644 --- a/lms/static/sass/_about_pages.scss +++ b/lms/static/sass/_about_pages.scss @@ -262,13 +262,11 @@ .map { background: rgb(245,245,245); float: left; - height: 280px; margin-right: flex-gutter(); overflow: hidden; width: flex-grid(6); img { - min-height: 100%; max-width: 100%; } } diff --git a/lms/static/sass/_course_about.scss b/lms/static/sass/_course_about.scss index f5085ae216..0f453e242a 100644 --- a/lms/static/sass/_course_about.scss +++ b/lms/static/sass/_course_about.scss @@ -25,8 +25,9 @@ @include clearfix; margin: 0 auto; max-width: 1200px; + min-width: 760px; position: relative; - width: grid-width(12); + width: 100%; z-index: 2; diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/_courses.scss index 246a7d1083..7e5bd4ff38 100644 --- a/lms/static/sass/_courses.scss +++ b/lms/static/sass/_courses.scss @@ -15,19 +15,20 @@ height: 120px; margin: 0 auto; max-width: 1200px; + min-width: 760px; padding-top: 200px; position: relative; text-align: center; width: flex-grid(12); > hgroup { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); padding: 20px 30px; position: relative; z-index: 2; - } &.main-search, &.university-search { diff --git a/lms/static/sass/_dashboard.scss b/lms/static/sass/_dashboard.scss index d4deeff779..a3d21cb1b3 100644 --- a/lms/static/sass/_dashboard.scss +++ b/lms/static/sass/_dashboard.scss @@ -73,6 +73,10 @@ &.email-icon { @include background-image(url('../images/portal-icons/email-icon.png')); } + + &.name-icon { + @include background-image(url('../images/portal-icons/course-info-icon.png')); + } &.location-icon { @include background-image(url('../images/portal-icons/home-icon.png')); diff --git a/lms/static/sass/_home.scss b/lms/static/sass/_home.scss index 8f18752438..4ef25f106c 100644 --- a/lms/static/sass/_home.scss +++ b/lms/static/sass/_home.scss @@ -19,10 +19,12 @@ margin: 0 auto; padding: 200px 10px 0px; position: relative; - width: grid-width(12); + max-width: 1200px; + min-width: 760px; } .title { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); @@ -188,6 +190,7 @@ } .media { + background: #FFF; background: rgba(255,255,255, 0.93); border: 1px solid rgb(100,100,100); @include box-sizing(border-box); @@ -225,6 +228,7 @@ width: 60px; &::after { + color: #fff; color: rgba(255,255,255, 0.8); content: "\25B6"; display: block; @@ -253,6 +257,7 @@ border-color: rgba(255,255,255, 0.9); &::after { + color: #fff; color: rgba(255,255,255, 1); } } diff --git a/lms/static/sass/_jobs.scss b/lms/static/sass/_jobs.scss index 3d542935f8..136281c561 100644 --- a/lms/static/sass/_jobs.scss +++ b/lms/static/sass/_jobs.scss @@ -38,6 +38,34 @@ width: 100%; } } + + header { + float: left; + width: flex-grid(7); + + blockquote { + margin-left: 0; + margin-bottom: 40px; + + &:last-child { + margin-bottom: 0; + } + + p { + margin-left: 0; + font-style: italic; + line-height: 1.4; + font-size: 1.1em; + color: #666; + } + + cite { + margin-top: 12px; + display: block; + color: #a0a0a0; + } + } + } } .jobs-wrapper { diff --git a/lms/static/sass/_password_reset.scss b/lms/static/sass/_password_reset.scss index 292ca34e77..a2365e3e3e 100644 --- a/lms/static/sass/_password_reset.scss +++ b/lms/static/sass/_password_reset.scss @@ -6,7 +6,7 @@ @include box-shadow(0 5px 50px 0 rgba(0,0,0, 0.3)); margin: 120px auto 0; padding: 0px 40px 40px; - width: grid-width(5); + width: flex-grid(5); header { margin-bottom: 30px; diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index 63b88d5698..80ca693155 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -83,7 +83,7 @@ a:link, a:visited { @include clearfix; margin: 0 auto 0; padding: 0px 10px; - width: grid-width(12); + max-width: grid-width(12); } span.edx { diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss new file mode 100644 index 0000000000..e7da93c335 --- /dev/null +++ b/lms/static/sass/ie.scss @@ -0,0 +1,130 @@ +@import "bourbon/bourbon"; +@import "base/variables"; + +// These are all quick solutions for IE please rewrite +.highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview, +.home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1, +header.global { + background: #FFF; +} + +.home > header .title .actions, +.home > header .title:hover .actions { + display: none; + height: auto; +} + +.home > header .title { + &:hover { + height: 120px; + + > hgroup { + h1 { + border-bottom: 0; + padding-bottom: 0; + } + + h2 { + opacity: 1; + } + } + + .actions { + opacity: 0; + } + } +} + +.last { + margin-right: 0 !important; +} + +.home .university-partners .partners a { + .name { + position: static; + } + + &:hover { + text-decoration: none; + + &::before { + opacity: 1; + } + + .name { + bottom: 0px; + } + + img { + top: 0px; + } + } + +} + + +.home .university-partners .partners { + width: 660px; + + li.partner { + float: left; + display: block; + padding: 0; + width: 220px; + overflow: hidden; + } +} + +.highlighted-courses .courses .course, .find-courses .courses .course { + .meta-info { + display: none; + } + + .inner-wrapper { + height: 100%; + overflow: visible; + position: relative; + } + + header.course-preview { + left: 0px; + position: relative; + top: 0px; + width: 100%; + z-index: 3; + height: auto; + + hgroup { + position: relative; + right: 0; + top: 0; + } + + } + // } + + .info { + height: auto; + position: static; + overflow: visible; + + .desc { + height: auto; + } + } + + &:hover { + background: rgb(245,245,245); + border-color: rgb(170,170,170); + @include box-shadow(0 1px 16px 0 rgba($blue, 0.4)); + + .info { + top: 0; + } + + .meta-info { + opacity: 0; + } + } +} + diff --git a/lms/static/sass/shared/_course_object.scss b/lms/static/sass/shared/_course_object.scss index a448155447..374caf4898 100644 --- a/lms/static/sass/shared/_course_object.scss +++ b/lms/static/sass/shared/_course_object.scss @@ -141,6 +141,7 @@ top: 0px; @include transition(all, 0.15s, linear); width: 100%; + overflow: hidden; .cover-image { height: 200px; @@ -174,7 +175,6 @@ padding: 0px 10px 10px 10px; width: 100%; - .university { border-right: 1px solid rgb(200,200,200); color: $lighter-base-font-color; diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index db473c77a7..4fb95f7004 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -15,7 +15,8 @@ footer { max-width: 1200px; margin: 0 auto; padding: 30px 10px 0; - width: grid-width(12); + max-width: grid-width(12); + min-width: 760px; .top { border-bottom: 1px solid rgb(200,200,200); diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 657ee4c56e..857db39a8d 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -13,7 +13,8 @@ header.global { margin: 0 auto; max-width: 1200px; padding: 14px 10px 0px; - width: grid-width(12); + max-width: grid-width(12); + min-width: 760px; } h1.logo { diff --git a/lms/templates/contact.html b/lms/templates/contact.html index 2bb73fe8ed..44383afc73 100644 --- a/lms/templates/contact.html +++ b/lms/templates/contact.html @@ -12,14 +12,14 @@
- +

Class Feedback

We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.

General Inquiries and Feedback

-

If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

+

"If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit ourFAQ page. You can also join the discussion on our facebook page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

Technical Inquiries and Feedback

If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at technical@edx.org. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: bugs@edx.org.

diff --git a/lms/templates/courses.html b/lms/templates/courses.html index d7302565d9..0601177a57 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -2,6 +2,8 @@ <%namespace name='static' file='static_content.html'/> +<%block name="title">Courses +
@@ -28,7 +30,7 @@ <%include file="course.html" args="course=course" /> %endfor
-
+
%for course in universities['BerkeleyX']: <%include file="course.html" args="course=course" /> %endfor diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index a90e9a9bf6..a12b8c2f37 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -6,6 +6,8 @@ <%namespace name='static' file='static_content.html'/> +<%block name="title">Dashboard +
@@ -15,10 +17,10 @@ diff --git a/lms/templates/index.html b/lms/templates/index.html index d7c205ce46..28ef2d3b25 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -19,15 +19,15 @@
@@ -36,7 +36,7 @@
- +
@@ -66,7 +66,7 @@
-
  • +
  • @@ -88,7 +88,7 @@ <%include file="course.html" args="course=course" /> %endfor
    • -
    +
    %for course in universities['BerkeleyX']: <%include file="course.html" args="course=course" /> %endfor diff --git a/lms/templates/main.html b/lms/templates/main.html index 0fe68e4728..be4fa3bd70 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -9,10 +9,16 @@ % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: <%static:css group='application'/> + % endif % if not settings.MITX_FEATURES['USE_DJANGO_PIPELINE']: + % endif @@ -64,10 +70,6 @@ <%include file="navigation.html" /> - -
    ${self.body()}
    diff --git a/lms/templates/portal/course_about.html b/lms/templates/portal/course_about.html index f5804b2604..a6d0106138 100644 --- a/lms/templates/portal/course_about.html +++ b/lms/templates/portal/course_about.html @@ -9,6 +9,9 @@ <%inherit file="../main.html" /> + +<%block name="title">About ${course.number} +
    @@ -68,13 +71,12 @@
    diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index c253651e9d..ee59f40396 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -19,14 +19,14 @@
    - - - - - - + + + + + + - +
    @@ -86,13 +86,13 @@
    diff --git a/lms/templates/static_templates/404.html b/lms/templates/static_templates/404.html index be3877e85a..f53c91cc9f 100644 --- a/lms/templates/static_templates/404.html +++ b/lms/templates/static_templates/404.html @@ -1,5 +1,7 @@ <%inherit file="../main.html" /> +<%block name="title">404 +

    Page not found

    The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at technical@edx.edu.

    diff --git a/lms/templates/static_templates/6002x-faq.html b/lms/templates/static_templates/6002x-faq.html deleted file mode 100644 index a80c6c2967..0000000000 --- a/lms/templates/static_templates/6002x-faq.html +++ /dev/null @@ -1,389 +0,0 @@ -<%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. -

    - -

    How do I register?

    - -

    We will have a link to a form where you can sign up for our database and mailing list shortly. Please check back in the next two weeks to this website for further instruction.

    - -

    Where can I find a list of courses available? When do the next classes begin?

    - -

    Courses will begin again in the Fall Semester (September). We anticipate offering 4-5 courses this Fall, one of which will be 6.002x again. The additional classes will be announced in early summer.

    - -

    I tried to register for the course, but it says the username -is already taken.

    - -

    The system only allows each username to be used once. Probably, -someone else already signed up with that username. Try a different, -more unique username. For example, try adding a random number to the -end.

    - -

    I forgot my password

    - -

    The log-in form will have a link to reset your password once the -course opens.

    - -

    The videos stall out

    - -

    You should confirm your internet connection is fast enough to stream -videos, and that Youtube is not blocked by your internet -provider. Since the videos are hosted by YouTube, we have no control -over most technical problems with video playback (aside from those -related specifically to our player).

    - -

    You should also confirm you have a current version of Flash installed. -While our player supports YouTube's HTML5 API (which allows playback without -Flash), this support is experimental.

    - - -

    I am interested in a different subject. What other courses do -you offer?

    - -

    6.002x is the pilot course for MITx. While we plan to offer a -range of courses in the future, at present, 6.002x is the only course -available. Specific future offerings will be announced later.

    - - -

    How will I know that the course has started?

    - -

    The course will start on March 5. Check the website -mitx.mit.edu as the date approaches. A login button will appear on -the course website 6.002x.mitx.mit.edu on or slightly before March 5 -so you can login, begin to get familiar with the site and start the -course.

    - - -

    I can't log in

    - -

    You will not be able to log into the course until either the -starting date, or shortly before. If you have problems logging in once -the course has started, please verify that you are using the latest -version of either Firefox or Google Chrome, and have JavaScript and -cookies enabled.

    - - -

    Does the class have a schedule?

    - -

    The lectures are on-line videos, and may be watched at your own -pace and schedule. The course will have fixed deadlines for homework -assignments and exams.

    - - -

    I just enrolled for the course. I have not received any form -of acknowledgement that I have enrolled.

    - -

    You should receive a single activation e-mail. If you did not, the -most common issues are: -

      -
    • Typo in e-mail address -
    • Old browser. We recommend downloading the current version of -Firefox or Chrome. The course requires a modern browser. -
    • JavaScript disabled -
    • Activation e-mail in spam folder. Check spam folder. -
    • Non-unique username. Try adding a random string at the end. -
    - -

    If you run into issues, try recreating your account. There is no need -to do anything about the old account, if any. If it is not activated -through the link in the e-mail, it will disappear later. - - -

    How do I drop the course?

    - -

    You do not have to do anything. You can simply stop working on the -course at any time you choose to do so.

    - - -

    What happens if I drop the course?

    - -

    For the prototype course, learners achieving grades of "A," "B," -or "C" will receive an electronic Certificate of completion with the -learner's name and grade on it. If you receive a grade below a "C" or -do not complete the course, you will not receive a Certificate and no -grade record attaching your name to your participation in the class -will be disclosed outside of MITx. You can also choose to opt for a -no record at any time. However, the posts you make while enrolled in -the class will remain visible.

    - - -

    -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. MITx certificates are not -planned to count towards MIT course credit. -

    - - -

    -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 the current version of -Google Chrome. We support current versions of Mozilla Firefox as -well. The video player is based on Youtube, and is designed to work -with Flash. We provide a partial non-Flash fallback for the video, but -this uses Google's experimental HTML5 API, and hence we cannot -guarantee those will continue to function for the duration of the -semester. We provide partial support for Internet Explorer, as well as -other browsers and tablets, but 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. We also have - accounts - on Twitter, Facebook, - and LinkedIn. -

    -
    -
    diff --git a/lms/templates/static_templates/6002x-press-release.html b/lms/templates/static_templates/6002x-press-release.html deleted file mode 100644 index d95f1cd23e..0000000000 --- a/lms/templates/static_templates/6002x-press-release.html +++ /dev/null @@ -1,130 +0,0 @@ -<%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/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index 2572be6c12..9694cb3586 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -3,6 +3,8 @@ <%inherit file="../main.html" /> +<%block name="title">About edX +
    @@ -52,8 +50,8 @@ Massachusetts Institute of Technology

    Massachusetts Institute of Technology

    -

    The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.

    -

    MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Seventy-eight MIT alumni, faculty, researchers and staff have won Nobel Prizes.

    +

    The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.

    +

    MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.

    Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.

    diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index 760d070024..40fa1d11f6 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -3,6 +3,8 @@ <%inherit file="../main.html" /> +<%block name="title">Contact edX +