[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-256-gd7596ca

by Emanuel Schuetze cvs at cvs.gnupg.org
Thu Oct 6 10:06:54 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  d7596caf5d2fbee9cbd6fd2f2899f686988ec649 (commit)
       via  466e9f3971f863d0362cc57f08a201d7e77d7a8f (commit)
      from  a6cf09042b74e53babe6fd8fb4bf88074ea23ef6 (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 d7596caf5d2fbee9cbd6fd2f2899f686988ec649
Author: Emanuel Schuetze <emanuel at intevation.de>
Date:   Thu Oct 6 10:06:15 2016 +0200

    Improved donation form.

diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index b5606b2..83bd370 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -6,12 +6,12 @@
       <ul class="tabs">
       <!-- paypal -->
       <li>
-	<p><i>Einmalige Spenden via</i></p>
+	<p><i>Einmalig 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 -->		
+	  <!-- 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)">
@@ -23,7 +23,7 @@
 	    <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
 		oninput="amountfield.value=value; bitpayamountfield.value=value; checkAmount(value)">
 	    <br>
-	    
+
 	    <div id="pay_div">
 	      <!-- list me -->
 	      <p>
@@ -31,16 +31,17 @@
 		<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>In die <a href="#sponsors">Liste der Spender</a>
-		  (für Spenden ab 20,-)</span>
+		<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="Geben Sie uns Rückmeldung!" rows="3" cols="48"></textarea>
-	    
+	      <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">
@@ -52,12 +53,12 @@
 	      <input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
 	      <input name="return" value="https://gpg4win.org/thanks.html" type="hidden">
 	      <input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
-	      <p> 
+	      <p>
 	      <button class="donateButton" name="submit" alt="Spenden via PayPal"
-		  type="submit">Spenden&Download</button>
+		  type="submit">Spenden & Download</button>
 	      oder <a href="thanks.html">kostenlos herunterladen</a>
 	    </div>
-	    
+
 	    <!-- download -->
 	    <div id="download_div">
 	      <p>
@@ -65,7 +66,7 @@
 	      </p>
 	    </div>
 	  </form>
-	</div>  
+	</div>
       </li>
     
       <!-- bitcoin -->
@@ -74,6 +75,8 @@
 	<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">
@@ -84,22 +87,29 @@
 	  <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">	
+	  <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> 
+	    <p>
 	    <button class="donateButton" name="submit" alt="Spenden via bitpay"
-              type="submit">Spenden & Herunterladen</button>
+              type="submit">Spenden & Download</button>
 	    oder <a href="thanks-de.html">kostenlos herunterladen</a>
 	    </form>
-	  </div>	    
+	  </div>
+          -->
+
+          <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>
 	</div>
 	</li>
-      
+
 	<!-- bank transfer -->
 	<li>
 	  <input id="tab3" type="radio" value="transfer" name="paymethod" >
@@ -120,10 +130,10 @@
 	    </p>
 	  </div>
 	</li>
-      
+
 	<!-- reccurent donation -->
 	<br>
-	<p><i>Regelmäßige Spenden via</i></p>
+	<p><i>Regelmäßig spenden via</i></p>
 	<li>
 	  <input id="tab4" type="radio" value="paypal" name="paymethod">
 	  <label for="tab4">PayPal</label>
@@ -138,9 +148,9 @@
 		<option value="USD">USD</option>
 	      </select>
 	      <input name="t3" type="radio" value=M id="monthly" checked="checked">
-	      <label for="monthly">Monatlich</label>
+	      <label for="monthly">monatlich</label>
 	      <input name="t3" type="radio" value=Y id="annually">
-	      <label for="annually">Jährlich</label>
+	      <label for="annually">jährlich</label>
 
 	      <br>
 	      <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
@@ -153,16 +163,17 @@
 		<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>In die <a href="#sponsors">Liste der Spender</a> eintragen
-		   (für Spenden ab 20,-)</span>
+		<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="Geben Sie uns Rückmeldung!" rows="3" cols="48"></textarea>
-	    
+	      <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">
@@ -176,13 +187,13 @@
 	      <input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
 	      <input type="hidden" name="p3" value="1">
 	      <input type="hidden" name="src" value="1">
-	      <p> 
+	      <p>
 	      <button class="donateButton" name="submit" alt="Spenden via PayPal"
-		  type="submit">Spenden&Download</button>
+		  type="submit">Spenden & Download</button>
 	      oder <a href="thanks-de.html">kostenlos herunterladen </a>
 	    </form>
-	  </div>  
-	</li>  
+	  </div>
+	</li>
       </ul>
 </div>
 
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index c148784..05605ba 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -6,12 +6,12 @@
       <ul class="tabs">
       <!-- paypal -->
       <li>
-	<p><i>Onetime Donation with</i></p>
+	<p><i>Onetime donation 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 -->		
+	  <!-- 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)">
@@ -23,24 +23,25 @@
 	    <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
 		oninput="amountfield.value=value; bitpayamountfield.value=value; checkAmount(value)">
 	    <br>
