diff --git a/main.html b/main.html index 580bef8c74..0e70645a5a 100644 --- a/main.html +++ b/main.html @@ -1,7 +1,7 @@ - MIT World 6.002 + MITX 6.002 @@ -14,6 +14,14 @@ + + + + diff --git a/profile.html b/profile.html index 061661e9bc..4085c1bcce 100644 --- a/profile.html +++ b/profile.html @@ -1,11 +1,60 @@ <%inherit file="main.html" />
+ +
Digital Textbook @@ -23,9 +72,14 @@ $(function() {

${name}

- - -
Forum name:${username}
E-mail:${email}
Location:${location}
Language:${language}
Password:********
+
Location:
${location}
Language:
${language}
Password:
********
+ +
+ +
+

Course Status

% for hw in homeworks: @@ -38,28 +92,8 @@ $(function() {
-

Change location

-
Preferred format is city, state, country (so for us, -"Cambridge, Massachusetts, USA"), but give as -much or as little detail as you want. -

-

- -

-
-
-
-

Change language

-
Update your language: -

-

- -

-
-
- -
-
+
+

Password reset

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

@@ -67,10 +101,10 @@ much or as little detail as you want.

-

+

- +
diff --git a/registration/password_reset_done.html b/registration/password_reset_done.html index dabca10cc9..c4cffde474 100755 --- a/registration/password_reset_done.html +++ b/registration/password_reset_done.html @@ -1,5 +1,3 @@ -{% block title %}Password reset successful{% endblock %} - {% block content %}

Password reset successful

diff --git a/seq_module.js b/seq_module.js index f11305b40d..48cd3ef9c5 100644 --- a/seq_module.js +++ b/seq_module.js @@ -1,6 +1,6 @@ // CRITICAL TODO: Namespace -var ${ id }files=["", +var ${ id }contents=["", %for t in items: ${t[1]['content']} , %endfor @@ -9,14 +9,14 @@ var ${ id }files=["", var ${ id }functions=["", %for t in items: - function(){ ${t[1]['js']} }, + function(){ ${t[1]['init_js']} }, %endfor ""]; var ${ id }loc; function ${ id }goto(i) { - $('#content').html(${ id }files[i]); + $('#content').html(${ id }contents[i]); ${ id }functions[i]() ${ id }loc=i; } diff --git a/tab_module.html b/tab_module.html index e33f0caa74..d5e28b6a57 100644 --- a/tab_module.html +++ b/tab_module.html @@ -1,12 +1,15 @@ + +
-% for t in tabs: -
+% for t in items: +
${t[1]['content']}
% endfor diff --git a/tab_module.js b/tab_module.js index 4733e91021..b0c0d36a4d 100644 --- a/tab_module.js +++ b/tab_module.js @@ -1,16 +1,23 @@ -var tab_funcs=[] - -## We'd like to refresh the contents of tabs when they're shown again, but this probably -## isn't the way -## % for t in tabs: -## % if 'js' in t[1]: -## tab_funcs.push(function(){ ${t[1]['js']} }); -## % else: -## tab_funcs.push(function(){}); -## % endif -## % endfor +var ${ id }files=["", + %for t in items: + ${t[1]['content']} , + %endfor + "" + ]; +var ${ id }functions=["", + %for t in items: + function(){ ${t[1]['init_js']} }, + %endfor + ""]; $("#tabs").tabs({select:function(event, ui){ -## tab_funcs[ui.index](); - }}); + global=ui; + return true; + }, + show:function(event,ui){ + global=ui; + alert('hello'); + return true; + }, + });