[git] gnupg-doc - branch, master, updated. a2b4c989e971b3a7af19cd3feaef76c2a5003cee
by Werner Koch
cvs at cvs.gnupg.org
Mon Sep 22 18:28:07 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 a2b4c989e971b3a7af19cd3feaef76c2a5003cee (commit)
via 8c726650e77a37b9191e3eabcb0ae8ed5a123684 (commit)
via fc2fb1721c38b2f99d5dbad6ed9c225fcaa51b13 (commit)
from 96c1d83f9b4b74cca4b1304be795ae54424dbc79 (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 a2b4c989e971b3a7af19cd3feaef76c2a5003cee
Author: Werner Koch <wk at gnupg.org>
Date: Thu Sep 18 16:00:34 2014 +0200
web: Move some menu items to the bottom.
diff --git a/web/index.org b/web/index.org
index c89694c..b42a7d8 100644
--- a/web/index.org
+++ b/web/index.org
@@ -33,13 +33,6 @@ English and German manuals.
Project [[http://gpgtools.org][GPGTools]] provides a Mac OS X version of GnuPG. It is nicely
integrated into an installer and features all required tools.
-#+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
-
* Reconquer your privacy
Even if you have nothing to hide, using encryption helps protect the
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index 46bc760..17897f4 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -98,11 +98,11 @@ if not available."
(("/related_software/frontends.html" "Frontends")
("/related_software/tools.html" "Tools")
("/related_software/libraries.html" "Libraries")
- ("/related_software/swlist.html" "All")))
- ("/blog/index.html"
- "Blog"
- ())
- ("/privacy-policy.html"
+ ("/related_software/swlist.html" "All"))))
+ "The definition of the gnupg.org menu structure.")
+
+(defconst gpgweb-gnupg-bottom-menu-alist
+ '(("/privacy-policy.html"
"Privacy Policy"
())
("/imprint.html"
@@ -113,8 +113,12 @@ if not available."
())
("/sitemap.html"
"Sitemap"
+ ())
+ ("/blog/index.html"
+ "Blog"
()))
- "The definition of the gnupg.org menu structure.")
+ "The definition of the gnupg.org bottom menu structure.")
+
(defun gpgweb--any-selected-menu-p (menu selected-file)
"Return t if any item in MENU has been selected."
@@ -172,23 +176,38 @@ if not available."
")))
(defun gpgweb-insert-footer ()
+ (goto-char (point-max))
+ (insert "</main>
+<div id=\"footer\">
+ <p>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>
+ <div id=\"nav_bottom\">
+ <ul>
+")
+ (gpgweb--insert-menu gpgweb-gnupg-bottom-menu-alist 0 nil)
+ (insert " </ul>
+ </div>
+")
(goto-char (point-min))
(unless (search-forward "<!--disable-copyright-footer-->" nil t)
(goto-char (point-max))
- (insert "<div id=\"cpyright\">
+ (insert " <div id=\"cpyright\">
<a rel=\"license\" href=\"http://creativecommons.org/licenses/by-sa/3.0/\"
><img alt=\"CC-BY-SA 3.0\" style=\"border: 0\"
- src=\"/share/cc-by-sa-3.0_80x15.png\"/></a><br/>
+ src=\"/share/cc-by-sa-3.0_80x15.png\"/></a>
These web pages are
Copyright 1998--2014 The GnuPG Project<a href=\"/copying.html\">¹</a>
and licensed under a
<a rel=\"license\" href=\"http://creativecommons.org/licenses/by-sa/3.0/\"
>Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. See
<a href=\"/copying.html\">copying</a> for details.
-</div>
-</main>
+ </div>\n"))
+ (goto-char (point-max))
+ (insert "</div>
</body>
-</html>")))
+</html>"))
;;; Post-process the generated HTML file:
diff --git a/web/share/site.css b/web/share/site.css
index e7b0ea5..8930940 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -149,7 +149,7 @@ div.entry-qotd
padding-top: 5%;
font-size: 125%;
border-bottom: 3px #FFb580 solid;
- font-family: verdana,arial,helvetica;
+ font-family: verdana,helvetica;
margin-bottom: 2%;
}
@@ -213,6 +213,29 @@ nav img {
}
+#nav_bottom ul {
+ list-style: none;
+ padding-left: 0;
+ margin-left: 0;
+ float: left;
+}
+
+#nav_bottom li {
+ float: left;
+ padding-right: 3em;
+}
+
+#nav_bottom p {
+ clear: left;
+ padding-top: 1em;
+}
+
+#nav_bottom a {
+ clear: left;
+ font-variant: normal;
+}
+
+
/*
Other stuff
*/
@@ -261,7 +284,6 @@ div.outline-text-3 {
}
#cpyright {
- font-size: 0.6em;
padding-top: 4em;
}
@@ -270,15 +292,12 @@ div.outline-text-3 {
}
#footer {
+ border-top: 2px solid #5c6064;
margin-top: 5em;
- margin-left: 10%;
- width: 80%;
+ margin-left: 5%;
+ margin-right: 5%;
clear: both;
-}
-
-#footer p {
- font-size: 0.3em;
- padding: 2em 0;
+ font-size: 0.8em;
}
commit 8c726650e77a37b9191e3eabcb0ae8ed5a123684
Author: Werner Koch <wk at gnupg.org>
Date: Thu Sep 18 13:22:41 2014 +0200
swdb: Several releases and added zlib and bzip.
diff --git a/web/swdb.mac b/web/swdb.mac
index 8f1d23a..3392047 100644
--- a/web/swdb.mac
+++ b/web/swdb.mac
@@ -45,14 +45,15 @@
#
#+macro: gpa_ver 0.9.5
#+macro: gpa_size 716k
+#+macro: gpa_sha1 ea53b934a7f5dd4e2dfb35dac2b35cafc7b54c90
#
# PINENTRY
#
-#+macro: pinentry_ver 0.8.2
-#+macro: pinentry_size 418k
-#+macro: pinentry_sha1 eeee9e80ea02f63bdac1cb03eb1785ab2cd57f90
+#+macro: pinentry_ver 0.8.4
+#+macro: pinentry_size 505k
+#+macro: pinentry_sha1 36c94980ceab5c15e188de121f7ab4c7ee6b3521
#
@@ -75,9 +76,9 @@
#
# LIBKSBA
#
-#+macro: libksba_ver 1.3.0
-#+macro: libksba_size 610k
-#+macro: libksba_sha1 241afcb2dfbf3f3fc27891a53a33f12d9084d772
+#+macro: libksba_ver 1.3.1
+#+macro: libksba_size 584k
+#+macro: libksba_sha1 6bfe285dbc3a7b6e295f9389c20ea1cdf4947ee5
#
@@ -91,9 +92,9 @@
#
# LIBGPG-ERROR
#
-#+macro: libgpg_error_ver 1.15
+#+macro: libgpg_error_ver 1.16
#+macro: libgpg_error_size 534k
-#+macro: libgpg_error_sha1 f41791121c66043fa18834597e0155ebcbff8ada
+#+macro: libgpg_error_sha1 059c40a2b78c3ac2b4cbec0e0481faba5af332fe
#
@@ -107,15 +108,28 @@
#
# nPth
#
-#+macro: npth_ver 0.91
+#+macro: npth_ver 1.0
+#+macro: npth_sha1 3c0673144f8baffda3a3aaab3f6853acc58146c7
#
# GpgEX
#
#+macro: gpgex_ver 1.0.1
+#+macro: gpgex_sha1 eb54767fd8e3728e8d14c7c158e0841b67c714a6
+#
+# zlib (mirrored at our server)
+#
+#+macro: zlib_ver 1.2.8
+#+macro: zlib_sha1_gz a4d316c404ff54ca545ea71a27af7dbc29817088
+
+#
+# bzip2 (mirrored and stripped down version)
+#
+#+macro: bzip2_ver 1.0.6-g10
+#+macro: bzip2_sha1_gz 6e38be3377340a21a1f13ff84b5e6adce97cd1d4
# --- end of swdb.mac ---
commit fc2fb1721c38b2f99d5dbad6ed9c225fcaa51b13
Author: Werner Koch <wk at gnupg.org>
Date: Wed Sep 17 03:53:01 2014 +0200
web: Fix link to gpgme
diff --git a/web/donate/index.org b/web/donate/index.org
index e1fa444..a1085e4 100644
--- a/web/donate/index.org
+++ b/web/donate/index.org
@@ -11,7 +11,7 @@
GnuPG carries an [[https://www.fsf.org][FSF]] copyright notice, they never funded the
development or hosting costs.
- 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
+ If you are using [[../index.org][GnuPG]], [[http://directory.fsf.org/project/libgcrypt/][Libgcrypt]], [[../related_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.
diff --git a/web/related_software/gpgme/index.org b/web/related_software/gpgme/index.org
index 1855cf7..d0a76a7 100644
--- a/web/related_software/gpgme/index.org
+++ b/web/related_software/gpgme/index.org
@@ -16,11 +16,7 @@
can be done at a central place and every application benefits from
this.
- Especially authors of
- #+html: <abbr title="Mail User Agent; e.g. a mail reader">
- MUAs
- #+html: </abbr>
- should consider to use GPGME. It is even planned to create a set of
- standard widgets for common key selection tasks.
+ Especially authors of @@html:<abbr title="Mail User Agent (mail
+ reader">@@MUAs@@html:</abbr>@@ should consider to use GPGME.
- See [[https://www.gnupg.org/download/index.org#gpgme][download]] section to download the latest tarball.
+ See [[../../download/index.org::#gpgme][download]] section to download the latest tarball.
-----------------------------------------------------------------------
Summary of changes:
web/donate/index.org | 2 +-
web/index.org | 7 ------
web/related_software/gpgme/index.org | 10 +++------
web/share/gpgweb.el | 41 +++++++++++++++++++++++++---------
web/share/site.css | 37 ++++++++++++++++++++++--------
web/swdb.mac | 32 ++++++++++++++++++--------
6 files changed, 85 insertions(+), 44 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list