From fd2dbd82942c4be10cb6936a52dfcc133b2e3ccc Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 21 Dec 2011 21:21:12 -0500 Subject: [PATCH] UI Cleanup. Much nicer now --- courseware.html | 30 +++++++++++++++++++----------- profile.html | 3 ++- seq_module.html | 8 ++++---- seq_module.js | 20 +++++++++++++++++--- video.html | 37 +++++++++++++++++++------------------ 5 files changed, 61 insertions(+), 37 deletions(-) diff --git a/courseware.html b/courseware.html index 4e2e2fcaa0..53d991b028 100644 --- a/courseware.html +++ b/courseware.html @@ -21,21 +21,29 @@ $('#hide_acc').click(function() { }); - - -
-
-${accordion} -
-
<
<
<
Digital Textbook +
+ + + +
+
+ ${accordion} +
+		 + -
+Log out + +
+ ${content} +
+
-${content} -
+ + diff --git a/profile.html b/profile.html index 4085c1bcce..bd91e4d82c 100644 --- a/profile.html +++ b/profile.html @@ -57,7 +57,7 @@ $(function() { -
+ + +
Digital Textbook +
Digital Textbook Discussion @@ -67,6 +67,7 @@ $(function() { Log out
+




${name}

diff --git a/seq_module.html b/seq_module.html index b81126c19e..db6ed67777 100644 --- a/seq_module.html +++ b/seq_module.html @@ -1,13 +1,13 @@ % for t in range(1,1+len(items)): - + % endfor - - - + + +
 






















 
diff --git a/seq_module.js b/seq_module.js index f4f136de16..f6b33e3058 100644 --- a/seq_module.js +++ b/seq_module.js @@ -7,6 +7,13 @@ var ${ id }contents=["", "" ]; +var ${ id }types=["", + %for t in items: + "${t[1]['type']}" , + %endfor + "" + ]; + var ${ id }init_functions=["", %for t in items: function(){ ${t[1]['init_js']} }, @@ -24,16 +31,23 @@ var ${ id }loc = -1; function ${ id }goto(i) { if (${ id }loc!=-1) ${ id }destroy_functions[ ${ id }loc ](); - $('#content').html(${ id }contents[i]); + $('#seq_content').html(${ id }contents[i]); ${ id }init_functions[i]() - $('#tt_'+${ id }loc).attr("style", "background-color:grey"); + //$('#tt_'+${ id }loc).attr("style", "background-color:gray"); + $('#tt_'+${ id }loc).removeClass(); + $('#tt_'+${ id }loc).addClass("seq_"+${ id }types[${ id }loc]+"_visited"); ${ id }loc=i; - $('#tt_'+i).attr("style", "background-color:red"); + //$('#tt_'+i).attr("style", "background-color:red"); + $('#tt_'+i).removeClass(); + $('#tt_'+i).addClass("seq_active"); + MathJax.Hub.Queue(["Typeset",MathJax.Hub]); } function ${ id }setup_click(i) { $('#tt_'+i).click(function(eo) { ${ id }goto(i);}); + $('#tt_'+i).addClass("seq_"+${ id }types[i]+"_inactive"); + } function ${ id }next() { diff --git a/video.html b/video.html index 783c1b2ef0..cdd3d7f80f 100644 --- a/video.html +++ b/video.html @@ -1,27 +1,28 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + - -
+
You need Flash player 8+ and JavaScript enabled to view this video.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
-
0.75x 1x 1.25x 1.5x
+
0.75x 1x 1.25x 1.5x
+