Merged 8899:9136 and 9145 from trunk.

app/views/export/start.rjs

@@ -276,6 +276,7 @@ page << <<EOJ
     if ($("format_osmarender").checked) {
       var zoom = Math.min(map.getZoom(), maxOsmarenderZoom());
 
+      $("osmarender_format").disabled = true;
       $("osmarender_zoom").options.selectedIndex = zoom - 4;
       $("export_osmarender").style.display = "inline";
     } else {

app/views/layouts/site.rhtml

@@ -95,12 +95,6 @@
         <%= yield :left_menu %>
       </div>
 
-      <div id="sotm" class="left_menu">
-        <div id="sotminfo">
-        Come to the second OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 12th-13th July 2008, Limerick, Ireland.
-        </div>
-      </div>
-
       <%= yield :optionals %>
       <div id="cclogo">
         <center>