Merge branch 'master' into prod

Author: lisamusing

images/broadway_3.jpg

@@ -17,11 +17,11 @@
 //echo "requestedPage is: ".$requestedPage."<br>";
 
 if (strtolower(substr($requestedPage, -5)) == '.html') {
-    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/') . substr($requestedPage, 0, -5), true, 307);
+    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/') . substr($requestedPage, 0, -5), true, 302);
     exit;
 }
 if (strtolower($requestedPage) == 'home' || strtolower($requestedPage) == 'index' || strtolower($requestedPage) == 'index.php') {
-    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/'), true, 307);
+    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/'), true, 302);
     exit;
 }
 if (!$requestedPage) {

index.php

@@ -39,7 +39,7 @@ <h4><a href="http://phpcon.eventbrite.com">Register now for only $300!</a></h4>
             <div class="sectionWide">
                 <h1>The Conference</h1>
                 <p>Inspired by conferences like Webstock and Brooklyn Beta, we want to make a friendly conference for us. Together with our friends and peers, we aim to inspire you to make great things with PHP.</p>
-                <p>The PHP Community Conference is a two-day event. We kick things off with a tutorial day that will introduce you to tools and ideas that you can use in your code right away. The second day will consist of presentations that will inspire you to create something new with PHP. With the help of our sponsors, we are able to offer admission to the entire event for $350. We'll provide lunch and snacks on both days. On Friday night, we'll finish off the conference with a party featuring pecha kucha talks by our awesome attendees.</p>
+                <p>The PHP Community Conference is a two-day event. We kick things off with a tutorial day that will introduce you to tools and ideas that you can use in your code right away. The second day will consist of presentations that will inspire you to create something new with PHP. With the help of our sponsors, we are able to offer admission to the entire event for $300. We'll provide lunch and snacks on both days. On Friday night, we'll finish off the conference with a party featuring pecha kucha talks by our awesome attendees.</p>
                 <p>We can't wait to see you there, so <a href="http://phpcon.eventbrite.com">register</a> now.</p>
             </div>
 

resources/home.html

@@ -21,16 +21,19 @@ <h1>PHP Community
                 </div>
             </div>
             <div class="aside">
-                <img src="http://farm5.static.flickr.com/4122/4752661782_8097fd6545.jpg" alt="aVenue" style="width: 350px;">
+                <img src="images/broadway_3.jpg" alt="Nashville Downtown" style="width: 350px;">
             </div>
             <div class="section">
+		<h2>Nashville</h2>
+		<p>Downtown Nashville is known for always having something awesome going on. There are always music events going on at the many bars and clubs in the area. Nashville is also filled with amazing places to eat like <a href="http://www.demos
+restaurants.com/">Demos</a> and <a href="http://www.osf.com/">The Old Spaghetti Factory</a>.
                 <h2>Venue</h2>
-                <p>We've booked a fantastic space for the first PHP Community Conference. During our search for a venue, <a href="http://www.nashvilleeventspace.com/venues/avenue/avenue-blank-venue/">aVenue</a> stood out because of its spacious, industrial feel, which we think suits our theme of building things out of big ideas. Located only a block away from the conference hotel, Hilton Nashville Downtown, aVenue is a relaxed, friendly space for our conference. aVenue is surounded by cool things to do in Downtown Nashville. There are always music events going on at the many bars and clubs in the area. Nashville is also filled with amazing places to eat like <a href="http://www.demosrestaurants.com/">Demos</a> and <a href="http://www.osf.com/">The Old Spaghetti Factory</a>.</p>
+                <p>The conference will take place at <a href="http://www.nashvilleeventspace.com/venues/avenue/avenue-blank-venue/">aVenue</a> near the corner of 3rd and Broadway, in the heart of Downtown Nashville. Avenue stood out because of its spacious, industrial feel, which suits our theme of building things out of big ideas. Located only a block away from the conference hotel, <a href="http://www.hilton.com/en/hi/groups/personalized/B/BNANSHF-PHP2-20110420/index.jhtml?WT.mc_id=POG">Hilton Nashville Downtown</a>, aVenue is a relaxed, friendly space for hanging out and getting to know each other. aVenue is surounded by cool things to do in Downtown Nashville.</p>
                 <p>120 3rd Avenue South<br>
                 Nashville, Tennessee 37201<br>
                 <a href="http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=120+3rd+Avenue+South+Nashville,+Tennessee+37201&sll=37.0625,-95.677068&sspn=34.724817,68.554688&ie=UTF8&hq=&hnear=120+3rd+Ave+S,+Nashville,+Davidson,+Tennessee+37201&ll=36.162652,-86.775212&spn=0.008211,0.016737&z=16&iwloc=A">Map</a></p>
                 <h2>Hotel</h2>
-                <p>We've arranged a great deal for our attendees at the <a href="http://nashvillehilton.com/">Hilton Nashville Downtown</a>! For just $129 per night, you'll be located right in downtown Nashville around the block from the conference venue. In the evenings, we'll walk around downtown and entertain ourselves Nashville-style!</p>
+                <p>We've arranged a great deal for our attendees at the <a href="http://www.hilton.com/en/hi/groups/personalized/B/BNANSHF-PHP2-20110420/index.jhtml?WT.mc_id=POG">Hilton Nashville Downtown</a>! For just $129 per night, you'll be located right in downtown Nashville around the block from the conference venue. In the evenings, we'll walk around downtown and entertain ourselves Nashville-style!</p>
                 <p><a href="http://www.hilton.com/en/hi/groups/personalized/B/BNANSHF-PHP2-20110420/index.jhtml?WT.mc_id=POG">Reserve your room</a> now at our special rate of $129 per night!</p> 
                 <h2>Travel</h2>
                 <p>Located only 10 miles from the Nashville Hilton, <a href="http://www.flynashville.com/">Nashville International (BNA)</a> is a convenient arrival location for your visit. The Gray Line Airport Express provides shuttle service to the hotel for $12 one-way, or $20 round trip.</p>

resources/location.html

@@ -24,7 +24,7 @@ <h1>PHP Community
                 <p>We've got a lot to be excited about, but this is the best part. Read through our speaker's list, and you'll wish you were here already.</p>
             </div>
             <div class="section">
-		    <p>We're really excited about our top-notch roster of speakers. Take a look at the presenters below, but don't forget to <a href="http://phpcon.eventbrite.com/">register</a> right away. Tickets will go fast.</p>
+		    <p>Check out these awesome speakers! We got an amazing response to our CFP and we're so excited about these talks. Read through the list and you'll see why you shouldn't miss this. <a href="http://phpcon.eventbrite.com/">Register Now!</a>
 
 	        <h2>Keynote</h2>
 		<ul class="speakers">