fixed homepage

diff --git a/index.html b/index.html
index 0e11b9fad79fc4967203a237b52d34da76424a7f..c8b7d1695ec2fc41ba9e8d15f77eca1a90cd503f 100644 (file)
--- a/index.html
+++ b/index.html
@@ -29,19 +29,31 @@
 
        <div class="yui-g" id="content">
 
-<!-- <map name="mappy" id="mappy">
-<area shape="poly" coords="461,9,608,30,622,196,481,201,443,154,441,109,443,8" href="/wiki/Asia">
-<area shape="poly" coords="340,95,417,152,406,237,327,267,289,185,250,148,271,89" href="/wiki/Africa">
-<area shape="poly" coords="182,145,255,201,216,296,133,295,111,176" href="/wiki/South_America">
-<area shape="poly" coords="103,141,147,118,196,142,105,176" href="/wiki/Central_America">
-<area shape="poly" coords="62,15,193,15,240,76,146,118,90,140,63,158,28,116" href="/wiki/North_America">
-<area shape="rect" coords="476,201,656,278" href="/wiki/Australasia">
-<area shape="poly" coords="192,7,278,86,345,93,421,148,438,151,439,3,198,5" href="/wiki/Europe">
-</map> -->
+        <div class="yui-gc">
+    <div class="yui-u first">
 
-   <p id="join-link" class="c"><strong><a href="/wiki?title=Special:UserLogin&type=signup&returnto=Main_Page">Join LibrePlanet now</a> and connect with local free software groups in your area.</strong></p>
+              <h3>Upcoming: LibrePlanet 2011 conference.</h3>
+      
+              <p class="c"><a href="/wiki/LibrePlanet2011"><img src="http://static.fsf.org/nosvn/lp2011.png" alt="March 19th 2011, Boston, Massachusetts" /></a></p>
+              <p>March 19th, 2011 &mdash; <a href="/wiki/LibrePlanet2011">more information</a></p>
+       
+           </div>
+    <div class="yui-u">
+
+   <h3>Community resources</h3>
 
-<!-- <p class="c"><img alt="" src="mappy.png" usemap="#mappy"></p> -->
+     <ul>
+   <li><a href="/wiki">LibrePlanet wiki</a></li>
+   <li><a href="http://shop.fsf.org/product/lp-tshirt/">Get your LibrePlanet T-shirt</a></li>
+
+   <li>Previous LibrePlanet conferences: <a href="/2010">2010</a>, <a href="/2009">2009</a></li>
+   </ul>
+      
+
+           </div>
+</div>
+
+   <p id="join-link" class="c"><strong><a href="/wiki?title=Special:UserLogin&type=signup&returnto=Main_Page">Join LibrePlanet now</a> and connect with local free software groups in your area.</strong></p>
 
 <ul id="regions-list"><li> <a href="/wiki/Africa" title="Africa">Africa</a>
 </li><li> <a href="/wiki/Asia" title="Asia">Asia</a>
@@ -60,26 +72,6 @@
 
 </div>
 
-<div class="yui-g" id="below-content">
-    <div class="yui-u first">
-    
-     <p class="c" style="padding-top: 10px;"><a href="http://shop.fsf.org/product/lp-tshirt/"><img width="270" src="http://static.fsf.org/store/img/lp.png" alt="LibrePlanet T-Shirt" /></a></p>
-
-           </div>
-    <div class="yui-u" id="lp-resources">
-
-   <h3>Community resources</h3>
-
-     <ul>
-   <li><a href="/wiki">LibrePlanet wiki</a></li>
-   <li><a href="http://shop.fsf.org/product/lp-tshirt/">Get your LibrePlanet T-shirt</a></li>
-
-   <li>LibrePlanet conferences: <a href="/2010">2010</a>, <a href="/2009">2009</a></li>
-   </ul>
-
-           </div>
-</div>
-
 <div class="yui-gb" id="featured-boxes">
         <div class="yui-u first">
 <h3>Mailing list</h3>