From 65b5f911001fa4d780a0a9295bf1ce8712aea0ee Mon Sep 17 00:00:00 2001
From: chapel <jacob.chapel@gmail.com>
Date: Sat, 19 Nov 2011 19:39:48 -0800
Subject: [PATCH] Fix video embedding to be on demand, also fix logo

---
 public/index.html          | 4 ++--
 public/javascripts/main.js | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/index.html b/public/index.html
index c64636d..fe78b53 100755
--- a/public/index.html
+++ b/public/index.html
@@ -22,7 +22,7 @@
 			<div class="container-12 highlight">
 					<div class="grid-3">
 						<a id="logo" href="/">
-							<img src="assets/img/logo-light.png" alt="FinalsClub" />
+							<img src="/assets/img/logo-light.png" alt="FinalsClub" />
 						</a>
 					</div>
 					<div class="grid-9">
@@ -168,7 +168,7 @@
 					<div class="grid-6">
 						<h3 class="heading">Check out our Screencasts</h3>
 						<div class="video-wrapper">
-							<iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>		</div>
+									</div>
 						</div>
 					<div class="grid-6">
 						<h3 class="heading">We currently support the following schools</h3>
diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index 6607b07..819f813 100644
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -108,7 +108,7 @@ router.add('home', false, function(cb) {
     })
   });
   if ($('#vimeo-screencast').length === 0) {
-    $('#screencast').html('<iframe id="vimeo-screencast" src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0" width="350" height="250" frameborder="0" webkitallowfullscreen="webkitAllowFullScreen" allowfullscreen="allowFullScreen"></iframe>');
+    $('.video-wrapper').html('<iframe id="vimeo-screencast" src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>');
   }
 });
 
@@ -529,10 +529,12 @@ function goPage(path) {
 var popped = false;
 function goBack(event) {
   popped = true;
+  console.timeEnd('pop')
 	showPage( topQueue.pop() );
 }
 
-
+console.time('pop')
+console.time('no-pop')
 window.onpopstate = goBack
 
 $(document).ready(function() {
@@ -554,6 +556,7 @@ $(document).ready(function() {
 
 	// xxx older FF browsers don't fire a page load/reload - deal with it somehow.
   setTimeout(function() {
+    console.timeEnd('no-pop')
     if (!popped) {
       showPage( 0 );		// needed for some older browsers, redundant for chrome
     }
-- 
2.25.1