From 340f4ffca4d8eeefd65ae1b54dba16d14fe3d152 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 4 Jan 2012 11:14:37 -0500 Subject: [PATCH] Cleaned markup up more --HG-- branch : kf-refactor --- activation_complete.html | 2 +- activation_invalid.html | 6 +- credits.html | 103 +++++++++++++++--------------- help.html | 57 ++++++----------- index.html | 132 ++++++++++++++++++++------------------- info.html | 1 + main.html | 27 ++++---- navigation.html | 20 +++--- problem.html | 1 - profile.html | 102 +++++++++++------------------- textbook.html | 35 ++--------- 11 files changed, 210 insertions(+), 276 deletions(-) diff --git a/activation_complete.html b/activation_complete.html index ae5781b9c6..578bffacf2 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,3 +1,3 @@

Activation Complete

-

Now go log in and try the course! +

Now go log in and try the course!

diff --git a/activation_invalid.html b/activation_invalid.html index 7c37581a26..68b7cddd45 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,5 +1,5 @@ -

Activation Invalid

+

Activation Invalid

-

Something went wrong. Did you already activate the account? If so, +

Something went wrong. Did you already activate the account? If so, go log in and try the course. Otherwise, e-mail us to -let us know what happened. +let us know what happened.

diff --git a/credits.html b/credits.html index f790099074..c0c4f96bc0 100644 --- a/credits.html +++ b/credits.html @@ -1,56 +1,57 @@ <%inherit file="main.html" /> -
-
-
-
- -
- -
-
- -
- -
- -
- - -

Credits

- -

The team of instructors is Anant Agarwal, Piotr Mitros, Chris -Terman, and Gerald Sussman. Our intrepid team of TAs is - -

The main codebase was crammed out in two months by Piotr -Mitros. Evgeny Fadeev helped integrate Askbot into the -system. Schematic entry and circuit simulation are by Chris -Terman. Jean-Michel Claus designed the applets. IT and infrastructure -are managed by Scott Bloomquist of TechSquare, Inc. - -

The codebase was made possible by Django, JQuery, JQueryUI, -MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the -original FancyBox. Graphic design and css started from a free template -from dotemplate.com, one of -the few, genuinely free template web sites (although you have to -e-mail the owner to find that out), and was heavily modified by Piotr -Mitros, and later, thoughtbot. - -

The system is running in the Amazon cloud, which allows us to hold up -to anticipated loads. +

+
+
+
+ + +
+
+ +
+ + +
+ +
+ +

Credits

+ +

The team of instructors is Anant Agarwal, Piotr Mitros, Chris + Terman, and Gerald Sussman. Our intrepid team of TAs is + +

The main codebase was crammed out in two months by Piotr + Mitros. Evgeny Fadeev helped integrate Askbot into the + system. Schematic entry and circuit simulation are by Chris + Terman. Jean-Michel Claus designed the applets. IT and infrastructure + are managed by Scott Bloomquist of TechSquare, Inc.

+ +

The codebase was made possible by Django, JQuery, JQueryUI, + MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the + original FancyBox. Graphic design and css started from a free template + from dotemplate.com, one of + the few, genuinely free template web sites (although you have to + e-mail the owner to find that out), and was heavily modified by Piotr + Mitros, and later, thoughtbot.

+ +

The system is running in the Amazon cloud, which allows us to hold up to anticipated loads.

+ +
+
diff --git a/help.html b/help.html index 75ab5d1e00..8812418e67 100644 --- a/help.html +++ b/help.html @@ -1,41 +1,24 @@ <%inherit file="main.html" /> - -
-
-

Help

+<%include file="navigation.html" /> -

