Permalink
Browse files

Merge branch 'refs/heads/live_site' into live_site-styles

  • Loading branch information...
2 parents 17b64eb + a9a8192 commit f156ff39ca8189afc693783d7a89fc55cf2e83b3 @micjamking micjamking committed Mar 19, 2012
Binary file not shown.
View
@@ -63,7 +63,7 @@ <h1 id="title">Call for Proposals</h1>
<p>Aloha Ruby Conference is now accepting proposals for talks. Aloha Ruby Conference 2012 happens on October 8-9 in Honolulu, Hawaii at the Sheraton Waikiki.</p>
<p>Proposals will be accepted until Saturday 3/31/2012 at midnight PDT. Proposals are reviewed on a rolling basis as they are submitted.</p>
<p>Talks will be 45 minutes with no extra time for questions. Remember that nearly all our attendees use Ruby daily, so talks should be targeted to an audience of intermediate or advanced Rubyists. Non-Ruby topics are acceptable if they are somehow related to Ruby, or just seriously awesome.</p>
- <p>If your talk is selected you will receive a free pass to attend the conference and get some special speaker swag too. At that point we’ll need a photo of you for the website and program.</p>
+ <p>If your talk is selected you will receive a free pass to attend the conference and get some special speaker swag too. At that point we’ll need a photo of you for the website and program. There is no associated travel budget for speakers.</p>
<p class="last">Please send any questions to email <a href="mailto:speak@aloharubyconf.com">speak@aloharubyconf.com</a></p>
</div>
@@ -244,8 +244,8 @@ <h3 id="title152">Talk Info</h3>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
View
@@ -185,8 +185,8 @@ <h3 id="title6"></h3>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -123,8 +123,8 @@ <h4>Sponsorship Information</h4>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
View
@@ -112,8 +112,8 @@ <h3>Hotel Accommodations</h3>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
View
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <link rel="stylesheet" href="stylesheets/style.css" />
+ <link rel="stylesheet" href="stylesheets/wufoo.css" />
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+ <script type="text/javascript">
+ if (typeof jQuery == 'undefined')
+ {document.write(unescape("%3Cscript src='javascripts/jquery.min.js'%3E%3C/script%3E"));}
+ </script>
+ <script src="javascripts/application.js"></script>
+ <script src="javascripts/wufoo.js"></script>
+ <script src="javascripts/dd-belatedpngfix-0.0.8a-min.js"></script>
+ <!--[if IE 6]>
+ <script src="DD_belatedPNG.js"></script>
+ <script>
+ DD_belatedPNG.fix('#container01');
+ </script>
+ <![endif]-->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/
+ html5.js"></script>
+ <![endif]-->
+ <title>Aloha Ruby Conference | Media</title>
+</head>
+
+<body>
+ <div id="container01">
+ <header>
+ <nav>
+ <ul id="rightLinks">
+ <li class="page-1"><a href="index">Home</a></li>
+ <li class="page-2 current"><a href="program">Program</a></li>
+ <li class="page-3"><a href="sponsors">Sponsors</a></li>
+ </ul>
+ <a id="logo" class="home" href="index.html" title="Return to the homepage">
+ <img src="images/logo.png" alt="Aloha Ruby Conference" />
+ </a>
+ <ul id="leftLinks">
+ <li class="page-4"><a href="training">Training</a></li>
+ <li class="page-5"><a href="location">Location</a></li>
+ <li class="page-6"><a href="contact">Contact</a></li>
+ </ul>
+ <div class="clear"></div>
+ </nav>
+ </header><!-- End of Header -->
+
+ </div><!-- End of Container 01 -->
+
+ <a id="registrationBanner" href="https://eventrainbow.com/aloharubyconf/2012">Register Now!</a>
+
+ <div id="container02">
+ <div id="mainbody">
+ <h1 id="title">Media</h1>
+ <section id="mainContent" class="sub">
+ <section id="registrationAvailable">
+ <div id="info">
+ </div>
+ <section id="speakers">
+ <h3>Badges</h3>
+ <div class='speaker first'>
+ <p>Speaking</p>
+ <img src='/images/aloharuby-badge-speaker.jpg'>
+ <p><code>
+ &lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-speaker.jpg" alt="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
+ </code></p>
+ <div class="clear"></div>
+ </div>
+
+ <div class='speaker first'>
+ <p>Attending</p>
+ <img src='/images/aloharuby-badges-attendant.jpg'>
+ <p><code>
+ &lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-attendant.jpg" alt="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
+ </code></p>
+ <div class="clear"></div>
+ </div>
+
+ <div class='speaker last'>
+ <p>Sponsoring</p>
+ <img src='/images/aloharuby-badge-sponsor.jpg'>
+ <p><code>
+ &lt;a href="http://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-sponsor.jpg" alt="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
+ </code></p>
+ <div class="clear"></div>
+ </div>
+ </section>
+ <div class="clear"></div>
+ </section>
+ <div class="clear"></div>
+ </section><!-- End of Main Content -->
+ </div><!-- End of Main Body -->
+ </div><!-- End of Container 02 -->
+
+ <footer>
+ <section id="footer">
+ <div class="socialMedia">
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="clear"></div>
+ </div>
+ <p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
+ </section>
+ <div class="clear"></div>
+ </footer><!-- End of Footer -->
+<script type="text/javascript">
+ var _gauges = _gauges || [];
+ (function() {
+ var t = document.createElement('script');
+ t.type = 'text/javascript';
+ t.async = true;
+ t.id = 'gauges-tracker';
+ t.setAttribute('data-site-id', '4ebb2a46f5a1f51108000008');
+ t.src = '//secure.gaug.es/track.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(t, s);
+ })();
+ </script>
+</body>
+</html>
+
View
@@ -262,8 +262,8 @@ <h3>Schedule</h3>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
View
@@ -120,8 +120,8 @@ <h3>Venue Sponsor</h3>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>
View
@@ -140,8 +140,8 @@ <h2>Contributing</h2>
<footer>
<section id="footer">
<div class="socialMedia">
- <div class="twitter"><p>Twitter:</p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@aloharubyconf</a></div>
- <div class="google"><p>Google+:</p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
+ <div class="twitter"><p></p> <a class="twitter" href="http://twitter.com/#!/aloharubyconf">@AlohaRubyConf</a></div>
+ <div class="google"><p></p> <a class="googlePlus" href="https://plus.google.com/103300205014129411442">Aloha Ruby Conference</a></div>
<div class="clear"></div>
</div>
<p class="copyright">&copy; 2012 Aloha Ruby Conference LLC. All Rights Reserved.</p>

0 comments on commit f156ff3

Please sign in to comment.