[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-257-gd7e438b
by Emanuel Schuetze
cvs at cvs.gnupg.org
Thu Oct 6 14:33:51 CEST 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 d7e438bd79e34c3204db647b72db5489efb3da9c (commit)
from d7596caf5d2fbee9cbd6fd2f2899f686988ec649 (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 d7e438bd79e34c3204db647b72db5489efb3da9c
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Oct 6 14:32:26 2016 +0200
Added new bitcoin address with qrcode.
diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index 83bd370..6817cc1 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -3,7 +3,7 @@
<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>
- <ul class="tabs">
+ <ul class="tabs">
<!-- paypal -->
<li>
<p><i>Einmalig spenden via</i></p>
@@ -14,14 +14,14 @@
<!-- amount -->
<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; bitpayamountfield.value=value; checkAmount(value)">
+ 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; bitpayamountfield.value=value; checkAmount(value)">
+ oninput="amountfield.value=value; checkAmount(value)">
<br>
<div id="pay_div">
@@ -74,45 +74,22 @@
<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>
-
- <!-- TODO:
- <input type="text" name="amount" value="20" size="4" id="amountfield2"
- onchange="amountslider2.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>
- <br>
- <input type="range" value="20" min="0" max="150" step="5" id="amountslider2"
- oninput="amountfield2.value=value; bitpayamountfield.value=value; checkAmount(value)">
-
- <div id="pay_div">
- <p>
- <form name="bitpay" action="https://bitpay.com/checkout" method="post">
- <input type="hidden" name="action" value="checkout">
- <input type="hidden" name="price" id="bitpayamountfield" value="20">
- <input type="hidden" name="posData" value="">
- <input type="hidden" name="data" value="znBoq4gBRdiwJFbMisx6mSN6NDgT3s3CVWB7OJjZtPAv/Rhs2E4RHrBOlpdo0jPZWpQEljG8jFfC/T0BtxXnBut5RRt/dqpE3YNa32FY5iPOjWp+bJsm1xnCV6l96/FKXbgcBXxWKFK1UfIAtadQ1CI9svdjUrFy+Ob7T1rKHdMCN5/Y7oYa9ob1BmDUmG7ItH+63ftqaDj+kO3BQ2RiFUhwZDCSJVk47uvMaThEUD6YBR0djWgwz0nYyrz7Rnmy">
- <p>
- <button class="donateButton" name="submit" alt="Spenden via bitpay"
- type="submit">Spenden & Download</button>
- oder <a href="thanks-de.html">kostenlos herunterladen</a>
- </form>
- </div>
- -->
-
+ <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">
+ 1M3GipkG2YyHPDMPewqTpup83jitXvBg9N
+ </a>
+ <p>
+ <img class="qrcode" src="img/bitcoin-qrcode.png">
<p>
- Entschuldigung! Spenden mit Bitcoins ist aktuell nicht möglich. Wir arbeiten dran.
- Bitte nutzen Sie stattdessen eine andere Zahlmethode (PayPal oder Überweisung).
- Danke.
- </p>
+ Nach Abschluss der Transaktion: <a href="thanks-de.html">Gpg4win VERSION herunterladen</a>
</div>
- </li>
+ </li>
- <!-- bank transfer -->
- <li>
- <input id="tab3" type="radio" value="transfer" name="paymethod" >
+ <!-- bank transfer -->
+ <li>
+ <input id="tab3" type="radio" value="transfer" name="paymethod" >
<label for="tab3">Überweisung</label>
<div id="transfer_tab" class="tab-content">
<b>Spendenkonto:</b>
@@ -126,15 +103,15 @@
<a href="mailto:gpg4win-professional at intevation.de">Kontaktieren Sie uns</a>,
wenn Sie eine Rechnung benötigen (nur bei Beträgen ab 100,- EUR).
<p>
- <a href="thanks-de.html">Gpg4win VERSION herunterladen</a> nach Abschluss der Überweisung.
+ Nach Abschluss der Überweisung: <a href="thanks-de.html">Gpg4win VERSION herunterladen</a>
</p>
</div>
- </li>
+ </li>
- <!-- reccurent donation -->
- <br>
- <p><i>Regelmäßig spenden via</i></p>
- <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">
@@ -142,7 +119,7 @@
<!-- 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)">
+ 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>
@@ -154,7 +131,7 @@
<br>
<input type="range" value="20" min="0" max="150" step="5" id="amountslider"
- oninput="amountfield.value=value; bitpayamountfield.value=value; checkAmount(value)">
+ oninput="amountfield.value=value; checkAmount(value)">
<br>
<!-- list me -->
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index 05605ba..b9ba5c6 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -3,9 +3,10 @@
<h3>Please donate for Gpg4win to support maintenance and development!</h3>
<p>The download of Gpg4win VERSION starts after finishing your donation.</p>
- <ul class="tabs">
- <!-- paypal -->
- <li>
+ <ul class="tabs">
+
+ <!-- paypal -->
+ <li>
<p><i>Onetime donation with</i></p>
<input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
<label for="tab1">PayPal</label>
@@ -14,14 +15,14 @@
<!-- amount -->
<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; bitpayamountfield.value=value; checkAmount(value)">
+ 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; bitpayamountfield.value=value; checkAmount(value)">
+ oninput="amountfield.value=value; checkAmount(value)">
<br>
<div id="pay_div">
@@ -69,43 +70,22 @@
</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>
-
- <!-- TODO:
- <input type="text" name="amount" value="20" size="4" id="amountfield2"
- onchange="amountslider2.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>
- <br>
- <input type="range" value="20" min="0" max="150" step="5" id="amountslider2"
- oninput="amountfield2.value=value; bitpayamountfield.value=value; checkAmount(value)">
-
- <div id="pay_div">
- <p>
- <form name="bitpay" action="https://bitpay.com/checkout" method="post">
- <input type="hidden" name="action" value="checkout">
- <input type="hidden" name="price" id="bitpayamountfield" value="20">
- <input type="hidden" name="posData" value="">
- <input type="hidden" name="data" value="znBoq4gBRdiwJFbMisx6mSN6NDgT3s3CVWB7OJjZtPAv/Rhs2E4RHrBOlpdo0jPZWpQEljG8jFfC/T0BtxXnBut5RRt/dqpE3YNa32FY5iPOjWp+bJsm1xnCV6l96/FKXbgcBXxWKFK1UfIAtadQ1CI9svdjUrFy+Ob7T1rKHdMCN5/Y7oYa9ob1BmDUmG7ItH+63ftqaDj+kO3BQ2RiFUhwZDCSJVk47uvMaThEUD6YBR0djWgwz0nYyrz7Rnmy">
+ <!-- bitcoin -->
+ <li>
+ <input id="tab2" type="radio" value="bitcoin" name="paymethod">
+ <label for="tab2">Bitcoin</label>
+ <div id="bitcoin_tab" class="tab-content">
<p>
- <button class="donateButton" name="submit" alt="Donate via PayPal"
- type="submit">Donate & Download</button>
- or <a href="thanks.html">download for free </a>
- </form>
+ <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.html">Download Gpg4win VERSION</a>
</div>
- -->
- <p>
- Sorry, donate with bitcoins is currently not possible. We working on it.
- Please use our other pay methods (PayPal or bank transfer) instead. Thanks.
- </p>
- </div>
</li>
<!-- bank transfer -->
@@ -124,7 +104,7 @@
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>
- <a href="thanks.html">Download Gpg4win VERSION</a> after making transfer.
+ After making transfer: <a href="thanks.html">Download Gpg4win VERSION</a>
</p>
</div>
</li>
diff --git a/web/gpg4win.css b/web/gpg4win.css
index 61dc077..33bbcae 100644
--- a/web/gpg4win.css
+++ b/web/gpg4win.css
@@ -231,6 +231,9 @@ td {
.donate_box .pay-logo {
width: 100px;
}
+.donate_box .qrcode {
+ width: 130px;
+}
#tab4 > label{
font-weiht: bold;
}
diff --git a/web/img/bitcoin-qrcode.png b/web/img/bitcoin-qrcode.png
new file mode 100644
index 0000000..f688e0f
Binary files /dev/null and b/web/img/bitcoin-qrcode.png differ
-----------------------------------------------------------------------
Summary of changes:
web/donation-form-de.htm4 | 71 +++++++++++++++------------------------------
web/donation-form.htm4 | 62 ++++++++++++++-------------------------
web/gpg4win.css | 3 ++
web/img/bitcoin-qrcode.png | Bin 0 -> 7510 bytes
4 files changed, 48 insertions(+), 88 deletions(-)
create mode 100644 web/img/bitcoin-qrcode.png
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list