diff options
author | Eric Bidelman | 2012-04-09 19:23:37 -0700 |
---|---|---|
committer | Eric Bidelman | 2012-04-09 19:23:37 -0700 |
commit | ca26979ec3e0f76c6623e9b488bfb976cd976566 (patch) | |
tree | 22457c09490ade1254fe414fd4bfa2832bc87738 | |
parent | 5f5d79dc7395392057028380e876a2883722ee38 (diff) | |
download | io-slides-remote-ca26979ec3e0f76c6623e9b488bfb976cd976566.tar.gz |
Contact info config hooked up
-rw-r--r-- | js/slides.js | 49 | ||||
-rw-r--r-- | template.html | 39 | ||||
-rw-r--r-- | theme/css/default.css | 191 | ||||
-rw-r--r-- | theme/sass/default.scss | 24 |
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() { | |||
158 | this.addFavIcon_(settings.favIcon); | 158 | this.addFavIcon_(settings.favIcon); |
159 | } | 159 | } |
160 | 160 | ||
161 | if (settings.title) { | ||
162 | document.title = settings.title; | ||
163 | } | ||
164 | |||
165 | if (settings.title) { | ||
166 | document.title = settings.title; | ||
167 | } | ||
168 | |||
169 | if (!!!('usePrettify' in settings) || settings.usePrettify) { | 161 | if (!!!('usePrettify' in settings) || settings.usePrettify) { |
170 | prettyPrint(); | 162 | prettyPrint(); |
171 | } | 163 | } |
@@ -181,6 +173,47 @@ SlideDeck.prototype.loadConfig_ = function() { | |||
181 | if (!!!('useBuilds' in settings) || settings.useBuilds) { | 173 | if (!!!('useBuilds' in settings) || settings.useBuilds) { |
182 | this.makeBuildLists_(); | 174 | this.makeBuildLists_(); |
183 | } | 175 | } |
176 | |||
177 | if (settings.title) { | ||
178 | document.title = settings.title + ' - Google IO 2012'; | ||
179 | document.querySelector('[data-config-title]').textContent = settings.title; | ||
180 | } | ||
181 | |||
182 | if (settings.subtitle) { | ||
183 | document.querySelector('[data-config-subtitle]').textContent = settings.subtitle; | ||
184 | } | ||
185 | |||
186 | if (this.config_.presenters) { | ||
187 | var presenters = this.config_.presenters; | ||
188 | |||
189 | var html = []; | ||
190 | if (presenters.length == 1) { | ||
191 | var p = presenters[0] | ||
192 | |||
193 | html = [p.name, p.company].join('<br>'); | ||
194 | |||
195 | var gplus = p.gplus ? '<span>g+</span><a href="' + p.gplus + | ||
196 | '" target="_blank">' + p.gplus + '</a>' : ''; | ||
197 | |||
198 | var twitter = p.twitter ? '<span>twitter</span>' + | ||
199 | '<a href="http://twitter.com/' + p.twitter + '" target="_blank">' + | ||
200 | p.twitter + '</a>' : ''; | ||
201 | |||
202 | var www = p.www ? '<span>www</span><a href="' + p.www + | ||
203 | '" target="_blank">' + p.www + '</a>' : ''; | ||
204 | |||
205 | var html2 = [gplus, twitter, www].join('<br>'); | ||
206 | |||
207 | document.querySelector('[data-config-contact]').innerHTML = html2; | ||
208 | } else { | ||
209 | for (var i = 0, p; p = presenters[i]; ++i) { | ||
210 | html.push(p.name + ' - ' + p.company); | ||
211 | } | ||
212 | html = html.join('<br>'); | ||
213 | } | ||
214 | |||
215 | document.querySelector('[data-config-presenter]').innerHTML = html; | ||
216 | } | ||
184 | }; | 217 | }; |
185 | 218 | ||
186 | /** | 219 | /** |
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 | |||
25 | 25 | ||
26 | <slide class="title-slide segue nobackground"> | 26 | <slide class="title-slide segue nobackground"> |
27 | <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside> | 27 | <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside> |
28 | <!-- The content of this hgroup is replaced programmatically through the config. --> | ||
28 | <hgroup class="auto-fadein"> | 29 | <hgroup class="auto-fadein"> |
29 | <h1>Title Goes Here</h1> | 30 | <h1 data-config-title><!-- populated from config --></h1> |
30 | <h2>Subtitle Goes Here</h2> | 31 | <h2 data-config-subtitle><!-- populated from config --></h2> |
31 | <p> | 32 | <p data-config-presenter><!-- populated from config --></p> |
32 | Speaker Name<br> | ||
33 | Title | ||
34 | </p> | ||
35 | </hgroup> | 33 | </hgroup> |
36 | </slide> | 34 | </slide> |
37 | 35 | ||
@@ -87,7 +85,7 @@ URL: https://code.google.com/p/io-2012-slides | |||
87 | </ul> | 85 | </ul> |
88 | </li> | 86 | </li> |
89 | <li>Subtitle capitalization is title case</li> | 87 | <li>Subtitle capitalization is title case</li> |
90 | <li>Titles and subtitles should never have a period at the end</li> | 88 | <li>Titles and <a href="http://google.com">subtitles</a> should never have a period at the end</li> |
91 | </ul> | 89 | </ul> |
92 | </article> | 90 | </article> |
93 | </slide> | 91 | </slide> |
@@ -189,10 +187,10 @@ function helloWorld(world) { | |||
189 | <h2><Thank You!></h2> | 187 | <h2><Thank You!></h2> |
190 | <p>Important contact information goes here.</p> | 188 | <p>Important contact information goes here.</p> |
191 | </article> | 189 | </article> |
192 | <p class="auto-fadein"> | 190 | <p class="auto-fadein" data-config-contact> |
193 | Insert contact info<br> | 191 | <!--Insert contact info<br> |
194 | Insert contact info<br> | 192 | Insert contact info<br> |
195 | Insert contact info | 193 | Insert contact info--> |
196 | </p> | 194 | </p> |
197 | </slide> | 195 | </slide> |
198 | 196 | ||
@@ -208,7 +206,8 @@ function helloWorld(world) { | |||
208 | var slideConfig = { | 206 | var slideConfig = { |
209 | // Slide settings | 207 | // Slide settings |
210 | settings: { | 208 | settings: { |
211 | title: 'A Fancy Slide Deck - Google IO 2012', | 209 | title: 'Title Goes Here', |
210 | subtitle: 'Subtitle Goes Here', | ||
212 | theme: 'default', | 211 | theme: 'default', |
213 | hashtag: '#html5', //TODO | 212 | hashtag: '#html5', //TODO |
214 | useBuilds: true, | 213 | useBuilds: true, |
@@ -224,13 +223,19 @@ function helloWorld(world) { | |||
224 | }, | 223 | }, |
225 | 224 | ||
226 | // Author information | 225 | // Author information |
227 | author: [{ | 226 | presenters: [{ |
228 | name: 'Luke Mahe', | 227 | name: 'Firstname Lastname', |
229 | gplus: 'http://www.google.com' | 228 | company: 'Job Title, Google', |
230 | }, { | 229 | gplus: 'http://plus.google.com/1234567890', |
230 | twitter: '@yourhandle', | ||
231 | www: 'http://www.you.com' | ||
232 | }/*, { | ||
231 | name: 'Eric Bidelman', | 233 | name: 'Eric Bidelman', |
232 | gplus: 'http://plus.ericbidelman.com' | 234 | gplus: 'http://plus.ericbidelman.com', |
233 | }] | 235 | company: 'Senior Developer Programs Engineer, Google Chrome', |
236 | twitter: '@ebidel', | ||
237 | www: 'http://www.ericbidelman.com' | ||
238 | }*/] | ||
234 | }; | 239 | }; |
235 | </script> | 240 | </script> |
236 | 241 | ||
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 { | |||
490 | 490 | ||
491 | /* line 229, ../sass/default.scss */ | 491 | /* line 229, ../sass/default.scss */ |
492 | a { | 492 | a { |
493 | color: #0066cc; | 493 | color: #2a7cdf; |
494 | } | 494 | text-decoration: none; |
495 | /* line 232, ../sass/default.scss */ | 495 | padding-bottom: 2px; |
496 | a:visited { | 496 | border-bottom: 1px solid rgba(42, 124, 223, 0.5); |
497 | color: rgba(0, 102, 204, 0.75); | 497 | /* &:visited { |
498 | } | 498 | color: rgba(0, 102, 204, 0.75); |
499 | /* line 236, ../sass/default.scss */ | 499 | }*/ |
500 | } | ||
501 | /* line 239, ../sass/default.scss */ | ||
500 | a:hover { | 502 | a:hover { |
501 | color: black; | 503 | color: black !important; |
502 | } | 504 | } |
503 | 505 | ||
504 | /* line 241, ../sass/default.scss */ | 506 | /* line 244, ../sass/default.scss */ |
505 | h1, h2, h3 { | 507 | h1, h2, h3 { |
506 | font-weight: 600; | 508 | font-weight: 600; |
507 | } | 509 | } |
508 | 510 | ||
509 | /* line 245, ../sass/default.scss */ | 511 | /* line 248, ../sass/default.scss */ |
510 | h2 { | 512 | h2 { |
511 | font-size: 45px; | 513 | font-size: 45px; |
512 | line-height: 45px; | 514 | line-height: 45px; |
@@ -514,7 +516,7 @@ h2 { | |||
514 | color: #515151; | 516 | color: #515151; |
515 | } | 517 | } |
516 | 518 | ||
517 | /* line 252, ../sass/default.scss */ | 519 | /* line 255, ../sass/default.scss */ |
518 | h3 { | 520 | h3 { |
519 | font-size: 30px; | 521 | font-size: 30px; |
520 | letter-spacing: -1px; | 522 | letter-spacing: -1px; |
@@ -523,38 +525,38 @@ h3 { | |||
523 | color: #797979; | 525 | color: #797979; |
524 | } | 526 | } |
525 | 527 | ||
526 | /* line 260, ../sass/default.scss */ | 528 | /* line 263, ../sass/default.scss */ |
527 | ul { | 529 | ul { |
528 | margin-left: 1.2em; | 530 | margin-left: 1.2em; |
529 | margin-bottom: 1em; | 531 | margin-bottom: 1em; |
530 | } | 532 | } |
531 | /* line 264, ../sass/default.scss */ | 533 | /* line 267, ../sass/default.scss */ |
532 | ul li { | 534 | ul li { |
533 | margin-bottom: 0.5em; | 535 | margin-bottom: 0.5em; |
534 | } | 536 | } |
535 | /* line 267, ../sass/default.scss */ | 537 | /* line 270, ../sass/default.scss */ |
536 | ul li ul { | 538 | ul li ul { |
537 | margin-left: 2em; | 539 | margin-left: 2em; |
538 | margin-bottom: 0; | 540 | margin-bottom: 0; |
539 | } | 541 | } |
540 | /* line 271, ../sass/default.scss */ | 542 | /* line 274, ../sass/default.scss */ |
541 | ul li ul li:before { | 543 | ul li ul li:before { |
542 | content: '-'; | 544 | content: '-'; |
543 | font-weight: 600; | 545 | font-weight: 600; |
544 | } | 546 | } |
545 | /* line 27 |