Added SOTM 2011 banner to the side bar

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index ad370ad474153145493ec0168b1bb7714c3e8a3e..eede351dfed6681eb37398b4ad23a385bff58072 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -142,6 +142,10 @@
 
       <%= yield :optionals %>
 
 
       <%= yield :optionals %>
 

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

       <center>
         <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>
       <center>
         <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>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 497959a14043e15f1c1f4d0fc8fca49e6a854f22..f8cbb6e374d0fb852f10dbb4f58df40220ebdc22 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -950,6 +950,7 @@ 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

+    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'

     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..2cdf02b
Binary files /dev/null and b/public/images/sotm.png differ

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c830f406b2b12e1798520745068bb9cf3a15a9ac..4dd97a68c4200dc0695643cd238245aef4407aeb 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -167,8 +167,12 @@ hr {
 /* Rules for SOTM advert */
 
 #sotm {
 /* Rules for SOTM advert */
 
 #sotm {

-  width: 170px;
+  width: 180px;
+  min-width: 180px;
+  margin: 5px;

   padding: 0px;
   padding: 0px;

+  border: 0px;
+  background: #fff;

 }
 
 /*
 }
 
 /*