Skip to content
Browse files

Merge branch 'master' into gh-pages

  • Loading branch information...
2 parents e945f40 + 7285697 commit e8d1d76f86f640189b97b684e357e1a6ddb22061 @cburgdorf cburgdorf committed Feb 18, 2012
Showing with 24 additions and 2 deletions.
  1. BIN images/chrome_logo.jpg
  2. +24 −2 index.html
View
BIN images/chrome_logo.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
26 index.html
@@ -26,6 +26,7 @@
<ul>
<li><a href="#home">Home</a></li>
<li><a href="#talks">Talks</a></li>
+ <li><a href="#talkIdeas">Talk ideas</a></li>
<li><a href="#about">About</a></li>
<li><a href="#speakers">Speakers</a></li>
<li><a href="#contact">Contact</a></li>
@@ -159,8 +160,8 @@
<ul>
<li><a href="http://hannoverjs.de">HannoverJS.de</a> is the official homepage.</li>
<li><a href="http://twitter.com/#!/hannoverjs/">Follow @hannoverJS</a> on twitter for announcements</li>
- <li>Take a look at our <a href="http://facebook.com/hannoverjs">Facebook site.</li>
- <ul>
+ <li>Take a look at our <a href="http://facebook.com/hannoverjs">Facebook site.</a></li>
+ </ul>
</section>
</article>
</script>
@@ -190,6 +191,27 @@
</article>
</script>
+ <script type="text/template" id="talkIdeas_template">
+ <article>
+ <header>
+ <h1>Talk Ideas</h1>
+ </header>
+ <section>
+ <header>
+ <h2>Let's brainstorm together!</h2>
+ </header>
+ <p>No idea what to talk about? Looking for someone to demystify the magic? This is the right place to collect ideas for upcoming talks. No matter if you see yourself as speaker or listener. Share your ideas here!</p>
+ <div class="speaker">
+ <div class="avatar">
+ <img alt="Chrome" src="images/chrome_logo.jpg" width="130px" height="130px"/>
+ </div>
+ <h3>Chrome Developer Tools - Know your tools</h3>
+ <p>The idea is to provide the audience with all nitty gritty about how to debug and examine a webapp with the Chrome Developer Tools.</p>
+ </div>
+ </section>
+ </article>
+ </script>
+
<script type="text/template" id="speakers_template">
<article>
<header>

0 comments on commit e8d1d76

Please sign in to comment.
Something went wrong with that request. Please try again.