[git] gnupg-doc - branch, preview, updated. c6d1f08fdaf0989affa6fe3120699a9ee481ed18
by Werner Koch
cvs at cvs.gnupg.org
Tue May 23 09:54:26 CEST 2017
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 "The GnuPG website and other docs".
The branch, preview has been updated
via c6d1f08fdaf0989affa6fe3120699a9ee481ed18 (commit)
via 6890053490d245037899d72d9587480c0eb1de84 (commit)
from d69524d3ae9a1b4bb1623a07fd1e320ebc944ecd (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 c6d1f08fdaf0989affa6fe3120699a9ee481ed18
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 23 09:50:14 2017 +0200
campaign: Add a note panel and adjust preset 12-5 donations.
This covers the most common case of the "Donate 5 Euro" button.
diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index d5a7bfc..21e4df1 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -47,6 +47,7 @@ my $mail = "";
my $message = "";
my $separef = "";
my $errorstr = "";
+my $notepanel = "";
# We use a dictionary to track error. Those errors will then be
# inserted into the output by write_template.
@@ -279,10 +280,13 @@ sub write_template ($) {
$errorpanel = $errorpanel . $fieldname . $errdict{$_} . "<br/>\n"
}
- if ( $errorpanel ne '' )
- {
+ if ( $errorpanel ne '' ) {
$errorpanel =
"<div style='color: red;'><p>\n" . $errorpanel . "</p></div>\n";
+ } elsif ( $notepanel ne '' ) {
+ $errorpanel =
+ "<div style='color: grey;'><p>\n" . $notepanel . "</p></div>\n";
+ $notepanel = '';
}
@@ -1033,8 +1037,10 @@ elsif ($mode eq 'preset') {
$paytype = 'cc';
# First dedicated payment plans.
if ($q->param('plan') eq '12-5-eur' ) {
- $recur = '12';
- $amount = '5';
+ $recur = '4';
+ $amount = '15';
+ $notepanel = 'Note: To avoid overhead costs we adjusted your donation '
+ . 'from monthly to the equal quarterly amount';
}
elsif ($q->param('plan') eq '12-10-eur' ) {
$recur = '12';
commit 6890053490d245037899d72d9587480c0eb1de84
Author: Werner Koch <wk at gnupg.org>
Date: Tue May 23 09:49:32 2017 +0200
cgi: Let the checkout pages always pass a "lang" attribute.
diff --git a/web/donate/checkout-cc.de.org b/web/donate/checkout-cc.de.org
index f58d70d..27bd13b 100644
--- a/web/donate/checkout-cc.de.org
+++ b/web/donate/checkout-cc.de.org
@@ -121,6 +121,7 @@
class="form-inline">
<input type="hidden" name="mode" value="checkout-stripe" />
<input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<script
src="https://checkout.stripe.com/checkout.js"
class="stripe-button"
diff --git a/web/donate/checkout-cc.fr.org b/web/donate/checkout-cc.fr.org
index 43d2db0..09a5d29 100644
--- a/web/donate/checkout-cc.fr.org
+++ b/web/donate/checkout-cc.fr.org
@@ -59,7 +59,11 @@
<div class="form-group">
<label class="col-sm-3 control-label">Montant</label>
<div class="col-sm-9">
- <p class="form-control-static"><!--AMOUNT--> <!--CURRENCY--> <!--RECUR_TEXT--></p>
+ <p class="form-control-static">
+ <!--AMOUNT-->
+ <!--CURRENCY-->
+ <!--RECUR_TEXT-->
+ </p>
</div>
</div>
<div class="form-group">
@@ -111,9 +115,11 @@
<div class="row">
<div class="col-sm-5 col-md-offset-2">
<p>
- <form action="/cgi-bin/procdonate.cgi" method="POST" class="form-inline">
- <input type="hidden" name="mode" value="checkout-stripe">
- <input type="hidden" name="sessid" value="<!--SESSID-->">
+ <form action="/cgi-bin/procdonate.cgi" method="POST"
+ class="form-inline">
+ <input type="hidden" name="mode" value="checkout-stripe" />
+ <input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<script
src="https://checkout.stripe.com/checkout.js"
class="stripe-button"
@@ -132,7 +138,8 @@
</form>
</p>
<p>
- <form action="/cgi-bin/procdonate.cgi" method="POST" class="form-inline">
+ <form action="/cgi-bin/procdonate.cgi" method="POST"
+ class="form-inline">
<input type="hidden" name="mode" value="re-main">
<input type="hidden" name="sessid" value="<!--SESSID-->">
<input type="hidden" name="lang" value="<!--LANG-->">
diff --git a/web/donate/checkout-cc.ja.org b/web/donate/checkout-cc.ja.org
index 01c0446..8321bbd 100644
--- a/web/donate/checkout-cc.ja.org
+++ b/web/donate/checkout-cc.ja.org
@@ -112,6 +112,7 @@
class="form-inline">
<input type="hidden" name="mode" value="checkout-stripe" />
<input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<script
src="https://checkout.stripe.com/checkout.js"
class="stripe-button"
@@ -132,9 +133,9 @@
<p>
<form action="/cgi-bin/procdonate.cgi" method="POST"
class="form-inline">
- <input type="hidden" name="mode" value="re-main">
- <input type="hidden" name="sessid" value="<!--SESSID-->">
- <input type="hidden" name="lang" value="<!--LANG-->">
+ <input type="hidden" name="mode" value="re-main" />
+ <input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<input type="submit" class="btn btn-default btn-sm"
value="戻る" />
</form>
diff --git a/web/donate/checkout-pp.de.org b/web/donate/checkout-pp.de.org
index 7f6ce9c..23f8560 100644
--- a/web/donate/checkout-pp.de.org
+++ b/web/donate/checkout-pp.de.org
@@ -102,6 +102,7 @@
class="form-inline">
<input type="hidden" name="mode" value="checkout-paypal" />
<input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<input type="submit" class="btn btn-primary btn-sm"
value="Jetzt bezahlen" />
</form>
diff --git a/web/donate/checkout-pp.fr.org b/web/donate/checkout-pp.fr.org
index eac368c..b80bbc7 100644
--- a/web/donate/checkout-pp.fr.org
+++ b/web/donate/checkout-pp.fr.org
@@ -59,7 +59,11 @@
<div class="form-group">
<label class="col-sm-3 control-label">Montant</label>
<div class="col-sm-9">
- <p class="form-control-static"><!--AMOUNT--> <!--CURRENCY--></p>
+ <p class="form-control-static">
+ <!--AMOUNT-->
+ <!--CURRENCY-->
+ <!--RECUR_TEXT-->
+ </p>
</div>
</div>
<div class="form-group">
@@ -96,6 +100,7 @@
<form action="/cgi-bin/procdonate.cgi" method="POST" class="form-inline">
<input type="hidden" name="mode" value="checkout-paypal" />
<input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<input type="submit" class="btn btn-primary btn-sm" value="Payer" />
</form>
</p>
diff --git a/web/donate/checkout-pp.ja.org b/web/donate/checkout-pp.ja.org
index a88b59d..b005c72 100644
--- a/web/donate/checkout-pp.ja.org
+++ b/web/donate/checkout-pp.ja.org
@@ -59,7 +59,11 @@
<div class="form-group">
<label class="col-sm-3 control-label">金額</label>
<div class="col-sm-9">
- <p class="form-control-static"><!--AMOUNT--> <!--CURRENCY--></p>
+ <p class="form-control-static">
+ <!--AMOUNT-->
+ <!--CURRENCY-->
+ <!--RECUR_TEXT-->
+ </p>
</div>
</div>
<div class="form-group">
@@ -94,6 +98,7 @@
<form action="/cgi-bin/procdonate.cgi" method="POST" class="form-inline">
<input type="hidden" name="mode" value="checkout-paypal" />
<input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<input type="submit" class="btn btn-primary btn-sm" value="支払う" />
</form>
</p>
diff --git a/web/donate/checkout-pp.org b/web/donate/checkout-pp.org
index 54357b4..bcbc56f 100644
--- a/web/donate/checkout-pp.org
+++ b/web/donate/checkout-pp.org
@@ -101,6 +101,7 @@
class="form-inline">
<input type="hidden" name="mode" value="checkout-paypal" />
<input type="hidden" name="sessid" value="<!--SESSID-->" />
+ <input type="hidden" name="lang" value="<!--LANG-->" />
<input type="submit" class="btn btn-primary btn-sm"
value="Pay now" />
</form>
-----------------------------------------------------------------------
Summary of changes:
cgi/procdonate.cgi | 14 ++++++++++----
web/donate/checkout-cc.de.org | 1 +
web/donate/checkout-cc.fr.org | 17 ++++++++++++-----
web/donate/checkout-cc.ja.org | 7 ++++---
web/donate/checkout-pp.de.org | 1 +
web/donate/checkout-pp.fr.org | 7 ++++++-
web/donate/checkout-pp.ja.org | 7 ++++++-
web/donate/checkout-pp.org | 1 +
8 files changed, 41 insertions(+), 14 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list