Remove SOTM advert

diff --git a/app/assets/images/sotm.png b/app/assets/images/sotm.png
deleted file mode 100644 (file)
index 169b807..0000000
Binary files a/app/assets/images/sotm.png and /dev/null differ

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 9346b567022016ef28634e522c85d01e6ed1db75..d25e9326a1175e14c20fd37f137303627ac85966 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -126,12 +126,6 @@
           <%= yield :left_menu %>
         </ul>
       </div>
           <%= yield :left_menu %>
         </ul>
       </div>

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

       <div class="donate">
         <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
       </div>
       <div class="donate">
         <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
       </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8989af3a9ffb59aec9a16d322e5f9429529fa24c..c4704fa3b62e4b1031b5607a74580e2c3e52cf25 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1003,7 +1003,6 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation

-    sotm2012: 'Come to the 2012 OpenStreetMap Conference, The State of the Map, September 6-8th in Tokyo!'

     license:
       alt: CC BY-SA 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
     license:
       alt: CC BY-SA 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License