Merge branch 'master' of [email protected]:scoates/phpcon-web

Conflicts:
	css/style.css

Author: ramsey

css/style.css

@@ -235,8 +235,8 @@ li {
     color: #BD820E;
     font-size: 60px;
     font-family: "RockwellExtraBoldRegular";
-    line-height: 20px;
-    vertical-align: text-bottom;
+    line-height: 40px;
+    vertical-align: text-top;
 }
 
 div#nav {
@@ -264,3 +264,25 @@ div#nav li {
 div#nav li a {
     color: #BD820E;
 }
+
+div#sponsors h1 {
+    font-size: 18px;
+    color: white;
+    background-color: #363636;
+    font-family: "NevisBold";
+    line-height: 26px;
+    font-weight: normal;
+    text-transform: uppercase;
+    height: 26px;
+    margin: 0 0 34px 0;
+    padding-left: 8px;
+}
+
+div#sponsors h2 {
+    font-size: 18px;
+    font-family: "NevisBold";
+    font-weight: normal;
+    text-transform: uppercase;
+    line-height: 20px;
+    margin: 20px 0;
+}

images/sponsor-facebook.png

@@ -19,7 +19,7 @@ <h1>PHP Community
             </div>
             <div id="body">
                 <h3>Aw Shucks!</h3>
-                <p>We're sorry, but the page you're looking for is no where to be found.</p>
+                <p>We're sorry, but the page you're looking for is nowhere to be found.</p>
             </div>
         </div>
 <?php

images/sponsor-servergrove.png

@@ -27,6 +27,14 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
                 <p>The PHP Community Conference is all about you! Come  on out to Nashville for a different kind of conference this spring.  We're going to hear from community members about projects they're  working on and how they were inspired. It's going to be a fun, laid-back event where you and the people you'll meet can collaborate to build some awesome applications of your own with PHP. Ticket sales will begin on February 3, 2011.</p>
                 <p>Of course we'll need some help from all of you to pull this off. We're calling for presentations on the topic of  real world PHP. 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 how your project solves a problem or fills a  need. 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 January 31, 2011.</p>
             </div>
+
+            <div id="sponsors">
+                <h1>Our Sponsors</h1>
+                <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>
+            </div>
         </div>
 <?php
 $body = ob_get_clean();

resources/404.html

@@ -25,7 +25,7 @@ <h2>Sponsorship Prospectus</h2>
             </div>
             <div id="body">
                 <h3>Platinum Sponsorship: $10,000.00</h3> 
-                <p>All benefits applicable to a Silver Sponsorship plus:</p> 
+                <p>All benefits applicable to a <a href="#silver">Silver Sponsorship</a> plus:</p> 
                 <ul> 
                     <li>Your brand presented on a large prominently-placed banner at the conference venue</li> 
                     <li>Top placement of your logo on our website</li> 
@@ -35,18 +35,16 @@ <h3>Platinum Sponsorship: $10,000.00</h3>
                 </ul> 
 
                 <h3>Gold Sponsorship: $5,000.00</h3> 
-                <p>All benefits applicable to a Silver Sponsorship plus:</p> 
+                <p>All benefits applicable to a <a href="#silver">Silver Sponsorship</a> plus:</p> 
                 <ul> 
                     <li>Your brand presented on a prominently-placed banner at the conference venue</li> 
                     <li>Prominent placement of your logo on our website</li> 
-                    <li>Named as the exclusive sponsor of a moderately-priced item of your choice</li> 
-                    <ul> 
-                        <li>For example: the speaker's dinner, morning break refreshments, afternoon break refreshments, lunch</li> 
-                    </ul> 
+                    <li>Named as the exclusive sponsor of a moderately-priced item of your choice<br>
+                    <em>For example: the speaker's dinner, morning break refreshments, afternoon break refreshments, lunch</em></li> 
                 </ul> 
 
 
-                <h3>Silver Sponsorship: $2,500.00</h3> 
+                <h3><a name="silver">Silver Sponsorship: $2,500.00</a></h3> 
                 <ul> 
                     <li>2 tickets to the main conference event</li> 
                     <li>Your company's logo on our website and a link to your company's website</li> 
@@ -59,10 +57,8 @@ <h3>Silver Sponsorship: $2,500.00</h3>
 
                 <h3>Community Sponsorship: $500.00</h3> 
                 <ul> 
-                    <li>1 ticket to the main conference day while supplies last</li> 
-                    <ul> 
-                        <li>Tickets are limited to the first 50 Community Sponsors</li> 
-                    </ul> 
+                    <li>1 ticket to the main conference day while supplies last<br> 
+                    <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>