a's are still not block level

svn path=/trunk/; revision=19436

index.en.xhtml

@@ -11,35 +11,25 @@
       </div>
 
       <div id="campaign-box-2">
-        <a href="donate/donate.html" class="donate-box">
-	  <p><donate-label /></p>
-        </a>
-        <a href="http://fellowship.fsfe.org/join" class="fellowship-box">
-          <p><join-label /></p>
-        </a>
+	<p><a href="/donate/donate.html" class="donate-box"><donate-label /></a></p>
+        <p><a href="http://fellowship.fsfe.org/join" class="fellowship-box"><join-label /></a></p>
       </div>
-      
-      <div id="campaign-box-3">
-	
-      </div>
-      
     </div>
     
     <div id="feeds">
-    
+      <!-- News feeds -->
       <div id="news" class="section">
 	<h2>
 	  <a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="News RSS" title="news RSS feed" /></a>
 	  <a class="ical" href="http://identi.ca/fsfe"><img src="/graphics/identica.png" alt="identica" title="follow FSFE on identi.ca"/></a>
 	  
 	  <a href="/news/news.html"><news-label /></a>
-	  
 	</h2>
       
 	<all-news />
-	  
-      </div><!--end #news-->   
+      </div>
 
+      <!-- Newsletters -->
       <div id="newsletter" class="section">
 	<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>
 	
@@ -50,6 +40,7 @@
 
 	  <form id="formnl" name="formnl" method="post" action="http://mail.fsfeurope.org/mailman/subscribe/newsletter-en">
 	    <p>
+	      <!-- TODO: This JS will not work across all browsers -->
 	      <select id="language" name="language" onchange="var form = document.getElementById('formnl'); var sel=document.getElementById('language'); form.action='http://mail.fsfeurope.org/mailman/subscribe/newsletter-'+sel.options[sel.options.selectedIndex].value">
 		<option value="en" selected="selected">English</option>
 		<option value="el">Ελληνικά</option>	
@@ -64,38 +55,31 @@
 	      </select>
 	      
 	      <input id="email" name="email" type="email" placeholder="email address" />
-	      
 	      <subscribe-button />
-	      
 	    </p>
 	  </form>
 
 	  <ul>
-	  
 	    <all-newsletters />
-	    
-	    <li><a href="news/newsletter.html"><more-label />...</a></li>
-	    
 	  </ul>
 
+	  <p>
+	    <a href="/news/newsletter.html"><more-label />…</a>
+	  </p>
 	</div><!-- /.entry -->
       </div> <!-- /#newsletter -->
-    
+
+      <!-- Events list -->
       <div id="events" class="section">
 	<h2>
 	  <a class="rss-feed" href="/events/events.rss"><img src="/graphics/rss.png" alt="Events RSS" title="events RSS feed" /></a>
 	  <a class="ical" href="webcal://fsfe.org/events/events.ics"><img src="/graphics/ical.png" alt="iCal" title="FSFE events as iCal feed" /></a>
-	  
 	  <a href="/events/events.html"><events-label /></a>
-	  
 	</h2>
     
 	<all-events />
-    
-      </div><!--end #events-->
-      
-    </div><!--end #feeds-->
-    
+      </div>
+    </div> <!-- /#feeds-->
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>