Merge branch 'master' into prod

nicksloan · nicksloan · commit 029b1c5e2e97 · 2011-03-07T16:48:12.000-05:00
diff --git a/resources/home.html b/resources/home.html
@@ -5,7 +5,7 @@
         <div id="container" class="home">
             <div class="header">
                 <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>
+                    <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" style="border:none; overflow:hidden; width:80px; height:21px;" id="fbLike"></iframe>
                     <p class="twitter">Follow Us: <a href="http://twitter.com/phpcomcon">PHPCOMCON</a></p>
                 </div>
                 <h1>PHP Community
@@ -28,7 +28,12 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
             <div class="section">
 		<h4><a href="http://phpcon.eventbrite.com">Register now for only $300!</a></h4>
 		<p>We've had an amazing response to our call for sponsors and in the spirit of community, we're lowering the ticket price. It's going to be a fun, relaxed event where we can all get to know each other and mingle with some really great speakers, too.
-		<p>For $300, you'll receive: <ul><li>Two tutorials on the 21st</li><li>A full day of <a href="speakers">excellent speakers</a> on the 22nd</li><li>All your food, snacks, and conversation free</li></ol></p>                
+                <p>For $300, you'll receive:</p>
+                <ul>
+                    <li>Two tutorials on the 21st</li>
+                    <li>A full day of <a href="speakers">excellent speakers</a> on the 22nd</li>
+                    <li>All your food, snacks, and conversation free</li>
+                </ul>
             </div>
 
             <div class="sectionWide">
@@ -89,7 +94,7 @@ <h2>Community Sponsors</h2>
                 </div>
                 <h2>Media Sponsors</h2>
                 <div>
-                    <a href="http://phpdeveloper.org"><img src="http://phpdeveloper.org/Test/public/img/ads/phpdeveloper-media.jpg" border="0" width="150" /></a>
+                    <a href="http://phpdeveloper.org"><img src="http://phpdeveloper.org/Test/public/img/ads/phpdeveloper-media.jpg" width="150" style="border: 0;" /></a>
                 </div>
             </div>
         </div>
diff --git a/templates/page.php b/templates/page.php
@@ -5,14 +5,14 @@
 <html>
     <head>
         <title><?php echo $title; ?>PHP Community Conference</title>
-        <meta property="og:title" content="PHP Community Conference" />
-        <meta property="og:type" content="website" />
-        <meta property="og:url" content="http://www.phpcon.org/" />
-        <meta property="og:image" content="http://www.phpcon.org/images/guitar.png" />
-        <meta property="fb:admins" content="623959689,796025211,756315701,12105030" />
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <meta property="og:title" content="PHP Community Conference">
+        <meta property="og:type" content="website">
+        <meta property="og:url" content="http://www.phpcon.org/">
+        <meta property="og:image" content="http://www.phpcon.org/images/guitar.png">
+        <meta property="fb:admins" content="623959689,796025211,756315701,12105030">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-        <base href="<?php echo $baseHref; ?>" />
+        <base href="<?php echo $baseHref; ?>">
 
         <link href="webfontkit/stylesheet.css" rel="stylesheet" type="text/css">
         <link href="css/style.css?r=20110125-2" rel="stylesheet" type="text/css">
