Merge pull request #1 from dart-lang/master

update upstream

Author: butlermatt

Makefile

@@ -16,6 +16,7 @@ add_version:
 
 deploy: build
 	cd ./build && appcfg.py update .
+	echo "Visit http://$(CURRENT_BRANCH).dart-lang.appspot.com"
 
 server:
 	@open http://localhost:8080/ && cd ./src/site && jekyll && cd ../..

src/site/_layouts/dartisans_episode.markdown

@@ -2,16 +2,34 @@
 layout: default
 ---
 
-# Dartisans ep. {{ page.episode.num }}
+# Dartisans ep. {{ page.episode.title }}
 
-## {{ page.episode.subtitle }}
+<div class="row" style="margin-top: 25px">
+	<div class="span12">
 
-{{ page.episode.description }}
+		<img style="box-shadow: 5px 5px 10px #CCC; float: left; margin-right: 25px" src="dartisans-{{page.episode.num | format_num: "%02d" }}-thumb.jpeg" width="120" height="90" alt="Screenshot of Dartisans ep {{ page.episode.num }}">
 
-This hangout was recorded on {{ page.episode.pubdate }}.
+		<p>
+			{{ page.episode.description }}
+		</p>
 
-<iframe width="640" height="360" src="http://www.youtube.com/embed/{{ page.episode.youtubeid }}" frameborder="0" allowfullscreen></iframe>
+		<p>
+			This hangout was recorded on {{ page.episode.pubdate }}.
+		</p>
 
-Watch more [recordings of previous episodes of Dartisans](index.html)
-or subscribe to an
-<a href="/dartisans/podcast-feed"><i class="icon-rss"> </i> audio podcast of Dartisans</a>.
+	</div>
+</div>
+
+<div class="row" style="margin-top: 25px">
+	<div class="span12">
+
+		<iframe width="640" height="360" src="http://www.youtube.com/embed/{{ page.episode.youtubeid }}" frameborder="0" allowfullscreen></iframe>
+
+		<p>
+			Watch more <a href="index.html">recordings of previous episodes of Dartisans</a>
+			or subscribe to an
+			<a href="/dartisans/podcast-feed"><i class="icon-rss"> </i> audio podcast of Dartisans</a>.
+		</p>
+
+	</div>
+</div>

src/site/dartisans/dartisans-10-thumb.jpeg

@@ -9,7 +9,7 @@ $(document).ready(function() {
       var bits = target.getAttribute('data-bits') || 'unknown';
       var build = target.getAttribute('data-build') || 'unknown';
       var bitsAndBuild = build + '/' + bits;
-      _gaq.push(['_trackEvent', 'Editor Downloads', os, bitsAndBuild]);
+      _gaq.push(['_trackEvent', 'Editor Downloads', os, bitsAndBuild, 1]);
     });
   }
 });

src/site/js/editor-downloads-analytics.js

@@ -2,7 +2,7 @@
 
 function gplus_pressed(data) {
   if (data && data['state'] == 'on') {
-    pageTracker._trackEvent('Social', 'Share', 'Gplus', 1);
+    _gaq.push(['_trackEvent', 'Social', 'Share', 'Gplus', 1]);
   }
 }
 
@@ -28,13 +28,13 @@ $(document).ready(function() {
 
 function tweetIntentToAnalytics(intent_event) {
   if (intent_event) {
-    pageTracker._trackEvent('Social', 'Share', 'Twitter', 1);
+    _gaq.push(['_trackEvent', 'Social', 'Share', 'Twitter', 1]);
   };
 }
 
 function followIntentToAnalytics(intent_event) {
   if (intent_event) {
-    pageTracker._trackEvent('Social', 'Follow', 'Twitter', 1);
+    _gaq.push(['_trackEvent', 'Social', 'Follow', 'Twitter', 1]);
   };
 }