From 548d0491c3cfc8de55794243a36e86fc66aecce9 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Sun, 1 Jan 2012 06:28:45 -0500
Subject: [PATCH] Slight layout changes. Addition of trakcing.

---
 accordion.html  |  2 +-
 courseware.html | 20 +++++++++++---------
 profile.html    |  8 ++++++++
 staticbook.html |  3 +++
 video.html      | 18 ++++++++++++------
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/accordion.html b/accordion.html
index 2b09b49644..857fa15f52 100644
--- a/accordion.html
+++ b/accordion.html
@@ -1,7 +1,7 @@
 <%def name="make_chapter(chapter)">
 	<h3><a href="#">${chapter['name']}</a></h3>
 	<div>
-	  <ul>
+	  <ul style="margin-left:-2em;">
             % for section in chapter['sections']:
                <li> <div
 		      % if 'active' in section and section['active']:
diff --git a/courseware.html b/courseware.html
index 1685a2e6d9..c377c3dddd 100644
--- a/courseware.html
+++ b/courseware.html
@@ -21,15 +21,7 @@ $('#hide_acc').click(function() {
 });
 </script>
 
-<div id="bodyContent">
-<table width=100% cellpadding=0><tr>
-<td width=276 valign=top>
-    <div id="accordion">
-    ${accordion}
-    </div>
-</td>
-<td valign=top>
-    <div id="coursenav">
+    <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"><b>Courseware</b></a> 
@@ -43,6 +35,16 @@ $('#hide_acc').click(function() {
 <a href="/help">Help</a> <span class="ui-icon ui-icon-bullet" style="display:inline-block;"></span> 
 <a href="/logout">Log out</a>
     </div>
+
+
+<div id="bodyContent">
+<table width=100% cellpadding=0><tr>
+<td width=276 valign=top>
+    <div id="accordion" style="position:relative; top:-6px; ">
+    ${accordion}
+    </div>
+</td>
+<td valign=top>
     <div>
        ${content}
        </div>
diff --git a/profile.html b/profile.html
index 1e3b65cabc..90b6dea63a 100644
--- a/profile.html
+++ b/profile.html
@@ -5,6 +5,8 @@ var loc=true; // Activate on clicks? Not if already clicked.
 var lang=true;
 $(function() {
         $("#change_location").click(function() {
+           log_event("profile", {"type":"location_show", "old":$("#location_sub").text()});
+
            if(loc) {
              $("#description").html('<div style="color:#FF0000">'+
                                     "Preferred format is city, state, country (so for us, "+
@@ -19,12 +21,15 @@ $(function() {
                   $("#location_sub").text(json.location);
                   loc=true;
                   $("#description").html("");
+                 log_event("profile", {"type":"location_change", "new":json.location});
                 });
              });
            }
         });
 
         $("#change_language").click(function() {
+           log_event("profile", {"type":"language_show", "old":$("#language_sub").text()});
+
            if(lang) {
              lang=false;
              $("#language_sub").html('<input id="id_lang_text" type="text" name="lang_text" />'+
@@ -34,6 +39,7 @@ $(function() {
                   $("#language_sub").text(json.language);
                   lang=true;
                   $("#description").html("");
+                 log_event("profile", {"type":"language_change", "new":json.language});
                 });
              });
            }
@@ -45,12 +51,14 @@ $(function() {
 
         $('#change_password').click(function(){
           $('#inline').trigger('click');
+            log_event("profile", {"type":"password_show"});
         });
 
     $('#pwd_reset_button').click(function() {
       $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
                     "email"  : $('#id_email').val()}, function(data){
          $('#pwd_reset').html(data);
+         log_event("profile", {"type":"password_send"});
       });
     });
 })
diff --git a/staticbook.html b/staticbook.html
index 6d336c56fd..063b21fa3d 100644
--- a/staticbook.html
+++ b/staticbook.html
@@ -7,6 +7,7 @@ $(document).ready(function(){
 });
 
 function goto_page(n) {
+  log_event("book", {"type":"gotopage","old":page,"new":n});
   page=n;
   var prefix = "";
   if(n<100) {
@@ -22,12 +23,14 @@ function prev_page() {
   page=page-1;
   if(page<1) page=1;
   goto_page(page);
+  log_event("book", {"type":"prevpage","new":page});
 }
 
 function next_page() {
   page=page+1;
   if(page>1764) page=1764;
   goto_page(page);
+  log_event("book", {"type":"nextpage","new":page});
 }
 
 </script>
diff --git a/video.html b/video.html
index 2e400757ac..661e2fc9db 100644
--- a/video.html
+++ b/video.html
@@ -1,10 +1,14 @@
 <table>
-  <tr><td rowspan=13 colspan=3>
+  <tr><td rowspan=1 colspan=4>
       <div id="ytapiplayer">
 	You need Flash player 8+ and JavaScript enabled to view this video.
       </div>
     </td>
-<td id=stt_n5 align=center><div id=std_n5 onclick="title_seek(-5);">&nbsp;</div></td></tr>
+<td>
+<table>
+<tr><td id=stt_n5 align=center><div id=std_n7 onclick="title_seek(-7);">&nbsp;</div></td></tr>
+<tr><td id=stt_n4 align=center><div id=std_n6 onclick="title_seek(-6);">&nbsp;</div></td></tr>
+<tr><td id=stt_n4 align=center><div id=std_n5 onclick="title_seek(-5);">&nbsp;</div></td></tr>
 <tr><td id=stt_n4 align=center><div id=std_n4 onclick="title_seek(-4);">&nbsp;</div></td></tr>
 <tr><td id=stt_n3 align=center><div id=std_n3 onclick="title_seek(-3);">&nbsp;</div></td></tr>
 <tr><td id=stt_n2 align=center><div id=std_n2 onclick="title_seek(-2);">&nbsp;</div></td></tr>
@@ -16,13 +20,15 @@
 <tr><td id=stt_p4 align=center><div id=std_p4 onclick="title_seek( 4);">&nbsp;</div></td></tr>
 <tr><td id=stt_p5 align=center><div id=std_p5 onclick="title_seek( 5);">&nbsp;</div></td></tr>
 <tr><td id=stt_p6 align=center><div id=std_p7 onclick="title_seek( 6);">&nbsp;</div></td></tr>
+<tr><td id=stt_p6 align=center><div id=std_p7 onclick="title_seek( 7);">&nbsp;</div></td></tr>
+<tr><td id=stt_p6 align=center><div id=std_p7 onclick="title_seek( 8);">&nbsp;</div></td></tr>
 <tr><td><img src="/static/pixel.jpg" width=400 height=0></td></tr>
-
+</table>
+</td>
 <tr><td width=15><span class="ui-icon ui-icon-play" onclick="play();"></span></td>
                <td width=15><span class="ui-icon ui-icon-pause" onclick="pause();"></span></td>
-               <td colspan=2><div id=slider></div></td></tr>
-
-<tr><td colspan=4 align=right><div align=right id="video_speeds"> </div></td></tr>
+               <td colspan=4><div id=slider></div></td></tr>
+<tr><td colspan=4><div id="vidtime">0:00/0:00</div></td><td><div align=right id="video_speeds"> </div></td></tr>
 </table>