Add advert for SOTM 2010 to sidebar
authorTom Hughes <tom@compton.nu>
Tue, 8 Jun 2010 16:09:21 +0000 (17:09 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 8 Jun 2010 16:09:21 +0000 (17:09 +0100)
app/views/layouts/site.html.erb
config/locales/en.yml
public/images/sotm.png [new file with mode: 0644]

index c172557..edf76c4 100644 (file)
         <%= 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>
index e4b0ee2..a2ac4ea 100644 (file)
@@ -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