From 20f605ebc52a88b7af475728302a10aa9bb50ca6 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Wed, 25 Jan 2012 23:13:10 -0500 Subject: [PATCH] move duplicate code in static marketing sites to marketing.html block templates --- copyright.html | 14 ------- honor.html | 14 ------- index.html | 54 ++++-------------------- main.html | 18 ++++---- marketing.html | 107 ++++++++++++++++++++++++----------------------- mitx_global.html | 58 +------------------------ privacy.html | 14 ------- tos.html | 14 ------- 8 files changed, 74 insertions(+), 219 deletions(-) diff --git a/copyright.html b/copyright.html index eb75b58515..a238a12ec3 100644 --- a/copyright.html +++ b/copyright.html @@ -1,19 +1,5 @@ <%inherit file="marketing.html" /> -
-
- - -
-

MITx

-

An MIT Education Anywhere. For free.

-
-
-
-
diff --git a/honor.html b/honor.html index 13be4777b8..5a36865865 100644 --- a/honor.html +++ b/honor.html @@ -1,19 +1,5 @@ <%inherit file="marketing.html" /> -
-
- - -
-

MITx

-

An MIT Education Anywhere. For free.

-
-
-
-

Honor Code

diff --git a/index.html b/index.html index 634b101d5d..09c3787347 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,9 @@ <%inherit file="marketing.html" /> +<%block name="header">
- + ${parent.header_nav()}
@@ -16,23 +14,22 @@

Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, “6.002x Circuits and Electronics” is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012.

-
- +
- +

About 6.002

- +

6.002x 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. Students should expect to spend approximately 10 hours per week on the course. The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.

- +

6.002 on MITx

@@ -45,7 +42,7 @@

Requirements

In order to succeed in this course, students must have taken an AP level physics course in electricity and magnetism. Students 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 students with weaker math backgrounds.

- +

The course web site was developed and tested primarily with Google Chrome. We support Mozilla Firefox as well. While we will attempt to make it possible to complete the course with Internet Explorer, portions of the web site functionality will be unavailable. The videos require Flash.

@@ -102,18 +99,13 @@
<%include file="create_account.html" />
-
<%include file="login.html" />
-
<%include file="password_reset_form.html" />
-
- - - + @@ -32,11 +32,11 @@ - + <%block name="headextra"/> @@ -59,7 +59,7 @@
-

Found a bug? Got an idea for improving our system? Let us know.

+

Found a bug? Got an idea for improving our system? Let us know.

    @@ -71,8 +71,8 @@
-
- +
+ diff --git a/marketing.html b/marketing.html index 4c75eb55d3..79c25e0557 100644 --- a/marketing.html +++ b/marketing.html @@ -12,23 +12,41 @@ - + - + <%block name="headextra"/> + <%block name="header"> +
+
+ <%block name="header_nav"> + + + <%block name="header_text"> +
+

MITx

+

An MIT Education Anywhere. For free.

+
+ +
+
+ ${self.body()} <%block name="bodyextra"/> @@ -39,63 +57,48 @@

Copyright (c). 2011. MIT. Some rights reserved.

-
-
- Found a bug? Got an idea for improving our system? Let us know. - - -
    -
    2. -
    3. -
    4. -
- - -
-
- -
-
- - - - -

Supported operations: ^ * / + - || ()

-

Supported suffixes: %kMGTcmunp

-
-
+
<%include file="login.html" />
+
<%include file="password_reset_form.html" />
+
diff --git a/mitx_global.html b/mitx_global.html index 2972370b6f..1fccdae61b 100644 --- a/mitx_global.html +++ b/mitx_global.html @@ -1,18 +1,5 @@ <%inherit file="marketing.html" /> -
-
- - -
-

MITx

-

An MIT Education Anywhere. For free.

-
-
-
-

MITx is MIT’s online learning initiative.

@@ -49,29 +36,14 @@

Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, “6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from MITx.

- -
-
<%include file="login.html" />
-
- -
-
<%include file="password_reset_form.html" />
-
- -
-
-
- -