-	    
+
 	    <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>List me on the <a href="#sponsors">list of sponsors</a>
-		  (for donations from 20,- up)</span>
+		    <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">
+
 	      <!-- feedback -->
 	      <p>
 	      <input type="hidden" name="on1" value="Feedback">
 	      <input type="hidden" name="os1" value="">
-	      <textarea value=""   name="os1" placeholder="Give us feedback!" rows="3" cols="48"></textarea>
-	    
+	      <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">
@@ -52,12 +53,12 @@
 	      <input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
 	      <input name="return" value="https://gpg4win.org/thanks.html" type="hidden">
 	      <input name="cbt" value="Download Gpg4win now!" type="hidden">
-	      <p> 
+	      <p>
 	      <button class="donateButton" name="submit" alt="Donate via PayPal"
 		  type="submit">Donate & Download</button>
 	      or <a href="thanks.html">download for free </a>
 	    </div>
-	    
+
 	    <!-- download -->
 	    <div id="download_div">
 	      <p>
@@ -65,7 +66,7 @@
 	      </p>
 	    </div>
 	  </form>
-	</div>  
+	</div>
       </li>
     
       <!-- bitcoin -->
@@ -74,6 +75,8 @@
 	<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">
@@ -84,22 +87,27 @@
 	  <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">	
+	  <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> 
+	    <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>
-	  </div>	    
+	  </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 -->
 	<li>
 	  <input id="tab3" type="radio" value="transfer" name="paymethod" >
@@ -114,16 +122,16 @@
 	    </blockquote>
 	    <p>
 	    Please <a href="mailto:gpg4win-professional at intevation.de">contact us</a>
-	    if you need an invoice (for more than 100,- EUR only).
+	    if you need an invoice (for more than 100,- EUR/USD only).
 	    <p>
 	    <a href="thanks.html">Download Gpg4win VERSION</a> after making transfer.
 	    </p>
 	  </div>
 	</li>
-      
+
 	<!-- reccurent donation -->
 	<br>
-	<p><i>Reccurent Donation with</i></p>
+	<p><i>Reccurent donation with</i></p>
 	<li>
 	  <input id="tab4" type="radio" value="paypal" name="paymethod">
 	  <label for="tab4">Paypal</label>
@@ -138,9 +146,9 @@
 		<option value="USD">USD</option>
 	      </select>
 	      <input name="t3" type="radio" value=M id="monthly" checked="checked">
-	      <label for="monthly">Monthly</label>
+	      <label for="monthly">monthly</label>
 	      <input name="t3" type="radio" value=Y id="annually">
-	      <label for="annually">Annually</label>
+	      <label for="annually">annually</label>
 
 	      <br>
 	      <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
