From: Tom Hughes <tom@compton.nu>
Date: Mon, 17 Jul 2017 13:27:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1587'
X-Git-Tag: live~4083
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d14b251767452a514a9889771cf682e20be36946?hp=ee53b7a298e75ac4c75866d6edea0a2611bdb663

Merge remote-tracking branch 'upstream/pull/1587'
---

diff --git a/app/assets/images/banners/banner-sotm-2017.png b/app/assets/images/banners/banner-sotm-2017.png
new file mode 100644
index 000000000..a861d1f12
Binary files /dev/null and b/app/assets/images/banners/banner-sotm-2017.png differ
diff --git a/app/assets/images/banners/donate-2016.jpg b/app/assets/images/banners/donate-2016.jpg
deleted file mode 100644
index 7e2e6eb93..000000000
Binary files a/app/assets/images/banners/donate-2016.jpg and /dev/null differ
diff --git a/app/assets/images/banners/sotmasia-2016.jpg b/app/assets/images/banners/sotmasia-2016.jpg
deleted file mode 100644
index fa5f1f033..000000000
Binary files a/app/assets/images/banners/sotmasia-2016.jpg and /dev/null differ
diff --git a/app/assets/images/banners/sotmlatam-2016.jpg b/app/assets/images/banners/sotmlatam-2016.jpg
deleted file mode 100644
index 97efa75e2..000000000
Binary files a/app/assets/images/banners/sotmlatam-2016.jpg and /dev/null differ
diff --git a/config/banners.yml b/config/banners.yml
index 3b151afba..7bdf169bf 100644
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,20 +1,6 @@
-sotmasia2016:
-  id: sotmasia2016
-  alt: State of the Map Asia 2016
-  link: http://stateofthemap.asia/
-  img: banners/sotmasia-2016.jpg
-  enddate: 2016-oct-01
-
-donate2016:
-  id: donate2016
-  alt: OpenStreetMap Funding Drive 2016
-  link: https://donate.openstreetmap.org/
-  img: banners/donate-2016.jpg
-  enddate: 2016-oct-31
-
-sotmlatam2016:
-  id: sotmlatam2016
-  alt: State of the Map Latam 2016
-  link: http://state.osmlatam.org/
-  img: banners/sotmlatam-2016.jpg
-  enddate: 2016-nov-25
+sotm2017:
+  id: sotm2017
+  alt: State of the Map 2017
+  link: http://2017.stateofthemap.org/
+  img: banners/banner-sotm-2017.png
+  enddate: 2017-aug-27