[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-265-gafeed01
by Emanuel Schuetze
cvs at cvs.gnupg.org
Wed Dec 14 14:20:13 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, website has been updated
via afeed01d7fd342219c7f406fcba1a18b81559295 (commit)
from 41e38e5e67b14ac1d9bde6d52cf70d77e0dab13b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit afeed01d7fd342219c7f406fcba1a18b81559295
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Wed Dec 14 10:19:59 2016 +0100
Improved donation form.
Use one form for onetime and monthly donations.
diff --git a/.gitignore b/.gitignore
index ed19ab7..de80e3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,8 +129,10 @@ src/mingwm10.dll
/web/screenshots.html
/web/support-de.html
/web/support.html
-/web/thanks-de.html
-/web/thanks.html
+/web/thanks-for-donation-de.html
+/web/thanks-for-donation.html
+/web/thanks-for-download-de.html
+/web/thanks-for-download.html
/web/website-maintenance-de.html
/web/website-maintenance.html
/web/www.gpg4win.org.tar.gz
diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index f612747..d9bb5f9 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -1,50 +1,95 @@
<!-- donation form -->
<div class="donate_box">
<h3>Bitte spenden Sie für Gpg4win, um die Pflege und Weiterentwicklung zu sichern!</h3>
- <p>Der Download von Gpg4win VERSION beginnt nach Abschluss Ihrer Spende.</p>
+ <p>Zahlen Sie das, was Gpg4win Ihnen wert ist! – Danke!</p>
<ul class="tabs">
<!-- paypal -->
<li>
- <p><i>Einmalig spenden via</i></p>
+ <p><i>Spenden via</i></p>
<input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
<label for="tab1">PayPal</label>
<div id="paypal_tab" class="tab-content">
<img class="pay-logo" src="img/paypal-logo.png">
<!-- amount -->
+ <br>
<form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="text" name="amount" value="20" size="4" id="amountfield"
- onchange="amountslider.value=value; checkAmount(value)">
- <select size="1" name="currency_code" id="currencyfield">
- <option selected="selected" value="EUR">EUR</option>
- <option value="USD">USD</option>
- </select>
- <br>
- <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
- oninput="amountfield.value=value; checkAmount(value)">
- <br>
+
+ <div class="amountlabel" id="USD">
+ <input type="radio" name="amount" value="0" id="amount1" onchange="checkAmount(value)">
+ <label for="amount1"> $0 </label>
+ <input type="radio" name="amount" value="10" id="amount2" onchange="checkAmount(value)">
+ <label for="amount2"> $10 </label>
+ <input type="radio" name="amount" value="15" id="amount3" onchange="checkAmount(value)" checked="checked">
+ <label for="amount3"> $15 </label>
+ <input type="radio" name="amount" value="25" id="amount4" onchange="checkAmount(value)">
+ <label for="amount4"> $25 </label>
+ <input type="radio" name="amount" value="" id="freeamount" onchange="checkAmount(value)">
+ <label for="freeamount" id="freeamountLabelBG">$
+ <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
+ onchange="freeamount.value=value; checkAmount(value)" onfocus="checkIt(freeamount.checked)">
+ </label>
+ </div>
+
+ <div class="amountlabel" id="EUR">
+ <input type="radio" name="amount" value="0" id="amount1_E" onchange="checkAmount(value)">
+ <label for="amount1_E"> 0€ </label>
+ <input type="radio" name="amount" value="10" id="amount2_E" onchange="checkAmount(value)">
+ <label for="amount2_E"> 10€ </label>
+ <input type="radio" name="amount" value="15" id="amount3_E" onchange="checkAmount(value)" checked="checked">
+ <label for="amount3_E"> 15€ </label>
+ <input type="radio" name="amount" value="25" id="amount4_E" onchange="checkAmount(value)">
+ <label for="amount4_E"> 25€ </label>
+ <input type="radio" name="amount" value="" id="freeamount_E" onchange="checkAmount(value)">
+ <label for="freeamount_E" id="freeamountLabelBG">€
+ <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
+ onchange="freeamount_E.value=value; checkAmount(value)" onfocus="checkItE(freeamount_E.checked)">
+ </label>
+ </div>
+
+ <div class="switches">
+ <div class="switch-field">
+ <input type="radio" id="switch_left" name="currency_code" value="USD" onchange="currency_choice('USD')">
+ <label for="switch_left">USD</label>
+ <input type="radio" id="switch_right" name="currency_code" value="EUR" onchange="currency_choice('EUR')"
+ checked="checked">
+ <label for="switch_right">EUR</label>
+ </div>
+
+ <div class="switch-field">
+ <input type="radio" id="onetime" name="frq" checked="checked" onchange="donation_frq('onetime')">
+ <label for="onetime">einmalig</label>
+ <input type="radio" id="monthly" name="frq" onchange="donation_frq('monthly')">
+ <label for="monthly">monatlich</label>
+ </div>
+ </div>
<div id="pay_div">
<!-- list me -->
<p>
<label>
- <input type="hidden" name="on0" value="Spende und Namen veröffentlichten">
- <input type="hidden" name="os0" value="Nein">
- <input type="checkbox" name="os0" value="Ja">
- <span>Meinen Namen in die <a href="donate-de.html#sponsors">Spenderliste</a> eintragen
- (ab 20,- EUR).</span>
+ <input type="hidden" name="on0" value="Spende und Namen veröffentlichten">
+ <input type="hidden" name="os0" value="Nein">
+ <input type="checkbox" name="os0" value="Ja">
+ <span>Meinen Namen in die <a href="donate-de.html#sponsors">Spenderliste</a> eintragen
+ (ab 20,- EUR).</span>
</label>
- <input type="hidden" name="charset" value="utf-8">
+ <input type="hidden" name="charset" value="utf-8">
<!-- feedback -->
<p>
- <input type="hidden" name="on1" value="Rückmeldung">
+ <input type="hidden" name="on1" value="Rückeldung">
<input type="hidden" name="os1" value="">
<textarea value="" name="os1" placeholder="Ich benutze Gpg4win, weil ..." rows="3" cols="48"></textarea>
<!-- pay button -->
<input type="hidden" name="lc" value="DE">
- <input name="cmd" value="_donations" type="hidden">
+ <input id="onetime1" name="cmd" value="_donations" type="hidden">
+ <input id="recurrent1" name="cmd" value="_xclick-subscriptions" type="hidden" disabled>
+ <input id="recurrent2" type="hidden" name="p3" value="1" disabled>
+ <input id="recurrent3" type="hidden" name="t3" value="M" disabled>
+ <input id="recurrent4" type="hidden" name="a3" value="" disabled>
+ <input id="recurrent5" type="hidden" name="src" value="1" disabled>
<input name="business" value="paypal at intevation.de" type="hidden">
<input name="undefined_quantity" value="1" type="hidden">
<input name="item_name" value="Gpg4win" type="hidden">
@@ -54,19 +99,19 @@
<input name="return" value="https://gpg4win.org/thanks-for-donation-de.html" type="hidden">
<input name="cancel_return" value="https://gpg4win.org/thanks-for-download-de.html" type="hidden">
<input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
- <p>
+ <p id="dButton">
<button class="donateButton" name="submit" alt="Spenden via PayPal"
- type="submit">Spenden & Download</button>
- oder <a href="thanks-for-download-de.html">kostenlos herunterladen</a
- </div>
-
- <!-- download -->
- <div id="download_div">
- <p>
- <a href="thanks-for-download-de.html">Gpg4win VERSION herunterladen</a> ohne zu spenden.
- </p>
+ type="submit">Spenden & Herunterladen</button>
</div>
</form>
+
+ <!-- download -->
+ <div id="download_div">
+ <p>
+ <a href="thanks-for-download.html"><button
+class="donateButton" alt="download">Herunterladen</button></a>
+ </p>
+ </div>
</div>
</li>
@@ -78,7 +123,7 @@
<p>
<img class="pay-logo" src="img/bitcoin-logo.png">
<p>Bitcoins können Sie uns anonym an folgende Adresse spenden:</p>
- <a href="bitcoin:1M3GipkG2YyHPDMPewqTpup83jitXvBg9N?label=gpg4win.org">
+ <a href="https://blockchain.info/address/1M3GipkG2YyHPDMPewqTpup83jitXvBg9N">
1M3GipkG2YyHPDMPewqTpup83jitXvBg9N
</a>
<p>
@@ -108,78 +153,15 @@
</p>
</div>
</li>
-
- <!-- reccurent donation -->
- <br>
- <p><i>Regelmäßig spenden via</i></p>
- <li>
- <input id="tab4" type="radio" value="paypal" name="paymethod">
- <label for="tab4">PayPal</label>
- <div id="paypal_tab" class="tab-content">
- <img class="pay-logo" src="img/paypal-logo.png">
- <!-- amount -->
- <form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="text" name="a3" value="20" size="4" id="amountfield"
- onchange="amountslider.value=value; checkAmount(value)">
- <select size="1" name="currency_code" id="currencyfield">
- <option selected="selected" value="EUR">EUR</option>
- <option value="USD">USD</option>
- </select>
- <input name="t3" type="radio" value=M id="monthly" checked="checked">
- <label for="monthly">monatlich</label>
- <input name="t3" type="radio" value=Y id="annually">
- <label for="annually">jährlich</label>
-
- <br>
- <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
- oninput="amountfield.value=value; checkAmount(value)">
- <br>
-
- <!-- list me -->
- <p>
- <label>
- <input type="hidden" name="on0" value="Spende und Namen veröffentlichen">
- <input type="hidden" name="os0" value="Nein">
- <input type="checkbox" name="os0" value="Ja">
- <span>Meinen Namen in die <a href="donate-de.html#sponsors">Spenderliste</a> eintragen
- (ab 20,- EUR).</span>
- </label>
- <input type="hidden" name="charset" value="utf-8">
-
- <!-- feedback -->
- <p>
- <input type="hidden" name="on1" value="Rückmeldung">
- <input type="hidden" name="os1" value="">
- <textarea value="" name="os1" placeholder="Ich benutze Gpg4win, weil ..." rows="3" cols="48"></textarea>
-
- <!-- pay button -->
- <input type="hidden" name="lc" value="DE">
- <input name="cmd" value="_xclick-subscriptions" type="hidden">
- <input name="business" value="paypal at intevation.de" type="hidden">
- <input name="undefined_quantity" value="1" type="hidden">
- <input name="item_name" value="Gpg4win" type="hidden">
- <input name="no_shipping" value="1" type="hidden">
- <input name="no_note" value="1" type="hidden">
- <input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
- <input name="return" value="https://gpg4win.org/thanks-for-donation-de.html" type="hidden">
- <input name="cancel_return" value="https://gpg4win.org/thanks-for-download-de.html" type="hidden">
- <input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
- <input type="hidden" name="p3" value="1">
- <input type="hidden" name="src" value="1">
- <p>
- <button class="donateButton" name="submit" alt="Spenden via PayPal"
- type="submit">Spenden & Download</button>
- oder <a href="thanks-for-download-de.html">kostenlos herunterladen</a
- </form>
- </div>
- </li>
</ul>
</div>
<script type="text/javascript">
document.getElementById('download_div').style.display = "none";
+ document.getElementById('EUR').style.display = "none";
+ amountGiven = 0;
- function checkAmount(amount) {
+ function checkAmount(amount) {
if (amount < 0 ) {
document.getElementById('amountfield').value = 0;
amount = 0;
@@ -192,5 +174,57 @@
document.getElementById('download_div').style.display = "none";
document.getElementById('pay_div').style.display = "block";
}
+ document.getElementById('recurrent4').value = amount;
+ amountGiven = amount;
+ }
+
+ function checkIt(checked) {
+ if (!checked) {
+ document.getElementById('freeamount').checked = "checked";
+ }
+ }
+
+ function checkItE(checked) {
+ if (!checked) {
+ document.getElementById('freeamount_E').checked = "checked";
+ }
+ }
+
+ function currency_choice(txt) {
+ if (txt == "USD") {
+ document.getElementById('USD').style.display = "block";
+ document.getElementById('EUR').style.display = "none";
+ for (var i = 0; i < 5; i++) {
+ var v = document.getElementsByName('amount')[i];
+ if (v.value == amountGiven) {
+ v.checked = "checked";
+ }
+ }
+ }
+ if (txt == "EUR") {
+ document.getElementById('USD').style.display = "none";
+ document.getElementById('EUR').style.display = "block";
+ for (var i = 5; i < 10; i++) {
+ var v = document.getElementsByName('amount')[i];
+ if (v.value == amountGiven) {
+ v.checked = "checked";
+ }
+ }
+ }
+ }
+
+ function donation_frq(txt) {
+ if (txt == "onetime") {
+ document.getElementById('onetime1').disabled= false;
+ for (var i=1; i<6; i++) {
+ document.getElementById('recurrent'+i).disabled= true;
+ }
+ }
+ if (txt == "monthly") {
+ document.getElementById('onetime1').disabled= true;
+ for (var i=1; i<6; i++) {
+ document.getElementById('recurrent'+i).disabled= false;
+ }
+ }
}
</script>
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index 4353140..4f35a7b 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -1,51 +1,96 @@
<!-- donation form -->
<div class="donate_box">
<h3>Please donate for Gpg4win to support maintenance and development!</h3>
- <p>The download of Gpg4win VERSION starts after finishing your donation.</p>
+ <p>Pay what you want! – Thank you!</p>
<ul class="tabs">
- <!-- paypal -->
- <li>
- <p><i>Onetime donation with</i></p>
+ <!-- paypal -->
+ <li>
+ <p><i>Donate with</i></p>
<input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
<label for="tab1">PayPal</label>
<div id="paypal_tab" class="tab-content">
<img class="pay-logo" src="img/paypal-logo.png">
<!-- amount -->
+ <br>
<form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="text" name="amount" value="20" size="4" id="amountfield"
- onchange="amountslider.value=value; checkAmount(value)">
- <select size="1" name="currency_code" id="currencyfield">
- <option selected="selected" value="EUR">EUR</option>
- <option value="USD">USD</option>
- </select>
- <br>
- <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
- oninput="amountfield.value=value; checkAmount(value)">
- <br>
+
+ <div class="amountlabel" id="USD">
+ <input type="radio" name="amount" value="0" id="amount1" onchange="checkAmount(value)">
+ <label for="amount1"> $0 </label>
+ <input type="radio" name="amount" value="10" id="amount2" onchange="checkAmount(value)">
+ <label for="amount2"> $10 </label>
+ <input type="radio" name="amount" value="15" id="amount3" onchange="checkAmount(value)" checked="checked">
+ <label for="amount3"> $15 </label>
+ <input type="radio" name="amount" value="25" id="amount4" onchange="checkAmount(value)">
+ <label for="amount4"> $25 </label>
+ <input type="radio" name="amount" value="" id="freeamount" onchange="checkAmount(value)">
+ <label for="freeamount" id="freeamountLabelBG">$
+ <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
+ onchange="freeamount.value=value; checkAmount(value)" onfocus="checkIt(freeamount.checked)">
+ </label>
+ </div>
+
+ <div class="amountlabel" id="EUR">
+ <input type="radio" name="amount" value="0" id="amount1_E" onchange="checkAmount(value)">
+ <label for="amount1_E"> 0€ </label>
+ <input type="radio" name="amount" value="10" id="amount2_E" onchange="checkAmount(value)">
+ <label for="amount2_E"> 10€ </label>
+ <input type="radio" name="amount" value="15" id="amount3_E" onchange="checkAmount(value)">
+ <label for="amount3_E"> 15€ </label>
+ <input type="radio" name="amount" value="25" id="amount4_E" onchange="checkAmount(value)">
+ <label for="amount4_E"> 25€ </label>
+ <input type="radio" name="amount" value="" id="freeamount_E" onchange="checkAmount(value)">
+ <label for="freeamount_E" id="freeamountLabelBG">€
+ <input type="number" name="given_amount" min="0" value="" size="1" id="freeamountLabel"
+ onchange="freeamount_E.value=value; checkAmount(value)" onfocus="checkItE(freeamount_E.checked)">
+ </label>
+ </div>
+
+ <div class="switches">
+ <div class="switch-field">
+ <input type="radio" id="switch_left" name="currency_code" value="USD" onchange="currency_choice('USD')"
+ checked="checked">
+ <label for="switch_left">USD</label>
+ <input type="radio" id="switch_right" name="currency_code" value="EUR" onchange="currency_choice('EUR')">
+ <label for="switch_right">EUR</label>
+ </div>
+
+ <div class="switch-field">
+ <input type="radio" id="onetime" name="frq" checked="checked" onchange="donation_frq('onetime')">
+ <label for="onetime">onetime</label>
+ <input type="radio" id="monthly" name="frq" onchange="donation_frq('monthly')">
+ <label for="monthly">monthly</label>
+ </div>
+ </div>
<div id="pay_div">
<!-- list me -->
<p>
<label>
- <input type="hidden" name="on0" value="Publish your donation and name">
- <input type="hidden" name="os0" value="No">
- <input type="checkbox" name="os0" value="Yes">
- <span>Add me to the <a href="donate.html#sponsors">list of sponsors</a>
+ <input type="hidden" name="on0" value="Publish your donation and name">
+ <input type="hidden" name="os0" value="No">
+ <input type="checkbox" name="os0" value="Yes">
+ <span>Add me to the <a href="donate.html#sponsors">list of sponsors</a>
(from 20,- EUR/USD up)</span>
</label>
- <input type="hidden" name="charset" value="utf-8">
+ <input type="hidden" name="charset" value="utf-8">
<!-- feedback -->
<p>
<input type="hidden" name="on1" value="Feedback">
- <input type="hidden" name="os1" value="">
+ <input type="hidden" name="os1" value="US">
<textarea value="" name="os1" placeholder="I am using Gpg4win because ..." rows="3" cols="48"></textarea>
<!-- pay button -->
<input type="hidden" name="lc" value="US">
- <input name="cmd" value="_donations" type="hidden">
+ <input id="onetime1" name="cmd" value="_donations" type="hidden">
+ <input id="recurrent1" name="cmd" value="_xclick-subscriptions" type="hidden" disabled>
+ <input id="recurrent2" type="hidden" name="p3" value="1" disabled>
+ <input id="recurrent3" type="hidden" name="t3" value="M" disabled>
+ <input id="recurrent4" type="hidden" name="a3" value="" disabled>
+ <input id="recurrent5" type="hidden" name="src" value="1" disabled>
<input name="business" value="paypal at intevation.de" type="hidden">
<input name="undefined_quantity" value="1" type="hidden">
<input name="item_name" value="Gpg4win" type="hidden">
@@ -55,132 +100,68 @@
<input name="return" value="https://gpg4win.org/thanks-for-donation.html" type="hidden">
<input name="cancel_return" value="https://gpg4win.org/thanks-for-download.html" type="hidden">
<input name="cbt" value="Download Gpg4win now!" type="hidden">
- <p>
+ <p id="dButton">
<button class="donateButton" name="submit" alt="Donate via PayPal"
type="submit">Donate & Download</button>
- or <a href="thanks-for-download.html">download for free</a>
- </div>
-
- <!-- download -->
- <div id="download_div">
- <p>
- <a href="thanks-for-download.html">Download Gpg4win 2.3.2</a> without donation.
- </p>
</div>
</form>
- </div>
- </li>
-
- <!-- bitcoin -->
- <li>
- <input id="tab2" type="radio" value="bitcoin" name="paymethod">
- <label for="tab2">Bitcoin</label>
- <div id="bitcoin_tab" class="tab-content">
- <p>
- <img class="pay-logo" src="img/bitcoin-logo.png">
- <p>You can send us bitcoins anonymously to the following address:</p>
- <a href="bitcoin:1M3GipkG2YyHPDMPewqTpup83jitXvBg9N?label=gpg4win.org">
- 1M3GipkG2YyHPDMPewqTpup83jitXvBg9N
- </a>
- <p>
- <img class="qrcode" src="img/bitcoin-qrcode.png">
- <p>
- After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
- </div>
- </li>
-
- <!-- bank transfer -->
- <li>
- <input id="tab3" type="radio" value="transfer" name="paymethod" >
- <label for="tab3">Bank transfer</label>
- <div id="transfer_tab" class="tab-content">
- <b>Bank transfer details:</b>
- <blockquote>
- Receiver: Intevation GmbH<br>
- IBAN: DE33 2654 0070 0539 2006 00<br>
- BIC: COBADEFFXXX (Commerzbank Osnabrück)<br>
- Reference: "Gpg4win donation"
- </blockquote>
- <p>
- Please <a href="mailto:gpg4win-professional at intevation.de">contact us</a>
- if you need an invoice (for more than 100,- EUR/USD only).
+
+ <!-- download -->
+ <div id="download_div">
<p>
- After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
+ <a href="thanks-for-download.html"><button class="donateButton" alt="download">Download</button></a>
</p>
</div>
- </li>
-
- <!-- reccurent donation -->
- <br>
- <p><i>Reccurent donation with</i></p>
- <li>
- <input id="tab4" type="radio" value="paypal" name="paymethod">
- <label for="tab4">Paypal</label>
- <div id="paypal_tab" class="tab-content">
- <img class="pay-logo" src="img/paypal-logo.png">
- <!-- amount -->
- <form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <input type="text" name="a3" value="20" size="4" id="amountfield"
- onchange="amountslider.value=value; bitpayamountfield.value=value; checkAmount(value)">
- <select size="1" name="currency_code" id="currencyfield">
- <option selected="selected" value="EUR">EUR</option>
- <option value="USD">USD</option>
- </select>
- <input name="t3" type="radio" value=M id="monthly" checked="checked">
- <label for="monthly">monthly</label>
- <input name="t3" type="radio" value=Y id="annually">
- <label for="annually">annually</label>
-
- <br>
- <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
- oninput="amountfield.value=value; bitpayamountfield.value=value; checkAmount(value)">
- <br>
-
- <!-- list me -->
- <p>
- <label>
- <input type="hidden" name="on0" value="Publish your donation and name">
- <input type="hidden" name="os0" value="No">
- <input type="checkbox" name="os0" value="Yes">
- <span>Add me to the <a href="donate.html#sponsors">list of sponsors</a>
- (from 20,- EUR/USD up)</span>
- </label>
- <input type="hidden" name="charset" value="utf-8">
+ </div>
+ </li>
- <!-- feedback -->
- <p>
- <input type="hidden" name="on1" value="Feedback">
- <input type="hidden" name="os1" value="">
- <textarea value="" name="os1" placeholder="I am using Gpg4win because ..." rows="3" cols="48"></textarea>
+ <!-- bitcoin -->
+ <li>
+ <input id="tab2" type="radio" value="bitcoin" name="paymethod">
+ <label for="tab2">Bitcoin</label>
+ <div id="bitcoin_tab" class="tab-content">
+ <p>
+ <img class="pay-logo" src="img/bitcoin-logo.png">
+ <p>You can send us bitcoins anonymously to the following address:</p>
+ <a href="https://blockchain.info/address/1M3GipkG2YyHPDMPewqTpup83jitXvBg9N">
+ 1M3GipkG2YyHPDMPewqTpup83jitXvBg9N
+ </a>
+ <p>
+ <img class="qrcode" src="img/bitcoin-qrcode.png">
+ <p>
+ After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
+ </div>
+ </li>
- <!-- pay button -->
- <input type="hidden" name="lc" value="">
- <input name="cmd" value="_xclick-subscriptions" type="hidden">
- <input name="business" value="paypal at intevation.de" type="hidden">
- <input name="undefined_quantity" value="1" type="hidden">
- <input name="item_name" value="Gpg4win" type="hidden">
- <input name="no_shipping" value="1" type="hidden">
- <input name="no_note" value="1" type="hidden">
- <input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
- <input name="return" value="https://gpg4win.org/thanks-for-donation.html" type="hidden">
- <input name="cancel_return" value="https://gpg4win.org/thanks-for-download.html" type="hidden">
- <input name="cbt" value="Download Gpg4win now!" type="hidden">
- <input type="hidden" name="p3" value="1">
- <input type="hidden" name="src" value="1">
- <p>
- <button class="donateButton" name="submit" alt="Donate via PayPal"
- type="submit">Donate & Download</button>
- or <a href="thanks-for-download.html">download for free</a>
- </form>
- </div>
- </li>
- </ul>
+ <!-- bank transfer -->
+ <li>
+ <input id="tab3" type="radio" value="transfer" name="paymethod" >
+ <label for="tab3">Bank transfer</label>
+ <div id="transfer_tab" class="tab-content">
+ <b>Bank transfer details:</b>
+ <blockquote>
+ Receiver: Intevation GmbH<br>
+ IBAN: DE33 2654 0070 0539 2006 00<br>
+ BIC: COBADEFFXXX (Commerzbank Osnabrück)<br>
+ Reference: "Gpg4win donation"
+ </blockquote>
+ <p>
+ Please <a href="mailto:gpg4win-professional at intevation.de">contact us</a>
+ if you need an invoice (for more than 100,- EUR/USD only).
+ <p>
+ After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
+ </p>
+ </div>
+ </li>
+ </ul>
</div>
<script type="text/javascript">
document.getElementById('download_div').style.display = "none";
+ document.getElementById('EUR').style.display = "none";
+ amountGiven = 15;
- function checkAmount(amount) {
+ function checkAmount(amount) {
if (amount < 0 ) {
document.getElementById('amountfield').value = 0;
amount = 0;
@@ -193,5 +174,57 @@
document.getElementById('download_div').style.display = "none";
document.getElementById('pay_div').style.display = "block";
}
+ document.getElementById('recurrent4').value = amount;
+ amountGiven = amount;
+ }
+
+ function checkIt(checked) {
+ if (!checked) {
+ document.getElementById('freeamount').checked = "checked";
+ }
+ }
+
+ function checkItE(checked) {
+ if (!checked) {
+ document.getElementById('freeamount_E').checked = "checked";
+ }
+ }
+
+ function currency_choice(txt) {
+ if (txt == "USD") {
+ document.getElementById('USD').style.display = "block";
+ document.getElementById('EUR').style.display = "none";
+ for (var i = 0; i < 5; i++) {
+ var v = document.getElementsByName('amount')[i];
+ if (v.value == amountGiven) {
+ v.checked = "checked";
+ }
+ }
+ }
+ if (txt == "EUR") {
+ document.getElementById('USD').style.display = "none";
+ document.getElementById('EUR').style.display = "block";
+ for (var i = 5; i < 10; i++) {
+ var v = document.getElementsByName('amount')[i];
+ if (v.value == amountGiven) {
+ v.checked = "checked";
+ }
+ }
+ }
+ }
+
+ function donation_frq(txt) {
+ if (txt == "onetime") {
+ document.getElementById('onetime1').disabled= false;
+ for (var i=1; i<6; i++) {
+ document.getElementById('recurrent'+i).disabled= true;
+ }
+ }
+ if (txt == "monthly") {
+ document.getElementById('onetime1').disabled= true;
+ for (var i=1; i<6; i++) {
+ document.getElementById('recurrent'+i).disabled= false;
+ }
+ }
}
</script>
diff --git a/web/gpg4win.css b/web/gpg4win.css
index 33bbcae..d1674ab 100644
--- a/web/gpg4win.css
+++ b/web/gpg4win.css
@@ -169,7 +169,7 @@ td {
}
#donate_button a {
- background: url('img/donate_button.png');
+ background-color: url('img/donate_button.png');
background-repeat: no-repeat;
display: block;
height: 79px;
@@ -190,11 +190,11 @@ td {
left:10px;
}
.donate_box {
- border-radius: 10px 10px 10px 10px;
+ border-radius: 4px;
background: #FDF1CD;
border: 1px solid #CCCCCC;
padding: 20px 20px 15px;
- min-height: 335px;
+ min-height: 365px;
}
.donate_box h3 {
margin: 0;
@@ -208,35 +208,34 @@ td {
height: 30px;
}
.donateButton {
- font-size: 11px;
+ background: url('img/download-arrow.png') no-repeat 9px 9px;
+ background-size: 20px 20px;
+ padding-left: 36px;
+ padding-right: 10px;
+ font-size: 14px;
height: 40px;
- border: none;
- background: url('img/download_button_mini.png');
- background-repeat: no-repeat;
- height: 50px;
- width: 189px;
- text-align: left;
- line-height: 50px;
- color: #FFFFFF;
- font-weight: bold;
- text-decoration: none;
+ border: 2px white;
+ border-radius: 4px;
+ text-align: center;
+ font-weight: bold;
+ text-decoration: none;
}
-.donateButton:hover {
- background-position: 0px -50px;
+a>.donateButton{
+ margin-top: 40px;
}
+
.donate_box blockquote {
line-height: 150%;
}
.donate_box .pay-logo {
width: 100px;
}
+
.donate_box .qrcode {
width: 130px;
}
-#tab4 > label{
- font-weiht: bold;
-}
+
/* donation slider */
input[type='range'] {
-webkit-appearance: none;
@@ -761,7 +760,7 @@ hr {
list-style: none;
width: 100%;
float: left;
- height: 270px;
+ height: 290px;
padding-left: 0;
position: relative;
}
@@ -798,6 +797,7 @@ textarea, select, input[type=text]{
border: 1px solid #bbb;
border-radius: 4px;
padding: 5px;
+ width: 100%;
}
input[type=text]{
height: 31px;
@@ -842,3 +842,140 @@ select{
border-bottom: 1px dotted #555;
padding-bottom: 5px;
}
+
+.pay_div{
+ width: 100%;
+}
+
+.amountlabel {
+ margin: 15px 0 20px 0;
+ float: left;
+ clear: right;
+ width: 100%;
+}
+.amountlabel > input[type="radio"]{
+ display:none;
+}
+.amountlabel > label{
+ border-radius: 4px;
+ font-size: 16px;
+ padding: 10px 15px;
+ text-align: center;
+ margin: 0 7px 1px 3px;
+ font-weight: bold;
+ width: 65px;
+}
+
+/*** donate button colors ***/
+/* inactive */
+.amountlabel > input + label,
+.switch-field input + label,
+.donateButton {
+ color: white;
+}
+.amountlabel > label,
+.switch-field label {
+ background-color: rgba(180,180,180,0.75);
+}
+
+/* hover */
+.amountlabel > label:hover,
+.amountlabel > input[type="radio"]:hover + label:hover,
+.switch-field label:hover,
+.donateButton:hover {
+ background-color: #8fc8d2;
+ cursor: pointer;
+}
+
+/* active */
+.amountlabel > input[type="radio"]:checked + label,
+.amountlabel > label > input[type="number"]:focus + label,
+.switch-field input:checked + label,
+.donateButton {
+ background-color: #179bd7;
+}
+
+
+
+input[type=number]::-webkit-outer-spin-button,
+input[type=number]::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ margin: 0;
+}
+
+input[type=number] {
+ -moz-appearance:textfield;
+}
+
+.amountlabel > label > input[type="number"]{
+ background-color: transparent;
+ color: white;
+ border: none;
+ border-bottom: 1px solid;
+ border-radius: 0px;
+ box-shadow: none;
+ height: 20px;
+ font-size: 18px;
+ font-family: arial, helvetica, sans-serif;
+ text-align: center;
+ width: 45px;
+ font-weight: normal;
+}
+
+#freeamountLabel{
+ padding: 0;
+}
+
+.switch-field {
+ padding: 15px 0 15px 0;
+ margin: 5px 0 5px 0;
+ overflow: hidden;
+ width: 50%;
+ display: inline;
+}
+
+#donation_frq{
+ clear: right;
+}
+
+.switch-title {
+ margin-bottom: 6px;
+}
+
+.switch-field input {
+ display: none;
+}
+
+.switch-field label {
+ float: left;
+}
+
+.switch-field label {
+ display: inline-block;
+ width: 60px;
+ font-size: 12px;
+ font-weight: bold;
+ text-align: center;
+ text-shadow: none;
+ padding: 3px 14px;
+ border: none;
+}
+
+.switch-field input:checked + label {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.switch-field label:first-of-type {
+ border-radius: 4px 0 0 4px;
+ margin: 0 0 0 3px;
+}
+
+.switch-field label:last-of-type {
+ border-radius: 0 4px 4px 0;
+ margin: 0 11px 10px -1px;
+}
+
+.switches{
+ width: 100%;
+}
diff --git a/web/img/download-arrow.png b/web/img/download-arrow.png
new file mode 100644
index 0000000..833055d
Binary files /dev/null and b/web/img/download-arrow.png differ
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 6 +-
web/donation-form-de.htm4 | 228 +++++++++++++++++++---------------
web/donation-form.htm4 | 299 +++++++++++++++++++++++++--------------------
web/gpg4win.css | 177 ++++++++++++++++++++++++---
web/img/download-arrow.png | Bin 0 -> 369 bytes
5 files changed, 458 insertions(+), 252 deletions(-)
create mode 100644 web/img/download-arrow.png
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list