@@ -150,19 +158,20 @@
 	      <!-- 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>List me on the <a href="#sponsors">list of sponsors</a>
-		  (for donations from 20,- up)</span>
+            <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">
+
 	      <!-- feedback -->
 	      <p>
 	      <input type="hidden" name="on1" value="Feedback">
 	      <input type="hidden" name="os1" value="">
-	      <textarea value=""   name="os1" placeholder="Give us feedback!" rows="3" cols="48"></textarea>
-	    
+	      <textarea value=""   name="os1" placeholder="I am using Gpg4win because ..." rows="3" cols="48"></textarea>
+
 	      <!-- pay button -->
 	      <input type="hidden" name="lc" value="">
 	      <input name="cmd" value="_xclick-subscriptions" type="hidden">
@@ -176,13 +185,13 @@
 	      <input name="cbt" value="Download Gpg4win now!" type="hidden">
 	      <input type="hidden" name="p3" value="1">
 	      <input type="hidden" name="src" value="1">
-	      <p> 
+	      <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>
-	  </div>  
-	</li>  
+	  </div>
+	</li>
       </ul>
 </div>
 
diff --git a/web/gpg4win.css b/web/gpg4win.css
index 984047f..61dc077 100644
--- a/web/gpg4win.css
+++ b/web/gpg4win.css
@@ -208,7 +208,7 @@ td {
     height: 30px;
 }
 .donateButton {
-    font-size: 13px;
+    font-size: 11px;
     height: 40px;
     border: none;
     background: url('img/download_button_mini.png');

commit 466e9f3971f863d0362cc57f08a201d7e77d7a8f
Author: ikawaguchi at intevation.de <ikawaguchi at intevation.de>
Date:   Thu Sep 22 12:45:31 2016 +0200

    donation form with reccurent donation function

diff --git a/web/SPONSORS-2016 b/web/SPONSORS-2016
index fa10495..d996870 100644
--- a/web/SPONSORS-2016
+++ b/web/SPONSORS-2016
@@ -4,13 +4,33 @@
 </h4>
 <ul class="two-column">
 <li>Klaus Elsbernd</li>
+<li>Christoph Sann</li>
 </ul>
 
 <h4>< 100,- EUR</h4>
 <ul class="three-column">
-<li>Markus Turja</li>
-<li>Andreas Lorenz </li>
-<li>Karl Knauer</li>
-<li>Christopher Focer</li>
-<li>Pascal Schmidheiny</li>
+<li> Christopher Focer </li>
+<li> Markus Turja </li>
+<li> Karl Knauer </li>
+<li> Andreas Lorenz  </li>
+<li> Amira Marjanovic </li>
+<li> Rubin Simons </li>
+<li> Fifth Dimension Digital Ltd </li>
+<li> Philip Geneste </li>
+<li> Andreas Lorenz </li>
+<li> Mike Shirley </li>
+<li> Ulf Schmücker </li>
+<li> Helmut Schreiber </li>
+<li> Max Langbein </li>
+<li> Robert Denlinger </li>
+<li> Alexander Arnold </li>
+<li> JOSE MASSOL </li>
+<li> Timothy Rosaire </li>
+<li> Jochen Teufel </li>
+<li> Imre FULOP </li>
+<li> EDV-Beratung Gerhard Hennig </li>
+<li> Philipp Offermann </li>
+<li> Tomas Ramirez </li>
+<li> gregg killingsworth </li>
+
 </ul>
diff --git a/web/donate-de.htm4 b/web/donate-de.htm4
index b4221d2..e85ae3f 100644
--- a/web/donate-de.htm4
+++ b/web/donate-de.htm4
@@ -56,7 +56,7 @@ Eine Zusammenfassung der bisherigen Spenden finden Sie
     
     Eine Zusammenfassung aller Spenden und die Spender der früheren
     Jahren finden Sie <a href="https://wiki.gnupg.org/Gpg4win/donations">hier</a>.
-    (Zuletzt aktualisiert: 2016/08/01)</p>
+    (Zuletzt aktualisiert: 2016/09/15)</p>
     
     <h3>Spender 2016</h3>
     <div class="sponsornames">
diff --git a/web/donate.htm4 b/web/donate.htm4
index 60e66fa..bf20d01 100644
--- a/web/donate.htm4
+++ b/web/donate.htm4
@@ -54,7 +54,7 @@ A summary of all previous donations you can find
     the Gpg4win initiative and agreed to make their donation(s) public. 
     Donation details and the sponsor lists for previous years are to be found in
     <a href="https://wiki.gnupg.org/Gpg4win/donations">the summary of donation</a>.
-    (Last updated: 2016/08/01)</p>
+    (Last updated: 2016/09/15)</p>
     
     <h3>Sponsors 2016</h3>
     <div class="sponsornames">
diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index d1d2da6..b5606b2 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -2,118 +2,188 @@
 <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>
-    <!-- amount -->
-    <p>
-    <form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-    <input type="number" name="amount" 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>
-    <br>
-    <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
-        oninput="amountfield.value=value; bitpayamountfield.value=value; checkAmount(value)">
-   
-    <div id="pay_div">
-      <ul class="tabs">
 
+      <ul class="tabs">
       <!-- paypal -->
       <li>
-      <input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
-      <label for="tab1">PayPal</label>
-      <div id="paypal_tab" class="tab-content">
-          <hr>
-          <!-- list me -->
-          <img class="pay-logo" src="img/paypal-logo.png">
-          <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>In die <a href="donate.html">Liste der Spender</a> eintragen
-              (für Spenden ab 20,-)</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="Geben Sie uns Rückmeldung!" rows="3" cols="60"></textarea>
-        
-          <!-- pay button -->
-          <input type="hidden" name="lc" value="DE">
-          <input name="cmd" value="_donations" 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-de.html" type="hidden">
-          <input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
-          <p> 
-          <button class="donateButton" name="submit" alt="Spenden via PayPal"
-              type="submit">Spenden & Herunterladen</button>
-          oder <a href="thanks-de.html">kostenlos herunterladen</a>
-          </form>
-      </div>  
+	<p><i>Einmalige 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 -->		
+	  <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)">
+	    <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)">
+	    <br>
+	    
+	    <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>In die <a href="#sponsors">Liste der Spender</a>
+		  (für Spenden ab 20,-)</span>
+	      </label>
+	    
+	      <!-- feedback -->
+	      <p>
+	      <input type="hidden" name="on1" value="Rückmeldung">
+	      <input type="hidden" name="os1" value="">
+	      <textarea value=""   name="os1" placeholder="Geben Sie uns Rückmeldung!" rows="3" cols="48"></textarea>
+	    
+	      <!-- pay button -->
+	      <input type="hidden" name="lc" value="DE">
+	      <input name="cmd" value="_donations" 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.html" type="hidden">
+	      <input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
+	      <p> 
+	      <button class="donateButton" name="submit" alt="Spenden via PayPal"
+		  type="submit">Spenden&Download</button>
+	      oder <a href="thanks.html">kostenlos herunterladen</a>
+	    </div>
+	    
+	    <!-- download -->
+	    <div id="download_div">
+	      <p>
+	      <a href="thanks.html">Gpg4win VERSION herunterladen</a> ohne zu spenden.
+	      </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">
-        <hr>
-        <img class="pay-logo" src="img/bitcoin-logo.png">
-        <p>
-        <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"
+	<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>
+	  <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 & Herunterladen</button>
-          oder <a href="thanks-de.html">kostenlos herunterladen</a>
-        </form>
-      </div>
-      </li>
+	    oder <a href="thanks-de.html">kostenlos herunterladen</a>
+	    </form>
+	  </div>	    
+	</div>
+	</li>
+      
+	<!-- 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>
+	    <blockquote>
+	    Empfänger: Intevation GmbH<br>
+	    IBAN: DE33 2654 0070 0539 2006 00<br>
+	    BIC: COBADEFFXXX (Commerzbank Osnabrück)<br>
+	    Verwendungszweck: "Gpg4win Spende"
+	    </blockquote>
+	    <p>
+	    <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.
+	    </p>
+	  </div>
+	</li>
+      
+	<!-- reccurent donation -->
+	<br>
+	<p><i>Regelmäßige 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; 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">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; bitpayamountfield.value=value; checkAmount(value)">
+	      <br>
     
