[git] gnupg-doc - branch, master, updated. ba19d489c45a28d8e143ac88fbf4a6d7fdc60c3a
by Werner Koch
cvs at cvs.gnupg.org
Wed May 28 21:01:24 CEST 2014
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, master has been updated
via ba19d489c45a28d8e143ac88fbf4a6d7fdc60c3a (commit)
from b6c22ab23614a00d4ace21290c219aa6c4ff487a (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 ba19d489c45a28d8e143ac88fbf4a6d7fdc60c3a
Author: Werner Koch <wk at gnupg.org>
Date: Wed May 28 15:07:15 2014 +0200
web: More updates to the donation pages.
diff --git a/tools/append-to-donors.sh b/tools/append-to-donors.sh
index 6b4d798..58efff1 100755
--- a/tools/append-to-donors.sh
+++ b/tools/append-to-donors.sh
@@ -4,7 +4,7 @@
pgm="append-to-donors.sh"
set -e
-
+PATH="/usr/local/bin:$PATH"
htdocs="/var/www/www/www.gnupg.org/htdocs"
diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index 111c192..f3625e0 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -2,8 +2,8 @@
set -e
-#htdocs="/var/www/www/www.gnupg.org/htdocs"
-htdocs="/home/wk/s/gnupg-doc/web"
+htdocs="/var/www/www/www.gnupg.org/htdocs"
+#htdocs="/home/wk/s/gnupg-doc/web"
donors="$htdocs/donate/donors.dat"
@@ -12,10 +12,14 @@ if [ ! -f "$donors" ]; then
exit 1
fi
-for file in "$htdocs/donate/"kudos-????.html; do
+for file in "$htdocs/donate/"kudos-????.html "$htdocs/donate/"kudos.html; do
[ "$file" -ot "$donors" ] || continue
- year=${file#$htdocs/donate/kudos-}
- year=${year%.html}
+ if [ "$file" = "$htdocs/donate/"kudos.html ]; then
+ year=$(date +%Y)
+ else
+ year=${file#$htdocs/donate/kudos-}
+ year=${year%.html}
+ fi
echo "processing $file" >&2
[ -f "$file.tmp" ] && rm "$file.tmp"
awk -F: -v year=$year -v donors="$donors" <"$file" >"$file.tmp" '
diff --git a/web/donate/checkout.org b/web/donate/checkout.org
index 9c5bab8..8f09b9d 100644
--- a/web/donate/checkout.org
+++ b/web/donate/checkout.org
@@ -51,28 +51,33 @@
</p>
#+END_HTML
+ - Donate with Bitcoins
- - Donate using a Paypal account
+#+HTML: <p id="smallnote">Coming soon</p>
-#+HTML: <p id="smallnote">Coming soon (not yet available)</p>
+ - Donate using a Paypal account
+
+#+BEGIN_HTML
+ <p id="smallnote">Use this only if you have a Paypal account.</p>
+ <p id="smallnote">(Until we have finished the restructuring
+ of this payment option, you are unfortunately required to
+ re-enter some of the already given data.)</p>
+ <p>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="GFTRVNVZVGUJW">
+ <input type="image" src="https://gnupg.org/share/btn-donate.png"
+ border="0" name="submit" alt="Donate using PayPal"
+ title="Donate using PayPal">
+ </form>
+ </p>
+#+END_HTML
-# #+BEGIN_HTML
-# <p>
-# <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-# <input type="hidden" name="cmd" value="_s-xclick">
-# <input type="hidden" name="hosted_button_id" value="X6PJPV43S58CW">
-# <input type="image" src="https://gnupg.org/share/btn-donate.png"
-# border="0" name="submit" alt="Donate using PayPal"
-# title="Donate using PayPal">
-# </form>
-# </p>
-# #+END_HTML
-#
- Donate using a SEPA bank transfer
-#+HTML: <p id="smallnote">Coming soon (not yet available)</p>
+#+HTML: <p id="smallnote">Coming soon</p>
# #+BEGIN_HTML
# <p id="smallnote">
diff --git a/web/donate/donate-thanks.org b/web/donate/donate-thanks.org
index aaea16d..988ae21 100644
--- a/web/donate/donate-thanks.org
+++ b/web/donate/donate-thanks.org
@@ -6,9 +6,9 @@
*Thank you very much for your donation to our work on GnuPG.*
- We will update the [[file:kudos.org][list of donors]] once a week, thus you won’t see
- your name immediately. If you did not give a name you won’t be
- listed at all.
+ Note that the [[file:kudos.org][list of donors]] is only updated every 30 minutes, thus
+ have some patience until you see your name. If you did not give a
+ name you won’t be listed at all.
Here is our transaction data of your payment:
#+BEGIN_HTML
@@ -23,5 +23,7 @@
#+BEGIN_HTML
- <p><a href="/index.html">Continue</a>
+ <ul>
+ <li><a href="/index.html">Continue</a></li>
+ </ul>
#+END_HTML
diff --git a/web/donate/index.org b/web/donate/index.org
index 740d71d..23e65f7 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -4,29 +4,33 @@
* Donate
- Maintaining and improving GnuPG is costly. For more than 10 years
- now, [[https://g10code.com][g10^code]] GmbH, a company owned and headed by GnuPG's
- principal author Werner Koch, is bearing the majority of these
- costs. To help them carry on this work, they need your support.
+ Maintaining and improving GnuPG is costly. For more than a decade,
+ [[https://g10code.com][g10^code]] GmbH, a company owned and headed by GnuPG's principal
+ author Werner Koch, is bearing the majority of these costs. To help
+ them carry on this work, they need your support.
+
+ If you are using [[http://gnupg.org][GnuPG]], [[http://directory.fsf.org/project/libgcrypt/][Libgcrypt]], [[http://gnupg.org/related_software/gpgme/][GPGME]], or [[https://www.gpg4win.org][Gpg4win]] and would like
+ to help with development and maintenance please consider to make a
+ donation.
** Ways to donate
- Paying using a credit card is currently our preferred choice. [[https://en.wikipedia.org/wiki/Single_Euro_Payments_Area][SEPA]]
- payments are acceptable but we have not yet automated this process.
- If you have a Paypal account you may use that too.
+ Paying using a credit card is currently our preferred choice. [[https://en.wikipedia.org/wiki/Single_Euro_Payments_Area][SEPA]]
+ payments will soon be acceptable but we have not yet automated this
+ process. If you have a Paypal account you may use that too.
- Because the GnuPG projects is not tax exempted, we are not able to
- send you a respective donation receipt. If you are company,
- [[https://g10code.com][g10^code]] can sell you a support contract for GnuPG or provide other
- kind of paid services.
+ Because the GnuPG project is not tax exempted, we are not able to
+ send you a respective donation receipt. However, if you represent a
+ company, you may want to enter into a support contract with [[https://g10code.com][g10^code]]
+ or ask for other service options.
** Donation form
To process your donation we need to collect some information. This
- information is only used for the purpose of the donation and not
- send to any other entity not directly involved in the donation
- process. Not giving a name makes the donation “anonymous” in that
- the name won’t be listed on the public thank you page.
+ information is only used for the purpose of the donation and no data
+ will ever be send to any entity not directly involved in the
+ donation process. Not giving a name makes the donation “anonymous”
+ in that the name won’t be listed on the public thank you page.
#+BEGIN_HTML
<!--ERRORPANEL-->
@@ -38,7 +42,8 @@
<table border="0" cellpadding="0" cellspacing="4">
<tr>
<td></td>
- <td>How much do you want to donate?</td>
+ <td>How much do you want to donate?
+ (choosing “other” allows to donate in other currencies)</td>
</tr>
<tr>
<td align="right">Amount:</td>
@@ -78,14 +83,14 @@
<td align="right">Name:</td>
<td>
<input type="text" size="40" style="width:200px" name="name"
- value=""/><!--NAME-->
+ value=""/><!--NAME--> (optional)
<!--ERR_NAME-->
</td>
</tr>
<tr>
<td></td>
<td>
- In case of payment problems we may want to contact you, please
+ In case of payment problems we may want to contact you, thus please
enter your mail address.
</td>
</tr>
diff --git a/web/donate/kudos-2012.org b/web/donate/kudos-2012.org
index 6d4da77..6b30a87 100644
--- a/web/donate/kudos-2012.org
+++ b/web/donate/kudos-2012.org
@@ -10,3 +10,7 @@
#+HTML: </ul>
Thank you.
+
+#+HTML: <div class="logobox">
+ [[http://eof.eu.org][file:logos/eof.eu.org-logo.png]]
+#+HTML: </div>
diff --git a/web/donate/kudos-2013.org b/web/donate/kudos-2013.org
index 2197246..0365da6 100644
--- a/web/donate/kudos-2013.org
+++ b/web/donate/kudos-2013.org
@@ -10,3 +10,7 @@
#+HTML: </ul>
Thank you.
+
+#+HTML: <div class="logobox">
+ [[https://www.wauland.de][file:logos/whs-logo.png]]
+#+HTML: </div>
diff --git a/web/donate/kudos-2014.org b/web/donate/kudos-2014.org
index 277af99..9ccf628 100644
--- a/web/donate/kudos-2014.org
+++ b/web/donate/kudos-2014.org
@@ -11,7 +11,7 @@
Thank you.
-* Participants of crowdfunding campaign
+* Participants of the crowdfunding campaign
On December 19, 2013 we launched a crowdfunding campaign at the
[[Goteo.org]] site to raise money for a updating the GnuPG
diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index 354b85a..1f1c103 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -4,7 +4,48 @@
* List of Donors
- - Donors to GnuPG in [[file:kudos-2014.org][2014]]
- - Donors to GnuPG in [[file:kudos-2013.org][2013]]
- - Donors to GnuPG in [[file:kudos-2012.org][2012]]
- - Donors to GnuPG in [[file:kudos-2011.org][2011]]
+#+HTML: <div id="tagcloudlist"><ul>
+#+HTML: <!--BEGIN-DONATIONS-->
+#+HTML: <!--END-DONATIONS-->
+#+HTML: <li><a href="/donate/index.html">your name</a></li>
+#+HTML: </ul><p> </p></div>
+
+ Thank you.
+
+ - All donors to GnuPG in [[file:kudos-2014.org][2014]]
+ - All donors to GnuPG in [[file:kudos-2013.org][2013]]
+ - All donors to GnuPG in [[file:kudos-2012.org][2012]]
+ - All donors to GnuPG in [[file:kudos-2011.org][2011]]
+
+#+HTML: <div class="logobox">
+ [[http://eof.eu.org][file:logos/eof.eu.org-logo.png]]
+ [[https://www.wauland.de][file:logos/whs-logo.png]]
+#+HTML: </div>
+
+** Donation summary
+
+| Year | # | \EUR | net \EUR |
+| | <r> | <r> | <r> |
+|------+-----+-------+----------|
+| 2011 | 21 | 553 | 465 |
+| 2012 | 53 | 5991 | 4963 |
+| 2013 | 148 | 5041 | 4145 |
+| 2014 | 50 | 3244 | |
+|------+-----+-------+----------|
+| | 272 | 14829 | 9573 |
+#+TBLFM: $LR2=vsum(@I.. at II)::$LR3=vsum(@I.. at II)::$LR4=vsum(@I.. at II)
+
+#+HTML: <div id="smallnote">
+The "net" column gives the actual value without VAT and PayPal fees.\\
+Last update: 2014-05-26
+#+HTML: </div>
+
+* Hardware and service donations
+
+ We have to thank [[https://www.openit.de][OpenIT]] for their long time support of GnuPG. They
+ provide rack space, connectivity, and are fast in fixing problems
+ with the machines.
+
+#+HTML: <div class="logobox">
+ [[https://www.openit.de][file:../share/logo-sponsor.png]]
+#+HTML: </div>
diff --git a/web/donate/logos/eof.eu.org-logo.png b/web/donate/logos/eof.eu.org-logo.png
new file mode 100644
index 0000000..2f2dff9
Binary files /dev/null and b/web/donate/logos/eof.eu.org-logo.png differ
diff --git a/web/donate/logos/whs-logo.png b/web/donate/logos/whs-logo.png
new file mode 100644
index 0000000..de113df
Binary files /dev/null and b/web/donate/logos/whs-logo.png differ
diff --git a/web/donate/paypal-can.org b/web/donate/paypal-can.org
new file mode 100644
index 0000000..b73a9fc
--- /dev/null
+++ b/web/donate/paypal-can.org
@@ -0,0 +1,14 @@
+#+TITLE: GnuPG - Donate - Canceled
+#+STARTUP: showall
+#+SETUPFILE: "../share/setup.inc"
+
+* Donate - Canceled
+
+ *You canceled the donation process*
+
+#+BEGIN_HTML
+ <ul>
+ <li><a href="/donate/index.html">Back to the donation page</a></li>
+ <li><a href="/index.html">Home</a></li>
+ </ul>
+#+END_HTML
diff --git a/web/donate/paypal-thx.org b/web/donate/paypal-thx.org
new file mode 100644
index 0000000..4dcbab6
--- /dev/null
+++ b/web/donate/paypal-thx.org
@@ -0,0 +1,15 @@
+#+TITLE: GnuPG - Donate - Thank you
+#+STARTUP: showall
+#+SETUPFILE: "../share/setup.inc"
+
+* Donate - Thank you
+
+ *Thank you very much for your donation to our work on GnuPG.*
+
+ We will update the [[file:kudos.org][list of donors]] about once a week, thus you won’t see
+ your name immediately. If you did not give a name you won’t be
+ listed at all.
+
+#+BEGIN_HTML
+ <p><a href="/index.html">Continue</a></p>
+#+END_HTML
diff --git a/web/download/index.org b/web/download/index.org
index bd441a6..92f40da 100644
--- a/web/download/index.org
+++ b/web/download/index.org
@@ -14,7 +14,7 @@
the *gnupg* directory; to locate a /binary package/ (indicated by a
`B') follow the link to the *binary*.
- [[../misc/donations.org][file:../share/btn-donate.png]]
+ [[../donate/index.org][file:../share/btn-donate.png]]
The table below provides links to the location of the files on the
primary server only.
diff --git a/web/index.org b/web/index.org
index 020e0af..d42c997 100644
--- a/web/index.org
+++ b/web/index.org
@@ -34,6 +34,13 @@ integrated into an installer and features all required tools.
Project [[https://www.gnupg.org/aegypten/][Aegypten]] developed the S/MIME functionality in GnuPG 2.
+#+BEGIN_HTML
+ <p id="smallnote">This site is currently undergoing a complete redesign.
+ We apologize for any inconveniences like broken links
+ or bad formatting. Please do not report such problems as we are probably
+ already aware of them. (2014-05-28 wk)</p>
+#+END_HTML
+
* Latest news
#+index: News
diff --git a/web/misc/donations.org b/web/misc/donations.org
index 00c66cc..d1a6fde 100644
--- a/web/misc/donations.org
+++ b/web/misc/donations.org
@@ -9,5 +9,7 @@
principal author Werner Koch, is bearing the majority of these
costs. To help them carry on this work, they need your support.
- Please consider to visit the [[http://g10code.com/gnupg-donation.html][GnuPG donation page]] over at the
- g10^code GmbH site.
+ The donation page used to be hosted over at the g10^code GmbH site.
+ Since May 2014 the donation page is a proper part of this site:
+
+ - [[../donate/index.org][New donation page]]
diff --git a/web/misc/thanks.org b/web/misc/thanks.org
index 24b7e2c..6198f7f 100644
--- a/web/misc/thanks.org
+++ b/web/misc/thanks.org
@@ -58,3 +58,6 @@
Cristian Rigamonti, David Barkatz, Deneb, Jean-François Paris,
Lorenzo Cappelletti, Michael Nahrath, Noel D. Torres Taño,
Pauliuc George, Werner Koch.
+
+ Many people helped with donations to keep the GnuPG running. See
+ our [[../donate/kudos.org][list of donors]] of those who did not want to remain anonymous.
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index f5274cc..59920ee 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -72,6 +72,10 @@
<li><a href=\"/service.html\" >Service</a></li>
<li><a href=\"/legal.html\" >Legal</a></li>
</ul>
+ <li><a href=\"/donate/index.html\" >Donate</a></li>
+ <ul>
+ <li><a href=\"/donate/kudos.html\" >List of Donors</a></li>
+ </ul>
<li><a href=\"/download/index.html\" >Download</a></li>
<ul>
<li><a href=\"/download/integrity_check.html\"
@@ -106,7 +110,6 @@
<li><a href=\"/misc/links.html\" >Links</a></li>
<li><a href=\"/misc/logo-contest.html\" >Logo Contest</a></li>
<li><a href=\"/misc/thanks.html\" >Thanks</a></li>
- <li><a href=\"/misc/donations.html\" >Donations</a></li>
</ul>
<li><a href=\"/blog/index.html\" >Blog</a></li>
<li><a href=\"/privacy-policy.html\" >Privacy Policy</a></li>
diff --git a/web/share/site.css b/web/share/site.css
index 04a9a3a..37460d3 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -330,5 +330,45 @@ td.right {
}
+/* Tag cloudlist. */
+
+#tagcloudlist ul {
+ list-style: none;
+ float: left;
+}
+
+#tagcloudlist li {
+ float: left;
+ line-height: 130%;
+ font-variant: small-caps;
+ padding-right: 1em;
+}
+
+#tagcloudlist li:before {
+ content: "\00bb\00a0";
+}
+
+#tagcloudlist p {
+ clear: left;
+ padding-top: 1em;
+ font-size: 0.8em;
+}
+
+#tagcloudlist a {
+ font-variant: normal;
+ font-size: 0.8em;
+}
+
+
+.logobox p {
+ margin-top: 20px;
+}
+
+.logobox img {
+ margin-right: 20px;
+}
+
+
+
/* EOF */
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
tools/append-to-donors.sh | 2 +-
tools/mkkudos.sh | 14 ++++++----
web/donate/checkout.org | 35 +++++++++++++-----------
web/donate/donate-thanks.org | 10 ++++---
web/donate/index.org | 41 +++++++++++++++-------------
web/donate/kudos-2012.org | 4 +++
web/donate/kudos-2013.org | 4 +++
web/donate/kudos-2014.org | 2 +-
web/donate/kudos.org | 49 +++++++++++++++++++++++++++++++---
web/donate/logos/eof.eu.org-logo.png | Bin 0 -> 3700 bytes
web/donate/logos/whs-logo.png | Bin 0 -> 4621 bytes
web/donate/paypal-can.org | 14 ++++++++++
web/donate/paypal-thx.org | 15 +++++++++++
web/download/index.org | 2 +-
web/index.org | 7 +++++
web/misc/donations.org | 6 +++--
web/misc/thanks.org | 3 +++
web/share/gpgweb.el | 5 +++-
web/share/site.css | 40 +++++++++++++++++++++++++++
19 files changed, 201 insertions(+), 52 deletions(-)
create mode 100644 web/donate/logos/eof.eu.org-logo.png
create mode 100644 web/donate/logos/whs-logo.png
create mode 100644 web/donate/paypal-can.org
create mode 100644 web/donate/paypal-thx.org
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list