Revert "Add advert for SOTM 2010 to sidebar"

This reverts commit 3590335221807ed06e3fa705b8c4366f99a1b25e.

Conflicts:

	app/views/layouts/site.html.erb
	config/locales/en.yml

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index cecf5acc21d95d60491fde13b505c7117fbcc60c..c17255709171508eb4fe470294807211f3fb93b2 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -123,10 +123,6 @@
         <%= yield :left_menu %>
       </div>
 
-      <div id="sotm" class="notice">
-        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2010'), :title => t('layouts.sotm2010'), :border => "0"), "http://www.stateofthemap.org/register/" %>
-      </div>
-
       <%= yield :optionals %>
 
       <center>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e3d8803ed28a3d23b88d33b15d3f44f6f6e414cd..ce80b69318e5076ac221a744ad089b66057c9f9b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -933,7 +933,6 @@ en:
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm2010: 'Come to the 2010 OpenStreetMap Conference, The State of the Map, July 9-11 in Girona!'
     license:
       alt: CC by-sa 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License

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