From f2f7800b30352ec36c5627b7d25b33288e14c8a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 25 May 2013 13:37:17 +0200
Subject: [PATCH] drop fallback donation form

---
 Changelog.md                               |  1 +
 app/views/shared/_donatediaspora.html.haml |  6 ------
 app/views/shared/_right_sections.html.haml | 18 +++++++-----------
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 app/views/shared/_donatediaspora.html.haml

diff --git a/Changelog.md b/Changelog.md
index c8217d444..cd59ef273 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Refactor
 
 * Refactored config/ directory [#4145](https://github.com/diaspora/diaspora/pull/4145).
+* Drop misleading fallback donation form. [Proposal](https://www.loomio.org/discussions/1045?proposal=2722)
 
 ## Bug fixes
 
diff --git a/app/views/shared/_donatediaspora.html.haml b/app/views/shared/_donatediaspora.html.haml
deleted file mode 100644
index 1094f0aa3..000000000
--- a/app/views/shared/_donatediaspora.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%form{:action => "https://diaspora-project-site.heroku.com/donate", :method => "get"}
-  %select{:name => "monthly_amount"}
-    %option{:value => "1"} Supporter : $5.00USD
-    %option{:value => "2"} Member : $10.00USD
-    %option{:value => "3"} Freedom Fighter : $20.00USD
-  %input{:name => "submit", :type => "submit", :value => t('aspects.index.donate')}
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index cb2c7b15d..9f3d510d3 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -67,20 +67,16 @@
   .content
     != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), magic_bookmarklet_link))
 
-.section
-  .title
-    .icons-coffee
-    %h5.title-header
-      = t('aspects.index.donate')
-  .content
-    - if AppConfig.settings.paypal_hosted_button_id.present?
+- if AppConfig.settings.paypal_hosted_button_id.present?
+  .section
+    .title
+      .icons-coffee
+      %h5.title-header
+        = t('aspects.index.donate')
+    .content
       = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
       %br
       = render 'shared/donatepod'
-    - else
-      = t('aspects.index.keep_diaspora_running')
-      %br
-      = render 'shared/donatediaspora'
 
 - if AppConfig.admins.podmin_email.present?
   .section