-      <!-- bank transfer -->
-      <li>
-      <input id="tab3" type="radio" value="transfer" name="paymethod" >
-      <label for="tab1">Überweisung</label>
-      <div id="transfer_tab" class="tab-content">
-        <hr>
-        <b>Spendenkonto:</b>
-        <blockquote>
-        Empfänger: Intevation GmbH<br>
-        IBAN: DE33 2654 0070 0539 2006 00<br>
-        BIC: COBADEFFXXX (Commerzbank Osnabrück)<br>
-        Verwendungszweck: "Gpg4win Spende"
-        </blockquote>
-        <p>
-        <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.
-        </p>
-      </div>
-      </li>
+	      <!-- 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>In die <a href="#sponsors">Liste der Spender</a> eintragen
+		   (für Spenden ab 20,-)</span>
+	      </label>
+	    
+	      <!-- feedback -->
+	      <p>
+	      <input type="hidden" name="on1" value="Rückmeldung">
+	      <input type="hidden" name="os1" value="">
+	      <textarea value=""   name="os1" placeholder="Geben Sie uns Rückmeldung!" 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.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-de.html">kostenlos herunterladen </a>
+	    </form>
+	  </div>  
+	</li>  
       </ul>
-    </div>
-    
-    <!-- download -->
-    <div id="download_div">
-      <p>
-      <a href="thanks-de.html">Gpg4win VERSION herunterladen</a> ohne zu spenden.
-      </p>
-    </div>
-
 </div>
 
 <script type="text/javascript">
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index 221feb7..c148784 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -2,118 +2,188 @@
 <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>
