Commit 340f4ffc by Kyle Fiedler

Cleaned markup up more

--HG--
branch : kf-refactor
parent 57a3005f
<h1>Activation Complete</h1> <h1>Activation Complete</h1>
<p> Now go <a href="/">log in</a> and try the course!</a> <p>Now go <a href="/">log in</a> and try the course!</a></p>
<h1> Activation Invalid </h1> <h1>Activation Invalid </h1>
<p> Something went wrong. Did you already activate the account? If so, <p>Something went wrong. Did you already activate the account? If so,
go <a href="/">log in</a> and try the course. Otherwise, e-mail us to go <a href="/">log in</a> and try the course. Otherwise, e-mail us to
let us know what happened. let us know what happened.</p>
<%inherit file="main.html" /> <%inherit file="main.html" />
<div id="topWrapper">
<div id="topWrapper">
<div id="topBanner"></div> <div id="topBanner"></div>
</div> </div>
<div id="topnav">
<div id="topnav">
<ul> <ul>
<li id="current" style="border:none"> <li id="current" style="border:none">
<a href="#" shape="rect">Home</a> <a href="#" shape="rect">Home</a>
...@@ -17,40 +19,39 @@ ...@@ -17,40 +19,39 @@
<a href="credits.html" shape="rect">Credits</a> <a href="credits.html" shape="rect">Credits</a>
</li> </li>
</ul> </ul>
</div> </div>
<!-- end top wrapper -->
<div id="wrapper"> <!-- end top wrapper -->
<div id="wrapper">
<div id="bg"> <div id="bg">
<div id="header"></div>
<div id="page"> <div id="page">
<!-- begin container --> <!-- begin container -->
<div id="container"> <div id="container">
<!-- content --> <!-- content -->
<div id="content"> <div id="content">
<h1> Credits </h1>
<h1> Credits </h1> <p> The team of instructors is Anant Agarwal, Piotr Mitros, Chris
Terman, and Gerald Sussman. Our intrepid team of TAs is
<p> The team of instructors is Anant Agarwal, Piotr Mitros, Chris
Terman, and Gerald Sussman. Our intrepid team of TAs is
<p> The main codebase was crammed out in two months by Piotr <p> The main codebase was crammed out in two months by Piotr
Mitros. Evgeny Fadeev helped integrate Askbot into the Mitros. Evgeny Fadeev helped integrate Askbot into the
system. Schematic entry and circuit simulation are by Chris system. Schematic entry and circuit simulation are by Chris
Terman. Jean-Michel Claus designed the applets. IT and infrastructure Terman. Jean-Michel Claus designed the applets. IT and infrastructure
are managed by Scott Bloomquist of TechSquare, Inc. are managed by Scott Bloomquist of TechSquare, Inc.</p>
<p> The codebase was made possible by Django, JQuery, JQueryUI, <p> The codebase was made possible by Django, JQuery, JQueryUI,
MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the MathJAX, swfobject, askbot, django-simplewiki, pyparsing, and the
original FancyBox. Graphic design and css started from a free template original FancyBox. Graphic design and css started from a free template
from <a href="http://www.dotemplate.com/">dotemplate.com</a>, one of from <a href="http://www.dotemplate.com/">dotemplate.com</a>, one of
the few, genuinely free template web sites (although you have to 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 e-mail the owner to find that out), and was heavily modified by Piotr
Mitros, and later, thoughtbot. Mitros, and later, thoughtbot.</p>
<p> The system is running in the Amazon cloud, which allows us to hold up <p> The system is running in the Amazon cloud, which allows us to hold up to anticipated loads. </p>
to anticipated loads.
</div>
</div> </div>
</div>
<%inherit file="main.html" /> <%inherit file="main.html" />
<div id="coursenav" align=right width=100%>
<a href="/book">Textbook</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/courseware">Courseware</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/discussion">Discussion</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/wiki">Wiki</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/profile">Profile</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/s/help.html"><b>Help</b></a> <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/logout">Log out</a>
</div>
<div align=center width=100%> <%include file="navigation.html" />
<div align=left width=100 style="width:400px; ">
<h1> Help </h1>
<p> If you need help, first try <a href="discussion/questions/">asking <section>
a question in the forums</a> and in the IRC channel (irc.mitx.org, <h1>Help</h1>
channel #6002). As the semester starts, we will add a Frequently Asked
Questions section.
<p> If you can't solve your problems with self-help, we have several <p> If you need help, first try <a href="discussion/questions/">asking a question in the forums</a> and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.</p>
e-mail addresses set up:
<dl> <p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
<dt> technical@mitx.mit.edu
<dd> System-related questions <dl>
<dt> content@mitx.mit.edu <dt> technical@mitx.mit.edu</dt>
<dd> Content-related questions <dd> System-related questions</dd>
<dt> bugs@mitx.mit.edu <dt> content@mitx.mit.edu</dt>
<dd> Bug reports <dd> Content-related questions</dd>
<dt> suggestions@mitx.mit.edu <dt> bugs@mitx.mit.edu</dt>
<dd> Suggestions <dd> Bug reports</dd>
</dl> <dt> suggestions@mitx.mit.edu</dt>
<p> Please bear in mind that while we read them, we do not expect to <dd> Suggestions</dd>
have time to respond to all e-mails. </dl>
</div>
</div> <p> Please bear in mind that while we read them, we do not expect to have time to respond to all e-mails.</p>
</section>
...@@ -73,10 +73,11 @@ $(function() { ...@@ -73,10 +73,11 @@ $(function() {
</script> </script>
<div id="topWrapper"> <div id="topWrapper">
<div id="topBanner"></div> <div id="topBanner"></div>
</div> </div>
<div id="topnav">
<div id="topnav">
<ul> <ul>
<li id="current" style="border:none"> <li id="current" style="border:none">
<a href="#" shape="rect">Home</a> <a href="#" shape="rect">Home</a>
...@@ -91,9 +92,10 @@ $(function() { ...@@ -91,9 +92,10 @@ $(function() {
<a href="/t/credits.html" shape="rect">Credits</a> <a href="/t/credits.html" shape="rect">Credits</a>
</li> </li>
</ul> </ul>
</div> </div>
<!-- end top wrapper -->
<div id="wrapper"> <!-- end top wrapper -->
<div id="wrapper">
<div id="bg"> <div id="bg">
<div id="header"></div> <div id="header"></div>
<div id="page"> <div id="page">
...@@ -102,39 +104,39 @@ $(function() { ...@@ -102,39 +104,39 @@ $(function() {
<!-- content --> <!-- content -->
<div id="content"> <div id="content">
<center> <center>
<table> <table>
<tr><td align=right><big><a id="inline" href="#enroll">Enroll &gt;&gt;</a><br><br><br> <tr><td align=right><big><a id="inline" href="#enroll">Enroll &gt;&gt;</a><br><br><br>
<a id="inline" href="#login">Log In &gt;&gt;</a></big></td><td><div style="width:50px; float:center;"></div></td><td> <a id="inline" href="#login">Log In &gt;&gt;</a></big></td><td><div style="width:50px; float:center;"></div></td><td>
<div style="width:300px; float:center;"> <div style="width:300px; float:center;">
Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris
Terman, "6.002 Circuits and Electronics" is an an on-line adaption of Terman, "6.002 Circuits and Electronics" is an an on-line adaption of
MIT's first undergraduate analog design course. This course will run, MIT's first undergraduate analog design course. This course will run,
free of charge, for students worldwide from February 1, 2012 through free of charge, for students worldwide from February 1, 2012 through
July 1, 2012. July 1, 2012.
<br><br>Students who successfully complete the course will receive an <br><br>Students who successfully complete the course will receive an
electronic certificate of accomplishment from MIT. Students will not electronic certificate of accomplishment from MIT. Students will not
receive course credit, but students successfully finishing the course 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 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. ever enroll at MIT, and potentially, similar courses at other schools.
<br><br> In order to succeed in this course, students must have some <br><br> In order to succeed in this course, students must have some
background in calculus and differential equations. Since more advanced background in calculus and differential equations. Since more advanced
mathematics will not show up until the second half of the course, the mathematics will not show up until the second half of the course, the
first half of the course will include an optional remedial first half of the course will include an optional remedial
differential equations component for students with weaker math differential equations component for students with weaker math
backgrounds. backgrounds.
</div> </div>
<div style="display:none"><div id="enroll" name="enroll"><%include file="create_account.html" /></div></div> <div style="display:none"><div id="enroll" name="enroll"><%include file="create_account.html" /></div></div>
<div style="display:none"><div id="login"><%include file="login.html" /></div></div> <div style="display:none"><div id="login"><%include file="login.html" /></div></div>
<div style="display:none"><div id="pwd_reset"><%include file="password_reset_form.html" /></div></div> <div style="display:none"><div id="pwd_reset"><%include file="password_reset_form.html" /></div></div>
<div style="display:none"><div id="reset_done"></div></div> <div style="display:none"><div id="reset_done"></div></div>
</td></tr></table> </td></tr></table>
......
<%inherit file="main.html" /> <%inherit file="main.html" />
<div id="topWrapper"> <div id="topWrapper">
<div id="topBanner"></div> <div id="topBanner"></div>
</div> </div>
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html>
<html> <html>
<head> <head>
<title> MITX 6.002 </title> <title>MITX 6.002</title>
<link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/theme.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/theme.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" />
<link href="/static/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/> <link href="/static/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
<style type="text/css">#slider { margin: 10px; }</style>
<script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script> <script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script> <script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script> <script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script> <script type="text/javascript" src="/static/js/video_player.js"></script>
<script type="text/javascript" src="/static/js/schematic.js"></script> <script type="text/javascript" src="/static/js/schematic.js"></script>
<style type="text/css">#slider { margin: 10px; }</style>
<!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license --> <!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
<script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script> <script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
<link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css"> <link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
<script type="text/x-mathjax-config"> <script type="text/x-mathjax-config">
MathJax.Hub.Config({ MathJax.Hub.Config({
tex2jax: {inlineMath: [["\\(","\\)"]], tex2jax: {inlineMath: [["\\(","\\)"]],
displayMath: [["\\[","\\]"]]} displayMath: [["\\[","\\]"]]}
}); });
</script> </script>
<script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
</head> </head>
<body> <body>
${self.body()} ${self.body()}
<div id="bottomWrapper"> <footer>
<p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a> <p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a>
<!-- Template based on a design from http://www.dotemplate.com/ -- Donated $10 (pmitros) so we don't need to include credit. --> <!-- Template based on a design from http://www.dotemplate.com/ -- Donated $10 (pmitros) so we don't need to include credit. -->
</p> </p>
</div> </footer>
</body> </body>
</html> </html>
<ul id="coursenav"> <nav>
<ul class="coursenav">
<li><a href="/book">Textbook</a></li> <li><a href="/book">Textbook</a></li>
<li><a href="/courseware">Courseware</a></li> <li><a href="/courseware">Courseware</a></li>
<li><a href="/discussion">Discussion</a></li> <li><a href="/discussion">Discussion</a></li>
...@@ -6,4 +7,5 @@ ...@@ -6,4 +7,5 @@
<li><a href="/profile">Profile</a></li> <li><a href="/profile">Profile</a></li>
<li><a href="/s/help.html">Help</a></li> <li><a href="/s/help.html">Help</a></li>
<li><a href="/logout">Log out</a></li> <li><a href="/logout">Log out</a></li>
</ul> </ul>
</nav>
<h2> ${ problem['name'] } </h2> <h2> ${ problem['name'] } </h2>
${ problem['html'] } ${ problem['html'] }
<br>
<input type="hidden" name="problem_id" value="${ problem['name'] }"> <input type="hidden" name="problem_id" value="${ problem['name'] }">
% if check_button: % if check_button:
......
...@@ -65,75 +65,47 @@ $(function() { ...@@ -65,75 +65,47 @@ $(function() {
</script> </script>
<div align="right" id="coursenav"><div align=right><table><tr><td align=right valign=top> <%include file="navigation.html" />
<a href="/book">Textbook</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> <section>
<a href="/courseware">Courseware</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> <h1>${name} </h1>
<a href="/discussion">Discussion</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> <ul>
<a href="/wiki">Wiki</a> <li>Forum name: ${username}</li>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> <li>E-mail: ${email}</li>
<a href="/profile"><b>Profile</b></a> <li>Location: ${location}</li>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> <li>Language: ${language}</li>
<a href="/s/help.html">Help</a> <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> <li>Password: ********</li>
<a href="/logout">Log out</a> </ul>
</td></tr><tr><td valign=top>
</td></tr></table> <div><a href="#change_password_pop">Reset password</a></div> <!-- hidden trigger for password -->
</div></div>
<center> <div id="description"></div>
<br><br><br><br>
<h1> ${name} </h1> <section>
<table><td align=right>Forum name:</td><td>${username}</td></tr> <h1>Course Progress</h1>
<td align=right>E-mail:</td><td>${email}</td></tr>
<tr id="change_location"> <td align=right>Location:</a></td><td><div class="bordered" id="location_sub">${location}&nbsp;</div></td></tr>
<tr id="change_language"><td align=right><div id="change_language">Language:</a></td><td><div id="language_sub" class="bordered">${language}&nbsp;</div></td></tr>
<tr id="change_password"><td align=right><div>Password:</a></td><td><div id="change_password" class="bordered">********</a></td></tr></table>
<div><a id="inline" href="#change_password_pop"></a></div> <!-- hidden trigger for password -->
<div id="description"></div>
<h1> Course Progress </h1>
<table>
% for hw in homeworks: % for hw in homeworks:
<tr><td> ${ hw['chapter'] }</td><td>/</td> <td> ${ hw['section'] } </td><td>&nbsp;</td><td> <li>
<p>${ hw['chapter'] }</p>
<p>${ hw['section'] }</p>
<ul>
% for score in hw['scores']: % for score in hw['scores']:
${ score[0] }/${ score[1] } <li>${ score[0] }/${ score[1] }</li>
% endfor % endfor
</td></tr> </ul>
</li>
% endfor % endfor
</table> </section>
</center>
<div id="change_password_pop">
<div style="display:none"><div id="change_password_pop"> <h1>Password reset</h1>
<div id="pwd_reset">
<table width=400><tr><td> <h1>Password reset</h1> <p>We'll e-mail you a password reset link at ${email}.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<p>Hit the button below, and we'll e-mail you a password reset link at ${email}.</p>
<input type="button" id="pwd_reset_button" value="E-mail me" />
<p> </div>
<div align=right> </section>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="button" id="pwd_reset_button" value="E-mail me" /></p>
</div>
</td></tr></table>
</div>
</div></div>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<%inherit file="main.html" /> <%inherit file="main.html" />
<div id="bodyContent"> <div id="bodyContent">
<table width=100% cellpadding=0><tr> <%include file="navigation.html" />
<!--td width=276 valign=top>
<div id="navbar">
<ul>
<li> Index
<li> Table of contents
</ul>
</div>
</td-->
<td valign=top>
<div id="coursenav">
<a href="/book"><b>Textbook</b></a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/courseware">Courseware</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/discussion">Discussion</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/wiki">Wiki</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/profile">Profile</a>
<span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/s/help.html">Help</a> <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span>
<a href="/logout">Log out</a>
</div>
<div> <div>
${ text } ${ text }
</div> </div>
</td>
</tr></table>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment