summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrike Uhlig <u@451f.org>2018-03-15 13:12:59 +0100
committerUlrike Uhlig <u@451f.org>2018-03-15 13:12:59 +0100
commit85b57849008f98c7dfba301984a0d0bf949bce78 (patch)
tree5bc1900cde9181fabe6727309676207d373de365
parent82c91c6597b1c2ede49652759857449b9f6d29d6 (diff)
parenteec90f5df80b43846b94e199c0fe5a76360232ed (diff)
Merge branch 'wed/donate-through-ddg'
-rw-r--r--wiki/src/donate.css18
-rw-r--r--wiki/src/donate.html308
2 files changed, 31 insertions, 295 deletions
diff --git a/wiki/src/donate.css b/wiki/src/donate.css
index 7eb3ae5..9112192 100644
--- a/wiki/src/donate.css
+++ b/wiki/src/donate.css
@@ -137,6 +137,24 @@ span.title {
}
#duckduckgo {
+ background: #b49cd3;
+ padding: 2em;
+}
+
+#duckduckgo a {
+ color: #333;
+ font-weight: bold;
+ background-image: none;
+ padding-right: 0 !important;
+}
+
+#duckduckgo img {
+ border: none;
+ max-width: 100%;
+ height: auto;
+}
+
+#paypal {
margin-bottom: 3em;
}
diff --git a/wiki/src/donate.html b/wiki/src/donate.html
index 8f25f72..ab51d5b 100644
--- a/wiki/src/donate.html
+++ b/wiki/src/donate.html
@@ -38,300 +38,21 @@
<div class="col-md-5">
-<div id="paypal-with-js" class="row">
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <!-- HTML Variables for PayPal Payments Standard:
- https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/ -->
- <input type="hidden" name="cmd" value="_xclick-subscriptions" id="cmd"/>
- <input type="hidden" name="business" value="tailsriseuplabs@riseup.net" id="business"/>
- <input type="hidden" name="currency_code" value="USD" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <!-- Note for translators: adapt the URLs to return to the page in your language. -->
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
-
- <!-- Note for translators: adapt the value of 'lc' to your language. -->
- <input name="lc" type="hidden" value="US"/>
-
- <!-- For recurring donations only. -->
- <input type="hidden" name="a3" value="5" id="a3"/>
- <input type="hidden" name="t3" value="M" id="t3"/>
- <input type="hidden" name="p3" value="1"/>
- <input type="hidden" name="src" value="1"/>
-
- <!-- For one-time donation only. -->
- <input type="hidden" name="amount" value="5" id="amount"/>
-
- <div id="currency">
- <div class="col-md-12 btn-group btn-group-justified" data-toggle="buttons" role="group">
- <label class="btn btn-lg btn-primary active" id="currency-dollar">
- <input type="radio" id="dollars" autocomplete="off" checked data-complete-text="finished!"/> Dollars
- </label>
- <label class="btn btn-lg btn-primary" id="currency-euro">
- <input type="radio" id="euros" autocomplete="off" checked data-complete-text="finished!"/> Euros
- </label>
- </div>
- </div>
+ <div id="duckduckgo">
+ <h4>DuckDuckGo challenge</h4>
- <div id="frequency">
- <div class="col-md-12 btn-group btn-group-justified" data-toggle="buttons" role="group">
- <label class="btn btn-lg btn-primary" id="one-time">
- <input type="radio" autocomplete="off"/> One-time
- </label>
- <label class="btn btn-lg btn-primary active" id="monthly">
- <input type="radio" autocomplete="off"/> Monthly
- </label>
- <label class="btn btn-lg btn-primary" id="yearly">
- <input type="radio" autocomplete="off" checked/> Yearly
- </label>
- </div>
- </div>
+ <p><a href="https://www.crowdrise.com/o/en/campaign/tails-live" target="_blank">
+ <img src="./donate/donate_ddg.png" alt="" /></a></p>
+ <p><a href="https://www.crowdrise.com/o/en/campaign/tails-live" target="_blank">
+ Donate via the
+ DuckDuckGo donation challenge.</a> (March 13 &ndash; April 10 2018)</p>
- <div id="dollar-amounts" class="amounts donate-dollars" data-toggle="buttons" role="group">
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active">
- <input type="radio" autocomplete="off" value="5"/>$5
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10">
- <input type="radio" autocomplete="off" value="10"/>$10
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25">
- <input type="radio" autocomplete="off" value="25"/>$25
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50">
- <input type="radio" autocomplete="off" value="50"/>$50
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 100">
- <input type="radio" autocomplete="off" value="100"/>$100
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 150">
- <input type="radio" autocomplete="off" value="150"/>$150
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 200">
- <input type="radio" autocomplete="off" value="200"/>$200
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
- <span>Other</span>
- <div class="input-group">
- <span class="input-group-addon">$</span>
- <input type="text" pattern="\d+" class="form-control" id="other-dollar"/>
- </div>
- </label>
- </div>
+ <p><strong>Increase the impact of your donation</strong>: donating
+ via the challenge helps us win additional prizes from DuckDuckGo.</p>
- <div id="euro-amounts" class="amounts donate-euros" data-toggle="buttons" role="group">
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active">
- <input type="radio" autocomplete="off" value="5"/>5€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10">
- <input type="radio" autocomplete="off" value="10"/>10€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25">
- <input type="radio" autocomplete="off" value="25"/>25€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50">
- <input type="radio" autocomplete="off" value="50"/>50€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 100">
- <input type="radio" autocomplete="off" value="100"/>100€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 150">
- <input type="radio" autocomplete="off" value="150"/>150€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 200">
- <input type="radio" autocomplete="off" value="200"/>200€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
- <span>Other</span>
- <div class="input-group">
- <input type="text" pattern="\d+" class="form-control text-right" id="other-euro"/>
- <span class="input-group-addon">€</span>
- </div>
- </label>
- </div>
-
- <div id="donate-button">
- <button class="btn btn-primary btn-lg btn-block col-md-12">Donate</button>
+ <p>Join our fundraising team and reach out to your social circles!</p>
</div>
-</form>
-
-<p id="require-paypal">Monthly and yearly donations require
-a [[!img paypal-inline.png link="no" class="paypal-inline" alt="PayPal"]]
-account.</p>
-
-<p id="dollar-tax" class="tax-deducible donate-dollars">Your donation goes entirely to Tails
-and will be handled by RiseupLabs which is a 501(c)(3) non-profit organization
-in the USA.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-<p id="euro-tax" class="tax-deducible donate-euros">Your donation goes entirely to Tails
-and will be handled by Zwiebelfreunde which is a non-profit organization
-in Germany.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-</div>
-
-<div id="paypal-without-js" class="row">
-
-<div id="dollars-without-js">
-
-<h2>Donate in dollars</h2>
-
-<p id="dollar-tax" class="tax-deducible">Your donation goes entirely to Tails
-and will be handled by RiseupLabs which is a 501(c)(3) non-profit organization
-in the USA.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-<h3>Recurring donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_xclick-subscriptions"/>
- <input type="hidden" name="business" value="tailsriseuplabs@riseup.net"/>
- <input type="hidden" name="currency_code" value="USD" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <!-- Note for translators: adapt the URLs to return to the page in your language. -->
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
-
- <!-- Note for translators: adapt the value of 'lc' to your language. -->
- <input name="lc" type="hidden" value="US"/>
-
- <input type="hidden" name="src" value="1"/>
- <input type="hidden" name="p3" value="1"/>
-
- <input type="radio" name="a3" value="5" id="sub5" checked="checked"/><label for="sub5">$5</label>
- <input type="radio" name="a3" value="10" id="sub10"/><label for="sub10">$10</label>
- <input type="radio" name="a3" value="20" id="sub20"/><label for="sub20">$20</label>
- <input type="radio" name="a3" value="50" id="sub50"/><label for="sub50">$50</label>
- <input type="radio" name="a3" value="100" id="sub100"/><label for="sub100">$100</label>
- <input type="radio" name="a3" value="250" id="sub250"/><label for="sub250">$250</label>
- <input type="radio" name="a3" value="500" id="sub500"/><label for="sub500">$500</label>
- <br/>
- <input type="radio" name="t3" value="M" id="sub_m" checked="checked"/><label for="sub_m">Monthly</label>
- <input type="radio" name="t3" value="Y" id="sub_y"/><label for="sub_y">Yearly</label>
- <br/>
- <input type="submit" value="Donate"/> (Requires a [[!img paypal-inline.png link="no" class="paypal-inline" alt="PayPal"]] account.)
-
-</form>
-
-<h3>One-time donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_donations"/>
- <input type="hidden" name='business' value="tailsriseuplabs@riseup.net"/>
- <input type="hidden" name="currency_code" value="USD" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <!-- Note for translators: the following parts need to be translated:
-
- - https://tails.boum.org/donate/thanks
- - https://tails.boum.org/donate/canceled
- - US -->
-
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
- <input name="lc" type="hidden" value="US"/>
-
- <input type="radio" name="amount" value="5" id="pp_5" checked="checked"/><label for="pp_5">$5</label>
- <input type="radio" name="amount" value="10" id="pp_10"/><label for="pp_10">$10</label>
- <input type="radio" name="amount" value="20" id="pp_20"/><label for="pp_20">$20</label>
- <input type="radio" name="amount" value="50" id="pp_50"/><label for="pp_50">$50</label>
- <input type="radio" name="amount" value="100" id="pp_100"/><label for="pp_100">$100</label>
- <input type="radio" name="amount" value="" id="pp_cust"/><label for="pp_cust">Custom amount</label>
- <br/>
- <input type="submit" value="Donate"/>
-
-</form>
-
-</div>
-<!--
-<p><br/></p>
--->
- <!-- Note for translators: the following parts need to be translated:
- - https://tails.boum.org/donate/thanks
- - https://tails.boum.org/donate/canceled
- - US -->
-<!--
-<div id="euros-without-js">
-
-<h2>Donate in euros</h2>
-
-<p id="euro-tax" class="tax-deducible">Your donation goes entirely to Tails
-and will be handled by Zwiebelfreunde which is a non-profit organization
-in Germany.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-<h3>Recurring donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_xclick-subscriptions"/>
- <input type="hidden" name="business" value="tails@torservers.net"/>
- <input type="hidden" name="currency_code" value="EUR" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
- <input name="lc" type="hidden" value="US"/>
-
- <input type="hidden" name="src" value="1"/>
- <input type="hidden" name="p3" value="1"/>
-
- <input type="radio" name="a3" value="5" id="sub5" checked="checked"/><label for="sub5">5€</label>
- <input type="radio" name="a3" value="10" id="sub10"/><label for="sub10">10€</label>
- <input type="radio" name="a3" value="20" id="sub20"/><label for="sub20">20€</label>
- <input type="radio" name="a3" value="50" id="sub50"/><label for="sub50">50€</label>
- <input type="radio" name="a3" value="100" id="sub100"/><label for="sub100">100€</label>
- <input type="radio" name="a3" value="250" id="sub250"/><label for="sub250">250€</label>
- <input type="radio" name="a3" value="500" id="sub500"/><label for="sub500">500€</label>
- <br/>
- <input type="radio" name="t3" value="M" id="sub_m" checked="checked"/><label for="sub_m">Monthly</label>
- <input type="radio" name="t3" value="Y" id="sub_y"/><label for="sub_y">Yearly</label>
- <br/>
- <input type="submit" value="Donate"/> (Requires a [[!img paypal-inline.png link="no" class="paypal-inline" alt="PayPal"]] account.)
-
-</form>
-
-<h3>One-time donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_donations"/>
- <input type="hidden" name='business' value="tails@torservers.net"/>
- <input type="hidden" name="currency_code" value="EUR" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
- <input name="lc" type="hidden" value="US"/>
-
- <input type="radio" name="amount" value="5" id="pp_5" checked="checked"/><label for="pp_5">5€</label>
- <input type="radio" name="amount" value="10" id="pp_10"/><label for="pp_10">10€</label>
- <input type="radio" name="amount" value="20" id="pp_20"/><label for="pp_20">20€</label>
- <input type="radio" name="amount" value="50" id="pp_50"/><label for="pp_50">50€</label>
- <input type="radio" name="amount" value="100" id="pp_100"/><label for="pp_100">100€</label>
- <input type="radio" name="amount" value="" id="pp_cust"/><label for="pp_cust">Custom amount</label>
- <br/>
- <input type="submit" value="Donate"/>
-
-</form>
-
-</div>
--->
-
-</div>
-
</div>
</div> <!-- .row -->
@@ -340,12 +61,9 @@ permitted by law.</strong></p>
<h3 class="col-md-12">Other ways to donate</h3>
<div class="col-md-5">
- <div id="duckduckgo">
- <h4>DuckDuckGo</h4>
- <p>From March 13th 2018 to April 10th 2018 you can donate via the <a
- href="https://www.crowdrise.com/o/en/campaign/tails-live"
- target="_blank">DuckDuckGo donation challenge</a>.<br /> Join our
- fundraising team and reach out to your social circles!</p>
+ <div id="paypal">
+ <h4>PayPal</h4>
+ <p>Account: <i>tailsriseuplabs@riseup.net</i></p>
</div>
<div id="bitcoin">
<h4>Bitcoin</h4>