aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/slide-deck.js11
-rw-r--r--slide_config.js1
-rw-r--r--template.html4
3 files changed, 12 insertions, 4 deletions
diff --git a/js/slide-deck.js b/js/slide-deck.js
index 50b9dc5..6fc99eb 100644
--- a/js/slide-deck.js
+++ b/js/slide-deck.js
@@ -315,7 +315,10 @@ SlideDeck.prototype.loadConfig_ = function(config) {
315 } 315 }
316 316
317 if (settings.title) { 317 if (settings.title) {
318 document.title = settings.title.replace(/<br\/?>/, ' ') + ' - Google IO 2012'; 318 document.title = settings.title.replace(/<br\/?>/, ' ');
319 if (settings.eventTitle) {
320 document.title += ' - ' + settings.eventTitle;
321 }
319 document.querySelector('[data-config-title]').innerHTML = settings.title; 322 document.querySelector('[data-config-title]').innerHTML = settings.title;
320 } 323 }
321 324
@@ -363,7 +366,11 @@ SlideDeck.prototype.loadConfig_ = function(config) {
363 366
364 var dataConfigPresenter = document.querySelector('[data-config-presenter]'); 367 var dataConfigPresenter = document.querySelector('[data-config-presenter]');
365 if (dataConfigPresenter) { 368 if (dataConfigPresenter) {
366 document.querySelector('[data-config-presenter]').innerHTML = html; 369 dataConfigPresenter.innerHTML = html;
370 if (settings.eventTitle) {
371 dataConfigPresenter.innerHTML = dataConfigPresenter.innerHTML + '<br>' +
372 settings.eventTitle;
373 }
367 } 374 }
368 } 375 }
369 376
diff --git a/slide_config.js b/slide_config.js
index 4a7d3f4..a849147 100644
--- a/slide_config.js
+++ b/slide_config.js
@@ -3,6 +3,7 @@ var SLIDE_CONFIG = {
3 settings: { 3 settings: {
4 title: 'Title Goes Here<br>Up To Two Lines', 4 title: 'Title Goes Here<br>Up To Two Lines',
5 subtitle: 'Subtitle Goes Here', 5 subtitle: 'Subtitle Goes Here',
6 //eventTitle: 'Google I/O 2013',
6 useBuilds: true, // Default: true. False will turn off slide animation builds. 7 useBuilds: true, // Default: true. False will turn off slide animation builds.
7 usePrettify: true, // Default: true 8 usePrettify: true, // Default: true
8 enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides. 9 enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides.
diff --git a/template.html b/template.html
index 3560397..93eb2a0 100644
--- a/template.html
+++ b/template.html
@@ -1,5 +1,5 @@
1<!-- 1<!--
2Google IO 2012 HTML5 Slide Template 2Google IO 2012/2013 HTML5 Slide Template
3 3
4Authors: Eric Bidelman <ebidel@gmail.com> 4Authors: Eric Bidelman <ebidel@gmail.com>
5 Luke Mahé <lukem@google.com> 5 Luke Mahé <lukem@google.com>
@@ -9,7 +9,7 @@ URL: https://code.google.com/p/io-2012-slides
9<!DOCTYPE html> 9<!DOCTYPE html>
10<html> 10<html>
11<head> 11<head>
12 <title>Google IO 2012</title> 12 <title></title>
13 <meta charset="utf-8"> 13 <meta charset="utf-8">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1"> 14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
15 <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">--> 15 <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">-->