4 files changed, 184 insertions, 119 deletions

diff --git a/js/slides.js b/js/slides.js
index 30aee54..e397d96 100644
--- a/js/slides.js
+++ b/js/slides.js
@@ -158,14 +158,6 @@ SlideDeck.prototype.loadConfig_ = function() {
     this.addFavIcon_(settings.favIcon);
   }
 
-  if (settings.title) {
-    document.title = settings.title;
-  }
-  
-  if (settings.title) {
-    document.title = settings.title;
-  }
-
   if (!!!('usePrettify' in settings) || settings.usePrettify) {
     prettyPrint();
   }
@@ -181,6 +173,47 @@ SlideDeck.prototype.loadConfig_ = function() {
   if (!!!('useBuilds' in settings) || settings.useBuilds) {
     this.makeBuildLists_();
   }
+
+  if (settings.title) {
+    document.title = settings.title + ' - Google IO 2012';
+    document.querySelector('[data-config-title]').textContent = settings.title;
+  }
+
+  if (settings.subtitle) {
+    document.querySelector('[data-config-subtitle]').textContent = settings.subtitle;
+  }
+
+  if (this.config_.presenters) {
+    var presenters = this.config_.presenters;
+
+    var html = [];
+    if (presenters.length == 1) {
+      var p = presenters[0]
+
+      html = [p.name, p.company].join('<br>');
+
+      var gplus = p.gplus ? '<span>g+</span><a href="' + p.gplus +
+                            '" target="_blank">' + p.gplus + '</a>' : '';
+
+      var twitter = p.twitter ? '<span>twitter</span>' +
+          '<a href="http://twitter.com/' + p.twitter + '" target="_blank">' +
+          p.twitter + '</a>' : '';
+
+     var www = p.www ? '<span>www</span><a href="' + p.www +
+                       '" target="_blank">' + p.www + '</a>' : '';
+
+      var html2 = [gplus, twitter, www].join('<br>');
+
+      document.querySelector('[data-config-contact]').innerHTML = html2;
+    } else {
+      for (var i = 0, p; p = presenters[i]; ++i) {
+        html.push(p.name + ' - ' + p.company);
+      }
+      html = html.join('<br>');
+    }
+
+    document.querySelector('[data-config-presenter]').innerHTML = html;
+  }
 };
 
 /**
diff --git a/template.html b/template.html
index afac672..b0e2dc6 100644
--- a/template.html
+++ b/template.html
@@ -25,13 +25,11 @@ URL: https://code.google.com/p/io-2012-slides
 
   <slide class="title-slide segue nobackground">
     <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside>
+    <!-- The content of this hgroup is replaced programmatically through the config. -->
     <hgroup class="auto-fadein">
-      <h1>Title Goes Here</h1>
-      <h2>Subtitle Goes Here</h2>
-      <p>
-        Speaker Name<br>
-        Title
-      </p>
+      <h1 data-config-title><!-- populated from config --></h1>
+      <h2 data-config-subtitle><!-- populated from config --></h2>
+      <p data-config-presenter><!-- populated from config --></p>
     </hgroup>
   </slide>
 
@@ -87,7 +85,7 @@ URL: https://code.google.com/p/io-2012-slides
           </ul>
         </li>
         <li>Subtitle capitalization is title case</li>
-        <li>Titles and subtitles should never have a period at the end</li>
+        <li>Titles and <a href="http://google.com">subtitles</a> should never have a period at the end</li>
       </ul>
     </article>
   </slide>
@@ -189,10 +187,10 @@ function helloWorld(world) {
       <h2>&lt;Thank You!&gt;</h2>
       <p>Important contact information goes here.</p>
     </article>
-    <p class="auto-fadein">
-      Insert contact info<br>
+    <p class="auto-fadein" data-config-contact>
+      <!--Insert contact info<br>
       Insert contact info<br>
-      Insert contact info
+      Insert contact info-->
     </p>
   </slide>
 
@@ -208,7 +206,8 @@ function helloWorld(world) {
   var slideConfig = {
     // Slide settings
     settings: {
-      title: 'A Fancy Slide Deck - Google IO 2012',
+      title: 'Title Goes Here',
+      subtitle: 'Subtitle Goes Here',
       theme: 'default',
       hashtag: '#html5', //TODO
       useBuilds: true,
@@ -224,13 +223,19 @@ function helloWorld(world) {
     },
 
     // Author information
-    author: [{
-      name: 'Luke Mahe',
-      gplus: 'http://www.google.com'
-    }, {
+    presenters: [{
+      name: 'Firstname Lastname',
+      company: 'Job Title, Google',
+      gplus: 'http://plus.google.com/1234567890',
+      twitter: '@yourhandle',
+      www: 'http://www.you.com'
+    }/*, {
       name: 'Eric Bidelman',
-      gplus: 'http://plus.ericbidelman.com'
-    }]
+      gplus: 'http://plus.ericbidelman.com',
+      company: 'Senior Developer Programs Engineer, Google Chrome',
+      twitter: '@ebidel',
+      www: 'http://www.ericbidelman.com'
+    }*/]
   };
 </script>
 
diff --git a/theme/css/default.css b/theme/css/default.css
index 276c29e..39b7f53 100644
--- a/theme/css/default.css
+++ b/theme/css/default.css
@@ -490,23 +490,25 @@ b {
 
 /* line 229, ../sass/default.scss */
 a {
-  color: #0066cc;
-}
-/* line 232, ../sass/default.scss */
-a:visited {
-  color: rgba(0, 102, 204, 0.75);
-}
-/* line 236, ../sass/default.scss */
+  color: #2a7cdf;
+  text-decoration: none;
+  padding-bottom: 2px;
+  border-bottom: 1px solid rgba(42, 124, 223, 0.5);
+  /*  &:visited {
+      color: rgba(0, 102, 204, 0.75);
+    }*/
+}
+/* line 239, ../sass/default.scss */
 a:hover {
-  color: black;
+  color: black !important;
 }
 
-/* line 241, ../sass/default.scss */
+/* line 244, ../sass/default.scss */
 h1, h2, h3 {
   font-weight: 600;
 }
 
-/* line 245, ../sass/default.scss */
+/* line 248, ../sass/default.scss */
 h2 {
   font-size: 45px;
   line-height: 45px;
@@ -514,7 +516,7 @@ h2 {
   color: #515151;
 }
 
-/* line 252, ../sass/default.scss */
+/* line 255, ../sass/default.scss */
 h3 {
   font-size: 30px;
   letter-spacing: -1px;
@@ -523,38 +525,38 @@ h3 {
   color: #797979;
 }
 
-/* line 260, ../sass/default.scss */
+/* line 263, ../sass/default.scss */
 ul {
   margin-left: 1.2em;
   margin-bottom: 1em;
 }
-/* line 264, ../sass/default.scss */
+/* line 267, ../sass/default.scss */
 ul li {
   margin-bottom: 0.5em;
 }
-/* line 267, ../sass/default.scss */
+/* line 270, ../sass/default.scss */
 ul li ul {
   margin-left: 2em;
   margin-bottom: 0;
 }
-/* line 271, ../sass/default.scss */
+/* line 274, ../sass/default.scss */
 ul li ul li:before {
   content: '-';
   font-weight: 600;
 }
-/* line 278, ../sass/default.scss */
+/* line 281, ../sass/default.scss */
 ul > li:before {
   content: '·';
   margin-left: -1em;