From 7284d43ef62cfc020a0dd7168133dcfbc1c378eb Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 5 Mar 2012 17:27:19 -0500
Subject: [PATCH] Made the time look more friendly

---
 css/application.css | 7 +++++++
 js/video_player.js  | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/css/application.css b/css/application.css
index 68c5841d16..f2af56430f 100644
--- a/css/application.css
+++ b/css/application.css
@@ -2509,6 +2509,9 @@ div.course-wrapper section.course-content ol.vert-mod > li:last-child {
   border-bottom: none;
   margin-bottom: 0;
   padding-bottom: 0; }
+div.course-wrapper section.course-content section.tutorials ul {
+  list-style: disc outside none;
+  margin-left: 22.652px; }
 div.course-wrapper.closed section.course-index {
   width: 3.077%; }
 div.course-wrapper.closed section.course-index header#open_close_accordion {
@@ -2725,6 +2728,8 @@ section.course-content div.video-subtitles div.video-wrapper section.video-contr
   zoom: 1;
   *display: inline;
   *vertical-align: auto; }
+section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls div.speeds ol#video_speeds li.active {
+  font-weight: bold; }
 section.course-content div.video-subtitles div.video-wrapper section.video-controls div.secondary-controls a.hide-subtitles {
   float: left;
   display: block;
@@ -2985,6 +2990,8 @@ div.book-wrapper section.book-sidebar {
   -ms-box-sizing: border-box;
   -o-box-sizing: border-box;
   box-sizing: border-box; }
+div.book-wrapper section.book-sidebar ul#booknav {
+  font-size: 12px; }
 div.book-wrapper section.book-sidebar ul#booknav a {
   color: #000; }
 div.book-wrapper section.book-sidebar ul#booknav a:hover {
diff --git a/js/video_player.js b/js/video_player.js
index 59f22dd69d..507596f8a6 100644
--- a/js/video_player.js
+++ b/js/video_player.js
@@ -141,12 +141,17 @@ function format_time(t)
     hours = Math.floor(minutes / 60);
     seconds = seconds % 60;
     minutes = minutes % 60;
-    return hours+":"+((minutes < 10)?"0":"")+minutes+":"+((seconds < 10)?"0":"")+(seconds%60);
+
+    if (hours) {
+      return hours+":"+((minutes < 10)?"0":"")+minutes+":"+((seconds < 10)?"0":"")+(seconds%60);
+    } else {
+      return minutes+":"+((seconds < 10)?"0":"")+(seconds%60);
+    }
 }
 
 function update_captions(t) {
     var i=caption_index(t);
-    $("#vidtime").html(format_time(ytplayer.getCurrentTime())+'/'+format_time(ytplayer.getDuration()));
+    $("#vidtime").html(format_time(ytplayer.getCurrentTime())+' / '+format_time(ytplayer.getDuration()));
     var j;
     for(j=1; j<9; j++) {
 	$("#std_n"+j).html(caption_at(i-j));