Remove donation drive banner

Fixes #1003

diff --git a/app/assets/images/donate-sprite@2x.png b/app/assets/images/donate-sprite@2x.png
deleted file mode 100644 (file)
index 20ef911..0000000
Binary files a/app/assets/images/donate-sprite@2x.png and /dev/null differ

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d96bbad4a426cc0eff41fb1ac914ee44519ca479..085b615c7244f66214f2cddee69f89400c28d3d0 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -165,15 +165,6 @@ $(document).ready(function () {
     $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 
     $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
   });
 

-  if ($.cookie('_osm_donatedone2015') === 'hide') {
-    $('#donate').hide();
-  }
-
-  $('#donate .close').on('click', function() {
-    $('#donate').hide();
-    $.cookie("_osm_donatedone2015", 'hide', { expires: expiry });
-  });
-

   if ($.cookie('_osm_welcome') === 'hide') {
     $('.welcome').hide();
   }
   if ($.cookie('_osm_welcome') === 'hide') {
     $('.welcome').hide();
   }

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 45a047611d946a93c2c119323e9b79b724686334..61975d5f6fe71f62e4db77ff1cf90a8815c43b4a 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2674,42 +2674,6 @@ input.richtext_title[type="text"] {
   }
 }
 
   }
 }
 

-#sidebar #donate {
-  background-color: rgb(89, 89, 89);
-  padding: 10px 5px;
-  min-height: 120px;
-
-  .sprite {
-    background: transparent image-url('donate-sprite@2x.png') no-repeat scroll 0 0 / 120px 100px;
-  }
-
-  .sprite.logo {
-    float: left;
-    background-position: 0 0;
-    height: 100px;
-    width: 100px;
-  }
-
-  h2 {
-    margin-left: 100px;
-    padding: 14px 10px 6px 10px;
-  }
-
-  p {
-    margin-left: 100px;
-    padding: 2px 10px 3px 10px;
-  }
-
-  a {
-    color: $offwhite;
-  }
-
-  :hover {
-    text-decoration: none;
-    color: #b7b7bf;
-  }
-}
-

 @import 'browse';
 
 @media only screen and (max-width:960px) {
 @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 a51daf753f1b8cbcc9414227d04b80494428360e..cb2fd0e07a33007e082d437710ee88b75effba5d 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -30,20 +30,6 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 

-    <div id="donate">
-      <a href="http://donate.openstreetmap.org/server2015/"><div class="sprite logo"></div></a>
-      <h2>
-        <a><span class="icon close"></span></a>
-        <a href="http://donate.openstreetmap.org/server2015/"><%= t 'layouts.donate_done_header' %></a>
-      </h2>
-      <p><a href="http://donate.openstreetmap.org/server2015/">
-        <%= t 'layouts.donate_done_line_1' %>
-      </a></p>
-      <p><a href="http://donate.openstreetmap.org/server2015/">
-        <%= t 'layouts.donate_line_3' %>
-      </a></p>
-    </div>
-

     <div id="flash">
       <%= render :partial => "layouts/flash" %>
     </div>
     <div id="flash">
       <%= render :partial => "layouts/flash" %>
     </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ab18c69229fcbc5708a76f14fa2fa21bf810dfba..ea04a2c016b91bce3e620a969f71b773663c6da5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -953,9 +953,6 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
       text: Make a Donation
     learn_more: "Learn More"
     more: More

-    donate_done_header: Thank You
-    donate_done_line_1: We hit our fundraising target!
-    donate_line_3: Hardware Funding Drive 2015

   license_page:
     foreign:
       title: About this translation
   license_page:
     foreign:
       title: About this translation