If you need help, first try asking -a question in the forums and in the IRC channel (irc.mitx.org, -channel #6002). As the semester starts, we will add a Frequently Asked -Questions section. +

+

Help

-

If you can't solve your problems with self-help, we have several -e-mail addresses set up: -

-
technical@mitx.mit.edu -
System-related questions -
content@mitx.mit.edu -
Content-related questions -
bugs@mitx.mit.edu -
Bug reports -
suggestions@mitx.mit.edu -
Suggestions -
-

Please bear in mind that while we read them, we do not expect to -have time to respond to all e-mails. -

-
+

If you need help, first try asking a question in the forums and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.

+ +

If you can't solve your problems with self-help, we have several e-mail addresses set up:

+ +
+
technical@mitx.mit.edu
+
System-related questions
+
content@mitx.mit.edu
+
Content-related questions
+
bugs@mitx.mit.edu
+
Bug reports
+
suggestions@mitx.mit.edu
+
Suggestions
+
+ +

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/index.html b/index.html index e8c98e8d60..818f0ebf6b 100644 --- a/index.html +++ b/index.html @@ -73,76 +73,78 @@ $(function() { -
-
-
-
- -
- -
-
- -
- -
- -
- -
- -
Enroll >>


-Log In >>
 -
-Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris -Terman, "6.002 Circuits and Electronics" is an an on-line adaption of -MIT's first undergraduate analog design course. This course will run, -free of charge, for students worldwide from February 1, 2012 through -July 1, 2012. - -

Students who successfully complete the course will receive an -electronic certificate of accomplishment from MIT. Students will not -receive course credit, but students successfully finishing the course -will be well-placed to take an exam to pass out of 6.002 should they -ever enroll at MIT, and potentially, similar courses at other schools. - -

In order to succeed in this course, students must have some -background in calculus and 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. - +
+
-
<%include file="create_account.html" />
-
<%include file="login.html" />
-
<%include file="password_reset_form.html" />
-
+
+ +
+ + +
+
+ +
+ +
+ +
+ +
+ +
Enroll >>


+ Log In >>
 +
+ Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris + Terman, "6.002 Circuits and Electronics" is an an on-line adaption of + MIT's first undergraduate analog design course. This course will run, + free of charge, for students worldwide from February 1, 2012 through + July 1, 2012. + +

Students who successfully complete the course will receive an + electronic certificate of accomplishment from MIT. Students will not + receive course credit, but students successfully finishing the course + will be well-placed to take an exam to pass out of 6.002 should they + ever enroll at MIT, and potentially, similar courses at other schools. + +

In order to succeed in this course, students must have some + background in calculus and 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. + +
+ +
<%include file="create_account.html" />
+
<%include file="login.html" />
+
<%include file="password_reset_form.html" />
+
-
+
-
- -
- +
+
-
-
-
+ +
+
+
+
diff --git a/info.html b/info.html index ae45e6c736..f525946589 100644 --- a/info.html +++ b/info.html @@ -1,4 +1,5 @@ <%inherit file="main.html" /> +
diff --git a/main.html b/main.html index f401468834..0d76ac66f1 100644 --- a/main.html +++ b/main.html @@ -1,41 +1,40 @@ - - + - MITX 6.002 + MITX 6.002 + - + - + - - - + tex2jax: {inlineMath: [["\\(","\\)"]], + displayMath: [["\\[","\\]"]]} + }); + + + ${self.body()} -
+
+ diff --git a/navigation.html b/navigation.html index 33c6b9bf8d..71d337f0f4 100644 --- a/navigation.html +++ b/navigation.html @@ -1,9 +1,11 @@ - + diff --git a/problem.html b/problem.html index 61d871cf93..fedafcb3b2 100644 --- a/problem.html +++ b/problem.html @@ -1,6 +1,5 @@

${ problem['name'] }

${ problem['html'] } -
% if check_button: diff --git a/profile.html b/profile.html index 7e60afd1ec..ba9e22cbd0 100644 --- a/profile.html +++ b/profile.html @@ -65,75 +65,47 @@ $(function() { - -
-



-

${name}

- - - - -
Forum name:${username}
E-mail:${email}
Location:
${location} 
Language:
${language} 
Password:
********
+<%include file="navigation.html" /> -
+
-
+

${name}

-

Course Progress

- - % for hw in homeworks: - - % endfor -
${ hw['chapter'] }/ ${ hw['section'] }   - % for score in hw['scores']: - ${ score[0] }/${ score[1] } +
    +
  • Forum name: ${username}
    • +
  • E-mail: ${email}
    • +
  • Location: ${location}
    • +
  • Language: ${language}
    • +
  • Password: ********
    • +
+ + + +
+ +
+

Course Progress

+ + % for hw in homeworks: +
  • +

    ${ hw['chapter'] }

    +

    ${ hw['section'] }

    + +
      + % for score in hw['scores']: +
    • ${ score[0] }/${ score[1] }
      • + % endfor +
    +
    • % endfor -
    -
    + -
    -
    -

    Password reset

    +
    +

    Password reset

    -

    Hit the button below, and we'll e-mail you a password reset link at ${email}.

    +

    We'll e-mail you a password reset link at ${email}.

    + -

    -

    - -

    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    + +
    + diff --git a/textbook.html b/textbook.html index 6d4d4537f7..432dba470a 100644 --- a/textbook.html +++ b/textbook.html @@ -1,34 +1,9 @@ <%inherit file="main.html" /> +
    - - - -
    - -
    - ${ text } -
    -
    - + <%include file="navigation.html" /> +
    + ${ text } +