Change donation drive panel to a thank you

Closes #1001

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

-  if ($.cookie('_osm_donate2015') === 'hide') {
+  if ($.cookie('_osm_donatedone2015') === 'hide') {

     $('#donate').hide();
   }
 
   $('#donate .close').on('click', function() {
     $('#donate').hide();
     $('#donate').hide();
   }
 
   $('#donate .close').on('click', function() {
     $('#donate').hide();

-    $.cookie("_osm_donate2015", 'hide', { expires: expiry });
+    $.cookie("_osm_donatedone2015", 'hide', { expires: expiry });

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 21cecaf4aa67da1e94b89b433f4dcfed1ffcbcbb..45a047611d946a93c2c119323e9b79b724686334 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2692,7 +2692,7 @@ input.richtext_title[type="text"] {
 
   h2 {
     margin-left: 100px;
 
   h2 {
     margin-left: 100px;

-    padding: 7px 10px 6px 10px;
+    padding: 14px 10px 6px 10px;

   }
 
   p {
   }
 
   p {

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 6ae087b06d755640ee759b69e55812c61c52fd7a..a51daf753f1b8cbcc9414227d04b80494428360e 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -34,12 +34,10 @@
       <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/"><div class="sprite logo"></div></a>
       <h2>
         <a><span class="icon close"></span></a>

-        <a href="http://donate.openstreetmap.org/server2015/"><%= t 'layouts.donate_header' %></a>
+        <a href="http://donate.openstreetmap.org/server2015/"><%= t 'layouts.donate_done_header' %></a>

       </h2>
       <p><a href="http://donate.openstreetmap.org/server2015/">
       </h2>
       <p><a href="http://donate.openstreetmap.org/server2015/">

-        <%= t 'layouts.donate_line_1' %>
-      <br />
-        <%= t 'layouts.donate_line_2' %>
+        <%= t 'layouts.donate_done_line_1' %>

       </a></p>
       <p><a href="http://donate.openstreetmap.org/server2015/">
         <%= t 'layouts.donate_line_3' %>
       </a></p>
       <p><a href="http://donate.openstreetmap.org/server2015/">
         <%= t 'layouts.donate_line_3' %>

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

-    donate_header: Support OpenStreetMap
-    donate_line_1: Bigger Servers for a
-    donate_line_2: Growing OpenStreetMap
+    donate_done_header: Thank You
+    donate_done_line_1: We hit our fundraising target!

     donate_line_3: Hardware Funding Drive 2015
   license_page:
     foreign:
     donate_line_3: Hardware Funding Drive 2015
   license_page:
     foreign: