[git] gnupg-doc - branch, master, updated. e80c1f01072c877bbf1822a284d4f29565e9aa4d

[by Werner Koch]

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  e80c1f01072c877bbf1822a284d4f29565e9aa4d (commit)
      from  ec412b9deaa964eb67c4a0a9db9ac8b554be93dd (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 e80c1f01072c877bbf1822a284d4f29565e9aa4d
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 18 09:39:57 2015 +0100

    web: Add "Traueranzeige"
    
    That stupid new German data retention law is now in effect.
    This change re-uses the announcement from 2007 where Germany
    had its first version of that law which was later abolished by the
    supreme court.

diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index be7faf9..f65684f 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -297,9 +297,15 @@ string of the source file or nil if not available."
   <ul>
 ")
     (gpgweb--insert-menu gpgweb-gnupg-bottom-menu-alist 0 nil)
-    (insert "  <li>
-<a href=\"https://netzpolitik.org\"><img src=\"/misc/vds_timeline-300x150.png\" title=\"Germany parliament again adopts data retention act - after the German (in 2010) and the European supreme court (in 2014) nixed such acts.\"></a></li>")
-    (insert "  </ul>
+    (insert "    </ul>
+  </div>
+")
+    (insert "  <div class=\"footerbox\">
+  <a><img src=\"/share/traueranzeige-g10_v2015.png\"
+          width=\"200px\" height=\"73px\"
+          alt=\"Traueranzeige: Wir nehmen Abschied von einem sicher geglaubten Freund, dem | Fernmeldegeheimniss | (Artikel 10 Grundgesetz) | * 23. Mai 1949, + 18. Dezember 2015\"
+          title=\"Article 10 of the German constitution (communication privacy) is not anymore with us.\" /></a>
+  <p></p>
   </div>
 ")
     (goto-char (point-min))
diff --git a/web/share/site.css b/web/share/site.css
index b5e46a2..7e9a033 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -439,8 +439,9 @@ h3 {
 }
 
 
+/* Note that the .footerbox takes care of the padding. */
 #cpyright {
-    padding-top: 4em;
+    padding-top: 0em;
 }
 
 #smallnote {
@@ -624,6 +625,24 @@ td.wideright  {
     margin-right: 20px;
 }
 
+/* A box used for small graphics at the page bottom.
+   The images are right aligned, a single P is used
+   to clear the alignment.  */
+.footerbox {
+  margin-top: 12px;
+  margin-bottom: 5px;
+}
+
+.footerbox img {
+    float: right;
+}
+
+.footerbox p {
+    margin-top: 0px;
+    margin-bottom 0px;
+    clear: both;
+}
+
 
 /* Used by the list of people.  */
 .people {
diff --git a/web/share/traueranzeige-g10_v2015.png b/web/share/traueranzeige-g10_v2015.png
new file mode 100644
index 0000000..345df13
Binary files /dev/null and b/web/share/traueranzeige-g10_v2015.png differ

-----------------------------------------------------------------------

Summary of changes:
 web/share/gpgweb.el                   |  12 +++++++++---
 web/share/site.css                    |  21 ++++++++++++++++++++-
 web/share/traueranzeige-g10_v2015.png | Bin 0 -> 3821 bytes
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 web/share/traueranzeige-g10_v2015.png


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org