[git] gnupg-doc - branch, preview, updated. 99318e6ea1fa5c07c4f8829cd71ae92344d1c144
by Werner Koch
cvs at cvs.gnupg.org
Wed May 3 13:39:00 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 99318e6ea1fa5c07c4f8829cd71ae92344d1c144 (commit)
from df62925eb36ad7d2908a9d1f991703d33a530816 (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 99318e6ea1fa5c07c4f8829cd71ae92344d1c144
Author: Werner Koch <wk at gnupg.org>
Date: Wed May 3 13:36:02 2017 +0200
web: Add hack to allow creating a plain page.
Not tested!
diff --git a/web/donate/index.org b/web/donate/index.org
index b1b383c..de59bf1 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -5,49 +5,21 @@
# Note: Do not use relative links because this page is also used as a
# template from cgi-bin/. Using https://www.gnupg.org/... is
# fine as it is stripped before publishing.
+# Note: These special comments are used
+# custom-head-section - Neither a meta tag for a stylesheet is
+# inserted nor the </head> and <body>.
+# disable-menu - No menu is generated.
+#+BEGIN_HTML
+<!--custom-head-section->
+<link rel="stylesheet" href="/share/site.css" type="text/css" />
+</head>
+<body>
+<!--disable-menu-->
-* Donate
-
- 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. Note that despite
- GnuPG carries an [[https://www.fsf.org][FSF]] copyright notice, they never funded the
- development or hosting costs.
-
- If you are using [[../index.org][GnuPG]], [[../software/libgcrypt/index.org][Libgcrypt]], [[../software/gpgme/index.org][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. If
- you have a Paypal account you may use that too.
-
- Because the GnuPG project is not tax exempted, we are not able to
- send you a respective donation receipt. If you can benefit from a
- donation receipt by a Germany charity you may donate to the GnuPG
- account at the [[https://www.wauland.de/en/donation.html#61][Wau Holland Stiftung]]; they will use the money raised
- to pay for development work on GnuPG and Enigmail. If you want to
- be listed on our [[https://www.gnupg.org/donate/kudos.html][thank you]] page you should indicate this by adding a
- comment of the form =List me as: NAME= to your donation.
-
- If you like to donate Bitcoins you may use the [[https://www.wauland.de/en/donation.html#61][Wau Holland Stiftung]]
- account too.
-
- If you represent a company, you may also 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 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 [[https://www.gnupg.org/donate/kudos.html][thank you]] page.
+<!-- Write whatever HTML code you like -->
-#+BEGIN_HTML
<!--ERRORPANEL-->
<form action="/cgi-bin/procdonate.cgi" method="post" class="inputpanel">
@@ -169,6 +141,8 @@
</tr>
</table>
</form>
+
+
#+END_HTML
** Recent donors
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index d992d55..46bbcdd 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -81,10 +81,14 @@ if not available."
<meta name=\"DC.Publisher\" content=\"The GnuPG Project\" />
<meta name=\"DC.Identifier\" content=\"https://gnupg.org/\" />
<meta name=\"DC.Rights\" content=\"https://gnupg.org/copying.html\" />
-<link rel=\"stylesheet\" href=\"/share/site.css\" type=\"text/css\" />
+")
+(goto-char (point-min))
+(unless (search-forward "<!--custom-head-section-->" nil t)
+ (goto point-max)
+ (insert "<link rel=\"stylesheet\" href=\"/share/site.css\" type=\"text/css\" />
</head>
<body>
-"))
+")))
(defconst gpgweb-gnupg-menu-alist
'(("/index.html"
@@ -399,7 +403,9 @@ to create the previous and Next links for an entry."
(title (gpgweb-publish-find-title orgfile)))
;; Insert header, menu, and footer.
(gpgweb-insert-header title committed-at)
- (gpgweb-insert-menu fname-2)
+ (goto-char (point-min))
+ (unless (search-forward "<!--disable-menu-->" nil t)
+ (gpgweb-insert-menu fname-2))
(if blogmode
(gpgweb-fixup-blog plist
(file-name-nondirectory orgfile)
-----------------------------------------------------------------------
Summary of changes:
web/donate/index.org | 52 +++++++++++++---------------------------------------
web/share/gpgweb.el | 12 +++++++++---
2 files changed, 22 insertions(+), 42 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list