-    <!-- amount -->
-    <p>
-    <form name="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
-    <input type="number" name="amount" 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>
-    <br>
-    <input type="range" value="20" min="0" max="150" step="5" id="amountslider"
-        oninput="amountfield.value=value; bitpayamountfield.value=value; checkAmount(value)">
    
-    <div id="pay_div">
       <ul class="tabs">
-
       <!-- paypal -->
       <li>
-      <input id="tab1" type="radio" value="paypal" name="paymethod" checked="checked">
-      <label for="tab1">PayPal</label>
-      <div id="paypal_tab" class="tab-content">
-          <hr>
-          <!-- list me -->
-          <img class="pay-logo" src="img/paypal-logo.png">
-          <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>List me on the <a href="donate.html">list of sponsors</a>
-              (for donations from 20,- up)</span>
-          </label>
-          <input type="hidden" name="charset" value="utf-8">
-        
-          <!-- feedback -->
-          <p>
-          <input type="hidden" name="on1" value="Feedback">
-          <input type="hidden" name="os1" value="">
-          <textarea value=""   name="os1" placeholder="Give us feedback!" rows="3" cols="60"></textarea>
-        
-          <!-- pay button -->
-          <input type="hidden" name="lc" value="US">
-          <input name="cmd" value="_donations" 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.html" type="hidden">
-          <input name="cbt" value="Download Gpg4win now!" type="hidden">
-          <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>
-      </div>  
+	<p><i>Onetime Donation 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 -->		
+	  <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)">
+	    <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)">
+	    <br>
+	    
+	    <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>List me on the <a href="#sponsors">list of sponsors</a>
+		  (for donations from 20,- up)</span>
+	      </label>
+	    
+	      <!-- feedback -->
+	      <p>
+	      <input type="hidden" name="on1" value="Feedback">
+	      <input type="hidden" name="os1" value="">
+	      <textarea value=""   name="os1" placeholder="Give us feedback!" rows="3" cols="48"></textarea>
+	    
+	      <!-- pay button -->
+	      <input type="hidden" name="lc" value="US">
+	      <input name="cmd" value="_donations" 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.html" type="hidden">
+	      <input name="cbt" value="Download Gpg4win now!" type="hidden">
+	      <p> 
+	      <button class="donateButton" name="submit" alt="Donate via PayPal"
+		  type="submit">Donate & Download</button>
+	      or <a href="thanks.html">download for free </a>
+	    </div>
+	    
+	    <!-- download -->
+	    <div id="download_div">
+	      <p>
+	      <a href="thanks.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">
-        <hr>
-        <img class="pay-logo" src="img/bitcoin-logo.png">
-        <p>
-        <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="Donate via bitpay"
-              type="submit">Donate & Download</button>
-          or <a href="thanks.html">download for free </a>
-        </form>
-      </div>
-      </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>
+	  <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="Donate via PayPal"
+		type="submit">Donate & Download</button>
+		or <a href="thanks.html">download for free </a>
+	    </form>
+	  </div>	    
+	</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 only).
+	    <p>
+	    <a href="thanks.html">Download Gpg4win VERSION</a> after making transfer.
+	    </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>
     
