diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 2a9d48c35c..0000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,15 +0,0 @@ -GEM - remote: http://rubygems.org/ - specs: - bourbon (1.3.6) - sass (>= 3.1) - rake (0.9.2.2) - sass (3.1.15) - -PLATFORMS - ruby - -DEPENDENCIES - bourbon (~> 1.3.6) - rake - sass (= 3.1.15) diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py index 5cbbe18d7d..f043c3bc8c 100644 --- a/lms/djangoapps/courseware/views.py +++ b/lms/djangoapps/courseware/views.py @@ -88,7 +88,7 @@ def render_accordion(request, course, chapter, section): Returns (initialization_javascript, content)''' if not course: - course = "6.002 Spring 2012" + course = "edx4edx" toc = content_parser.toc_from_xml( content_parser.course_file(request.user, course), chapter, section) @@ -163,7 +163,7 @@ def get_course(request, course): if course==None: if not settings.ENABLE_MULTICOURSE: - course = "6.002 Spring 2012" + course = "edx4edx" elif 'coursename' in request.session: course = request.session['coursename'] else: diff --git a/lms/envs/dev.py b/lms/envs/dev.py index decd92d136..3f7eba922c 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -52,8 +52,8 @@ CACHES = { SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' ################################ DEBUG TOOLBAR ################################# -INSTALLED_APPS += ('debug_toolbar',) -MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) +#INSTALLED_APPS += ('debug_toolbar',) +#MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) INTERNAL_IPS = ('127.0.0.1',) DEBUG_TOOLBAR_PANELS = ( diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py index 675ca8366a..86b434957a 100644 --- a/lms/envs/dev_ike.py +++ b/lms/envs/dev_ike.py @@ -20,6 +20,12 @@ from .dev import * if 'eecs1' in socket.gethostname(): MITX_ROOT_URL = '/mitx2' +#----------------------------------------------------------------------------- +# edx4edx content server + +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +#EMAIL_BACKEND = 'django_ses.SESBackend' + #----------------------------------------------------------------------------- # ichuang diff --git a/lms/templates/create_account.html b/lms/templates/create_account.html index 318a694658..9641d8a4fb 100644 --- a/lms/templates/create_account.html +++ b/lms/templates/create_account.html @@ -1,12 +1,12 @@
-

Enroll in 6.002x Circuits & Electronics

+

Enroll in edx4edx

-Please note that 6.002x has now passed its half-way point. The midterm exam and several assignment due dates for 6.002x have already passed. It is now impossible for newly enrolled students to earn a passing grade and a completion certificate for the course. However, new students have access to all of the course material that has been released for the course, so you are welcome to enroll and browse the course.

+

<% if 'error' in locals(): e = error %> diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt index 7f042995ed..2bd26c9fb7 100644 --- a/lms/templates/emails/activation_email.txt +++ b/lms/templates/emails/activation_email.txt @@ -6,7 +6,7 @@ into your web browser's address bar: % if is_secure: https://${ site }/activate/${ key } % else: - http://${ site }/activate/${ key } + http://ichuang.mitx.mit.edu/activate/${ key } % endif If you didn't request this, you don't need to do anything; you won't diff --git a/lms/templates/index.html b/lms/templates/index.html index aecade16e5..58fa39f99e 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -1,85 +1,25 @@ <%inherit file="marketing.html" /> <%namespace name='static' file='static_content.html'/> -<%block name="title">MITx 6.002x: Circuits & Electronics -<%block name="description">6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT's first undergraduate analog design course: 6.002. -<%block name="keywords">MITx, circuits, electronics, EECS, electrical engineering, analog circuits, digital circuits, online learning, MIT, online laboratory, education, learners, undergraduate, certificate +<%block name="title">edx4edx author course +<%block name="description">edx4edx +<%block name="keywords">MITx, edx4edx <%block name="header_text">
-

Circuits & Electronics

-

6.002x

- View 6.002x Circuits & Electronics as a guest - Enroll in 6.002x Circuits & Electronics +

edx4edx

+

edX Author Course

+ Enroll in edx4edx
-

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

+

edx4edx is a course for prospective edX course authors

<%block name="header_class">course
-
- -
-

About 6.002x

- -

6.002x (Circuits and Electronics) is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.

- -

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. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10 hours per week on the course.

- -
- -
-

6.002x on MITx

- -

If you successfully complete the course, you will receive an electronic certificate of accomplishment from MITx. 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.

- -

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. While recommended, the book is not required: relevant sections will be provided electronically as part of the online course 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.

-
- -
-

Requirements

- -

In order to succeed in this course, you must have taken an AP level physics course in electricity and magnetism. You must know basic calculus and linear algebra and have some 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 those who need it.

- -

The course web site was developed and tested primarily with - Google Chrome. We support current versions of Mozilla Firefox as - well. The video player is designed to work with Flash. While we - provide a 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.

-
- -
- View 6.002x Circuits & Electronics as a guest - Enroll in 6.002x Circuits & Electronics -
- -
- -
-

About the course staff

- -
    -
  • - Anant Agarwal -

    Anant Agarwal

    -

    Director of MIT’s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including Tilera, a company that produces scalable multicore processors. Prof. Agarwal won MIT’s Smullin and Jamieson prizes for teaching and co-authored the course textbook “Foundations of Analog and Digital Electronic Circuits.”

    • - -
  • - Gerald Sussman -

    Gerald Sussman

    -

    Professor of Electrical Engineering at MIT. He is a well known educator in the computer science community, perhaps best known as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textbooks in computer science, and as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.

    • - -
  • - Piotr Mitros -

    Piotr Mitros

    -

    Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Dr. Mitros has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.

    • -
- -
<%include file="create_account.html" />
diff --git a/lms/templates/info.html b/lms/templates/info.html index 67ce69ec85..5cda91d023 100644 --- a/lms/templates/info.html +++ b/lms/templates/info.html @@ -17,7 +17,7 @@ $(document).ready(function(){ -<%block name="title">Course Info - MITx 6.002x +<%block name="title">Course Info - edx4edx x <%include file="navigation.html" args="active_page='info'" />