Add a SOTM advert to the sidebar

diff --git a/app/assets/images/sotm.png b/app/assets/images/sotm.png
index 8c11ebed4dc8256bfd8371aa335f29f628069da2..ae0c7c48a4273e30df14c962e2206e57698030db 100644 (file)
Binary files a/app/assets/images/sotm.png and b/app/assets/images/sotm.png differ

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 17f512e98d8f68917e0c0a1c1fe2e9337932f27e..078674a119aa65c0842479aad42bb656802c9198 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -179,14 +179,17 @@ h2 {
 /* Rules for SOTM advert */
 
 #sotm {
-  width: 180px;
-  min-width: 180px;
-  margin: 5px;
+  width: 165px;
+  margin: 10px;
   padding: 0px;
   border: 0px;
   background: #fff;
 }
 
+#sotm img {
+  width: 165px;
+}
+
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 1984f686c6a1e1a877bdc20f401ef16529290d58..0bff666565ad8126f0b0c9726ff1e214edaf6c3a 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -126,6 +126,10 @@
         </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>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a48093cf8cb0d01ce9ac11c06bfc00e3e4a64592..d01482045662ce466895f750d5211002604a1f48 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1003,7 +1003,7 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
-    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
+    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