Merge 16355:16480 from trunk.

2009-07-13 23:28:02 +00:00 · 2009-07-13 23:28:02 +00:00 · 942ca1ff23
commit 942ca1ff23
parent 50f78e52e8 1f0acba946
36 changed files with 2460 additions and 210 deletions
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@ -114,10 +114,6 @@
        <%= yield :left_menu %>
      </div>

-      <div id="sotm" class="notice">
-        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/register" %>
-      </div>
-
      <%= yield :optionals %>

      <center>