From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 Nov 2014 23:03:04 +0000 (+0000)
Subject: Revert "Add SOTM advert"
X-Git-Tag: live~4291
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f0ecc6312b74aee11725bf0aaae47614fc9f2a87?ds=sidebyside

Revert "Add SOTM advert"

This reverts commit 15a7276a9f50821a7728b4da3af16849284f251b.
---

diff --git a/app/assets/images/sotm.png b/app/assets/images/sotm.png
deleted file mode 100644
index 3df02876d..000000000
Binary files a/app/assets/images/sotm.png and /dev/null differ
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 191f390bf..df975db48 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -162,15 +162,6 @@ $(document).ready(function () {
     $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 
-  if ($.cookie('_osm_sotm') == 'hide') {
-    $('#sotm').hide();
-  }
-
-  $('#sotm .close').on('click', function() {
-    $('#sotm').hide();
-    $.cookie("_osm_sotm", 'hide', { expires: expiry });
-  });
-
   if ($.cookie('_osm_welcome') == 'hide') {
     $('.welcome').hide();
   }
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 08f1a76f9..aa95e818a 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -2601,36 +2601,6 @@ input.richtext_title[type="text"] {
   }
 }
 
-#sidebar #sotm {
-  padding: 10px;
-  min-height: 120px;
-
-  img {
-    float: left;
-    width: 100px;
-    height: 100px;
-  }
-
-  h2 {
-    margin-left: 100px;
-    padding: 7px 10px 6px 15px;
-  }
-
-  p {
-    margin-left: 100px;
-    padding: 6px 10px 7px 15px;
-  }
-
-  a {
-    color: $darkgrey;
-  }
-
-  :hover {
-    text-decoration: none;
-    color: darken($darkgrey, 25%);
-  }
-}
-
 @import 'browse';
 
 @media only screen and (max-width:960px) {
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 471557053..e72214cbe 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -30,21 +30,6 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
-    <div id="sotm">
-      <a href="http://www.stateofthemap.org/?l=en"><%= image_tag "sotm.png" %></a>
-      <h2>
-        <a><span class="icon close"></span></a>
-        <a href="http://www.stateofthemap.org/?l=en"><%= t 'layouts.sotm_header' %></a>
-      </h2>
-      <p><a href="http://www.stateofthemap.org/?l=en">
-        <%= t 'layouts.sotm_line_1' %>
-      <br />
-        <%= t 'layouts.sotm_line_2' %>
-      <br />
-        <%= t 'layouts.sotm_line_3' %>
-      </a></p>
-    </div>
-
     <div id="flash">
       <%= render :partial => "layouts/flash" %>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69e52e44d..87123f282 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -944,10 +944,6 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8th Annual Conference
-    sotm_line_2: November 7th-9th 2014
-    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: About this translation