Updated donation box.
authorEmanuel Schuetze <emanuel.schuetze@intevation.de>
Fri, 7 May 2010 09:47:29 +0000 (09:47 +0000)
committerEmanuel Schuetze <emanuel.schuetze@intevation.de>
Fri, 7 May 2010 09:47:29 +0000 (09:47 +0000)
doc/ChangeLog
doc/website/template_link_boxes_de.m4
doc/website/template_link_boxes_en.m4

index 5411b28..c6a9337 100644 (file)
@@ -1,5 +1,8 @@
 2010-05-07  Emanuel Schuetze  <emanuel.schuetze@intevation.de>
        
+       * website/template_link_boxes_de.m4, website/template_link_boxes_en.m4:
+       Update sponsoring box (changed donation button etc).
+
        * manual/gpg4win-compendium-de.tex: Minor changes by external
        lector (part 1).
 
index 3e93934..2ed36b9 100644 (file)
@@ -18,34 +18,27 @@ m4_dnl DONT USE THIS FILE DIRECTLY
   LINK(`impressum-de.html', `Impressum')
 </div>
 <div class="box">
-  <h1>Sponsoring</h1>
-
-  <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-    <input type="hidden" name="cmd" value="_xclick">
+  <h1>Sonstiges</h1>
+   LINK(`Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html', `Kurzstudie: "Nachhaltige Freie Software: Vom Projekt zur Dauertätigkeit am Beispiel Gpg4win"')
+</div>
+<div align="center">
+  <p/>
+  <b>Unterstützen Sie Gpg4win und spenden Sie jetzt:</b><br>
+  <form action="https://www.paypal.com/de/cgi-bin/webscr" method="post">
+    <input type="hidden" name="cmd" value="_donations">
     <input type="hidden" name="business" value="paypal@intevation.de">
     <input type="hidden" name="undefined_quantity" value="1">
     <input type="hidden" name="item_name" value="Gpg4win">
-    <input type="hidden" name="item_number" value="1000">
     <input type="hidden" name="no_shipping" value="1">
-    <input type="hidden" name="cn" value="Kommentar (Lob/Kritik)">
+    <input type="hidden" name="cn" value="Kommentar an das Gpg4win-Entwicklerteam (Lob/Kritik)">
     <input type="hidden" name="currency_code" value="EUR">
     <input type="hidden" name="bn" value="PP-BuyNowBF">
-
-    <input type="image" src="https://www.paypal.com/de_DE/i/btn/x-click-but02.gif"
-      border="0" name="submit" alt="Zahlen mit PayPal">
-
-    <p>
-    <input type="hidden" name="on0" value="Öffentliches Nennen des
-      Sponsorings erlaubt?">Öffentliches Nennen des Sponsorings erlaubt?
+    <input type="image" src="https://www.paypal.com/de_DE/DE/i/btn/btn_donate_LG.gif"
+      border="0" name="submit" alt="Jetzt einfach, schnell und sicher online spenden - mit PayPal.">
+    <input type="hidden" name="on0" value="Veröffentlichung der Spende zugestimmt?">
+    <input type="hidden" name="os0" value="Nein">
     <br/>
-    <input type="radio" name="os0" value="Ja">Ja&nbsp;<input
-      type="radio" name="os0" value="Nein" checked>Nein
-    </p>
+    <input type="checkbox" name="os0" value="Ja" checked>Spende veröffentlichen
   </form>
-  </p>
-</div>
-<div class="box">
-  <h1>Sonstiges</h1>
-   LINK(`Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html', `Kurzstudie: "Nachhaltige Freie Software: Vom Projekt zur Dauertätigkeit am Beispiel Gpg4win')
 </div>
 </div>
index 22c27f0..b8c2b0e 100644 (file)
@@ -18,37 +18,28 @@ m4_dnl DONT USE THIS FILE DIRECTLY
   LINK(`impressum.html', `Impressum')
 </div>
 <div class="box">
-  <h1>Sponsorship</h1>
-
+  <h1>Miscellaneous</h1>
+  LINK(`ShortStudy-Sustainable-FS-example-Gpg4win.html', `Short Study: "Sustainable Free Software: 
+    From project to permanent activity, using the example Gpg4win"')
+</div>
+<div align="center">
+  <p/>
+  <b>Please support Gpg4win and<br> make your donation now:</b><br>
   <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-    <input type="hidden" name="cmd" value="_xclick">
-    <input type="hidden" name="business" value="paypal@intevation.net">
+    <input type="hidden" name="cmd" value="_donations">
+    <input type="hidden" name="business" value="paypal@intevation.de">
     <input type="hidden" name="undefined_quantity" value="1">
     <input type="hidden" name="item_name" value="Gpg4win">
-    <input type="hidden" name="item_number" value="1000">
     <input type="hidden" name="no_shipping" value="1">
-    <input type="hidden" name="cn" value="Comment (praise/criticism)">
+    <input type="hidden" name="cn" value="Comment to Gpg4win developer team (praise/criticism)">
     <input type="hidden" name="currency_code" value="EUR">
     <input type="hidden" name="bn" value="PP-BuyNowBF">
-
-    <input type="image" src="http://images.paypal.com/images/x-click-but02.gif"
+    <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif"
       border="0" name="submit" alt="Pay with PayPal">
-
-    <p>
-    <input type="hidden" name="on0" value="Allowed to publish
-      your sponsorship?">
-    Allowed to publish your sponsorship?
+    <input type="hidden" name="on0" value="Allowed to publish of your donation?">
+    <input type="hidden" name="os0" value="No">
     <br/>
-    <input type="radio" name="os0" value="Yes">Yes&nbsp;<input
-       type="radio" name="os0" value="No" checked>No
-    </p>
+    <input type="checkbox" name="os0" value="Yes" checked>Publish my donation
   </form>
-
-  </p>
-</div>
-<div class="box">
-  <h1>Miscellaneous</h1>
-  LINK(`ShortStudy-Sustainable-FS-example-Gpg4win.html', `Short Study: "Sustainable Free Software: 
-    From project to permanent activity, using the example Gpg4win')
 </div>
 </div>