Fix video embedding to be on demand, also fix logo

diff --git a/public/index.html b/public/index.html
index c64636def9d86a10dc5e8582820c81c6782d855c..fe78b539bb09fc8d2bbdde2890073a332cfb79e7 100755 (executable)
--- 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 6607b07d99220e3b4dfa71d6830e8f73610b64ca..819f813935e496d755ee522e00e2ee717a2745cf 100644 (file)
--- 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
     }