Merge branch 'master' of github.com:scoates/phpcon-web

Author: nicksloan

css/style.css

@@ -266,7 +266,6 @@ div#nav {
     font-family: "NevisBold";
     font-weight: normal;
     line-height: 20px;
-    color: #BD820E;
 }
 
 div#nav ul {
@@ -275,6 +274,16 @@ div#nav ul {
     margin: 0;
 }
 
+div#nav li {
+    display: inline;
+    list-style-type: none;
+    margin-right: 20px;
+}
+
+div#nav li a {
+    color: #BD820E;
+}
+
 div#sponsors h1 {
     font-size: 18px;
     color: white;

resources/cfp.html

@@ -0,0 +1,43 @@
+<?php
+$title = 'Call for Proposals - ';
+ob_start();
+?>
+
+        <div id="container" class="sub">
+            <div class="header">
+                <h1>PHP Community
+                <span>Conference</span></h1>
+                <div id="nav">
+                    <ul>
+                        <li><a href="/">Home</a></li>
+                        <li><a href="/sponsorships">Sponsor Us</a></li>
+                        <li>CFP</li>
+                    </ul>
+                </div>
+                <div id="social">
+                    <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.phpcon.org%2F&amp;layout=button_count&amp;show_faces=false&amp;width=80&amp;action=like&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:80px; height:21px;" allowTransparency="true" id="fbLike"></iframe>
+                    <p class="twitter">Follow Us: <a href="http://twitter.com/phpcomcon">PHPCOMCON</a></p>
+                </div>
+            </div>
+            <div class="aside">
+                <p><span>&ldquo;</span>Tell us about an inspiring project you&rsquo;re working on and why it&rsquo;s important.<span>&rdquo;</span></p>
+            </div>
+            <div class="section">
+
+                <h2>Call for Proposals</h2>
+                <p>We're calling for presentations on the topic of <strong>real world PHP</strong>. Tell us about an inspiring project you're working on and why it's important. We don't want to focus on the details of the code itself, but rather on <strong>how your project solves a problem or fills a need</strong>.</p>
+                <p>If selected as a speaker, we will cover your air fare and hotel costs for the dates of the event. To submit a talk, please email your proposed title and abstract to <a href="mailto:[email protected]">[email protected]</a> by <strong>January 31, 2011</strong>.</p>
+
+                <h3>Regular Sessions</h3>
+                <p>Regular sessions take place on the main conference day on Friday, April 22. We want you to have fun with these sessions. Tell us a story. Tell us <em>your</em> story. Don't just tell us how to do something with PHP. Tell us what you're working on with PHP. What does it do? Why is it important? Include lots of anecdotes. We want to hear them!</p>
+                <p>All sessions are 45 minutes long. They're short, but sweet, so be sure you leave room for questions.</p>
+
+                <h3>In-depth, Technical Workshops</h3>
+                <p>Have a lot more technical "meat" than a 45-minute session will allow? Why not submit a proposal for a workshop? Unlike our regular sessions, workshops are in-depth, technical, and instructive. Don't be afraid to show lots of code here. In fact, it's expected.</p>
+                <p>Our workshops are held on Thursday, April 21, and each run about three hours, including breaks.</p>
+
+            </div>
+        </div>
+<?php
+$body = ob_get_clean();
+

resources/home.html

@@ -14,7 +14,9 @@ <h2>April 21 <span>&amp;</span> 22</h2>
                 <h3>Nashville,<span>&nbsp;</span>TN</h3>
                 <div id="nav">
                     <ul>
+                        <li>Home</li>
                         <li><a href="/sponsorships">Sponsor Us</a></li>
+                        <li><a href="/cfp">CFP</a></li>
                     </ul>
                 </div>
             </div>
@@ -32,6 +34,8 @@ <h2>Gold Sponsors</h2>
                 <a href="http://facebook.com/"><img src="images/sponsor-facebook.png" alt="Facebook"/></a>
                 <h2>Silver Sponsors</h2>
                 <a href="http://servergrove.com/"><img src="images/sponsor-servergrove.png" alt="ServerGrove"/></a>
+                <h2>Media Sponsors</h2>
+		<a href="http://phpdeveloper.org"><img src="http://phpdeveloper.org/Test/public/img/ads/phpdeveloper-media.jpg" border="0" width="150" /></a>                
             </div>
         </div>
 <?php

resources/sponsorships.html

@@ -10,6 +10,8 @@ <h1>PHP Community
                 <div id="nav">
                     <ul>
                         <li><a href="/">Home</a></li>
+                        <li>Sponsor Us</li>
+                        <li><a href="/cfp">CFP</a></li>
                     </ul>
                 </div>
                 <div id="social"> 
@@ -49,7 +51,7 @@ <h3><a name="silver">Silver Sponsorship: $2,500.00</a></h3>
                     <li>A tweet from @phpcomcon announcing the sponsorship</li> 
                     <li>Personally thanked from the stage during the main conference day</li> 
                     <li>Your company's logo on the back of the name badges</li> 
-                    <li>Included on the @phpcomcon Community Sponsor Twitter list</li> 
+                    <li>Included on the <a href="http://twitter.com/phpcomcon/sponsors">@phpcomcon Sponsors Twitter list</a></li> 
                 </ul>
 
 
@@ -59,7 +61,7 @@ <h3>Community Sponsorship: $500.00</h3>
                     <em>Tickets are limited to the first 50 Community Sponsors</em></li> 
                     <li>Special recognition on our website</li> 
                     <li>Including your name or company name and a link to your personal or company website</li> 
-                    <li>Your Twitter name will be added to the @phpcomcon Community Sponsor Twitter list</li> 
+                    <li>Your Twitter name will be added to the <a href="http://twitter.com/phpcomcon/sponsors">@phpcomcon Sponsors Twitter list</a></li> 
                 </ul> 
                 </p> 
             </div>