-      <!-- bank transfer -->
-      <li>
-      <input id="tab3" type="radio" value="transfer" name="paymethod" >
-      <label for="tab1">Bank transfer</label>
-      <div id="transfer_tab" class="tab-content">
-        <hr>
-        <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 only).
-        <p>
-        <a href="thanks.html">Download Gpg4win VERSION</a> after making transfer.
-        </p>
-      </div>
-      </li>
+	      <!-- 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>List me on the <a href="#sponsors">list of sponsors</a>
+		  (for donations from 20,- up)</span>
+	      </label>
+	    
+	      <!-- feedback -->
+	      <p>
+	      <input type="hidden" name="on1" value="Feedback">
+	      <input type="hidden" name="os1" value="">
+	      <textarea value=""   name="os1" placeholder="Give us feedback!" rows="3" cols="48"></textarea>
+	    
+	      <!-- 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.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.html">download for free </a>
+	    </form>
+	  </div>  
+	</li>  
       </ul>
-    </div>
-    
-    <!-- download -->
-    <div id="download_div">
-      <p>
-      <a href="thanks.html">Download Gpg4win VERSION</a> without donation.
-      </p>
-    </div>
-
 </div>
 
 <script type="text/javascript">
diff --git a/web/get-gpg4win-de.htm4 b/web/get-gpg4win-de.htm4
index 7783d52..06bf3fd 100644
--- a/web/get-gpg4win-de.htm4
+++ b/web/get-gpg4win-de.htm4
@@ -8,6 +8,7 @@ m4_define(`EN_FILE', `get-gpg4win.html')
 m4_define(`TITLE', `Download Gpg4win')
 m4_define(`MAIN', `download')
 
+m4_define(`NO_DOWNLOAD_HEADER')
 PAGE_START
 
 <div id="intro">
diff --git a/web/get-gpg4win.htm4 b/web/get-gpg4win.htm4
index f68acc4..9636b69 100644
--- a/web/get-gpg4win.htm4
+++ b/web/get-gpg4win.htm4
@@ -8,6 +8,7 @@ m4_define(`DE_FILE', `get-gpg4win-de.html')
 m4_define(`TITLE', `Get Gpg4win')
 m4_define(`MAIN', `download')
 
+m4_define(`NO_DOWNLOAD_HEADER')
 PAGE_START
 
 
diff --git a/web/gpg4win.css b/web/gpg4win.css
index 2508bea..984047f 100644
--- a/web/gpg4win.css
+++ b/web/gpg4win.css
@@ -194,7 +194,7 @@ td {
   background: #FDF1CD;
   border: 1px solid #CCCCCC;
   padding: 20px 20px 15px;
-  min-height: 350px;
+  min-height: 335px;
 }
 .donate_box h3 {
   margin: 0;
@@ -203,27 +203,36 @@ td {
   margin-top: 15px;
 }
 
-#amountfield {
-    font-size: 14px;
-    padding-left: 10px;
-    height: 16px;
-    width: 125px;
-    margin-bottom: 5px;
-}
 #currencyfield {
     font-size: 14px;
-    height: 24px;
+    height: 30px;
 }
 .donateButton {
-    height: 24px;
-    font-size: 14px;
+    font-size: 13px;
+    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;
+}
+.donateButton:hover {
+   background-position: 0px -50px;
 }
+
 .donate_box blockquote {
     line-height: 150%;
 }
 .donate_box .pay-logo {
     width: 100px;
-    margin-bottom: 5px;
+}
+#tab4 > label{
+	font-weiht: bold;
 }
 /* donation slider */
 input[type='range'] {
@@ -749,50 +758,52 @@ hr {
 	list-style: none;
 	width: 100%;
 	float: left;
+	height: 270px;
 	padding-left: 0;
 	position: relative;
 }
-.tabs li{
-	display: block;	
-	float: left;
-	padding-right: 5px;
+.tabs li label[for^=tab]{
+	clear: right;
+	margin-right: 10px	 !important;
+	background-color: transparent;
+	border: none;
+	border-radius: 4px;
+	width: 120px;
+	text-align: center;
 }
 .tabs .tab-content{
 	display: none;
 	position: absolute;
 	overflow: hidden;
-	left: 0;
-	width: 100%;
+	right: 0;
+	top: 0;
+	width: 68%;
+	height: 100%;
+	border-left: 1px dotted #ccc;
+	padding-left: 20px;
 }
 .tabs [id^="tab"]:checked ~ [id$="_tab"]{
 	display: block;
 }
+.download_div{
+	display:none;
+}
 
-.tabs [id^="tab"]:checked ~ [id$="_spender"]{
-	margin-top: 5px;
-	display: block;
-	background-color: #eee;
+textarea, select, input[type=text]{
+	box-sizing: border-box;
+	box-shadow: inset 0 1px 2px #ddd;
+	border: 1px solid #bbb;
+	border-radius: 4px;
 	padding: 5px;
 }
-[id$="spender"].tab-content p{
-	margin: 0px 15px 30px 15px  !important;
-}
-#sponsors input[type="radio"]{
-	display: none;
-}
-#sponsors label{
-	padding: 15px;
-	background-color: #ddd;
-	vertical-align: top;
-}
-#sponsors label:hover{
-	background-color: #ccc;
+input[type=text]{
+	height: 31px;
 }
-#sponsors input[type="radio"]:checked + label{
-	background-color: #eee;
+input[type=text]:focus{
+	border: 1px solid #888;
 }
-#download_div{
-	display:none;
+select{
+	background-color: #fff;
 }
 
 /* donation list */

-----------------------------------------------------------------------

Summary of changes:
 web/SPONSORS-2016         |  30 ++++-
 web/donate-de.htm4        |   2 +-
 web/donate.htm4           |   2 +-
 web/donation-form-de.htm4 | 287 +++++++++++++++++++++++++++++-----------------
 web/donation-form.htm4    | 281 +++++++++++++++++++++++++++++----------------
 web/get-gpg4win-de.htm4   |   1 +
 web/get-gpg4win.htm4      |   1 +
 web/gpg4win.css           |  89 +++++++-------
 8 files changed, 443 insertions(+), 250 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org




More information about the Gpg4win-commits mailing list