Add advert for SOTM 2010 to sidebar

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index c17255709171508eb4fe470294807211f3fb93b2..edf76c48a6119a21890eebf89d67b28898b1fcb7 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -123,6 +123,10 @@
         <%= yield :left_menu %>
       </div>
 
         <%= 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/" %>
+      </div>
+

       <%= yield :optionals %>
 
       <center>
       <%= yield :optionals %>
 
       <center>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e4b0ee21489ad5ea23b910a1e7ccf2ead7cdb22c..a2ac4eafdf11de9665826364dab1736e3ad05a81 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -933,7 +933,7 @@ en:
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     shop: Shop
     shop_tooltip: Shop with branded OpenStreetMap merchandise
     shop_url: http://wiki.openstreetmap.org/wiki/Merchandise

-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+    sotm: '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
     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
new file mode 100644 (file)
index 0000000..af2d049
Binary files /dev/null and b/public/images/sotm.png differ