[git] gnupg-doc - branch, master, updated. 570e1bc920b08f25fec300d1eaee5de11a6e21d1
by Werner Koch
cvs at cvs.gnupg.org
Mon Mar 16 11:07:30 CET 2015
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 570e1bc920b08f25fec300d1eaee5de11a6e21d1 (commit)
via ec21c78a14d963b228ce50311b0050c657ecad73 (commit)
from 39662b50026c9339d374fdbef0c5de62e9c46837 (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 570e1bc920b08f25fec300d1eaee5de11a6e21d1
Author: Werner Koch <wk at gnupg.org>
Date: Mon Mar 16 11:06:17 2015 +0100
Improve layout of donation summary tables.
* tools/mkkudos.sh (dontable): Use class wideright.
* web/donate/kudos.org: Add flag table_data_wideright.
* web/share/gpgweb.el (gpgweb-postprocess-html): Prosprocess files
with that flag.
* web/share/site.css (th,td.wideright): New.
diff --git a/tools/mkkudos.sh b/tools/mkkudos.sh
index fb742a8..2678bdb 100755
--- a/tools/mkkudos.sh
+++ b/tools/mkkudos.sh
@@ -131,8 +131,8 @@ dontable=$(awk -F: <"$donations" -v thisyear="$thisyear" '
printf "<thead>\n";
printf "<tr>\n";
printf "<th scope=\"col\" class=\"left\">Month</th>\n";
- printf "<th scope=\"col\" class=\"right\">#</th>\n";
- printf "<th scope=\"col\" class=\"right\">€</th>\n";
+ printf "<th scope=\"col\" class=\"right wideright\">#</th>\n";
+ printf "<th scope=\"col\" class=\"right wideright\">€</th>\n";
printf "</tr>\n";
printf "</thead>\n";
printf "<tbody>\n";
@@ -143,15 +143,16 @@ dontable=$(awk -F: <"$donations" -v thisyear="$thisyear" '
printf "</tbody>\n";
printf "<tbody>\n";
printf "<tr><td class=\"left\">%d</td>\n", thisyear;
- printf " <td class=\"right\">%d</td>\n", nyear;
- printf " <td class=\"right\">%d</td></tr>\n", totalyear;
+ printf " <td class=\"right wideright\">%d</td>\n", nyear;
+ printf " <td class=\"right wideright\">%d</td></tr>\n", totalyear;
printf "</tbody>\n";
printf "</table>\n";
exit 0
}
{ printf "<tr><td class=\"left\">%s</td>\n", m[int($2)];
- printf " <td class=\"right\">%d</td>\n", $7;
- printf " <td class=\"right\">%d</td></tr>\n", int($8 + 0.5);
+ printf " <td class=\"right wideright\">%d</td>\n", $7;
+ printf " <td class=\"right wideright\">%d</td></tr>\n",
+ int($8 + 0.5);
}
')
diff --git a/web/donate/kudos.org b/web/donate/kudos.org
index f1ad914..808fb41 100644
--- a/web/donate/kudos.org
+++ b/web/donate/kudos.org
@@ -2,6 +2,8 @@
#+STARTUP: showall
#+SETUPFILE: "../share/setup.inc"
+#+HTML: <!--table_data_wideright-->
+
* Donation Summary
*** This year
@@ -15,7 +17,7 @@
*** Previous years
| Year | # | \EUR | net \EUR |
-| | <r> | <r> | <r> |
+| <l> | <r> | <r> | <r> |
|------+-----+-------+----------|
| 2014 | 801 | 34700 | |
| 2013 | 148 | 5041 | 4145 |
diff --git a/web/share/gpgweb.el b/web/share/gpgweb.el
index c11d27b..55402fb 100644
--- a/web/share/gpgweb.el
+++ b/web/share/gpgweb.el
@@ -363,6 +363,15 @@ string of the source file or nil if not available."
"href=\"\\(https://www.gnupg.org\\)/.*\"" nil t)
(replace-match "" t t nil 1))
+ ; If the wideright flag is used, change <td> and <th>
+ ; attributes.
+ (goto-char (point-min))
+ (when (search-forward "<!--table_data_wideright-->" nil t)
+ (goto-char (point-min))
+ (while (re-search-forward
+ "^<t[hd].*class=\"\\(right\\)\".*$" nil t)
+ (replace-match "right wideright" t nil nil 1)))
+
; And save the changes
(basic-save-buffer))
(unless visitingp (kill-buffer work-buffer))))))
diff --git a/web/share/site.css b/web/share/site.css
index 48815f3..b5e46a2 100644
--- a/web/share/site.css
+++ b/web/share/site.css
@@ -551,6 +551,11 @@ th.right {
text-align:center;
}
+th.wideright {
+ text-align:center;
+ padding-left: 25px;
+}
+
td.left {
text-align:left;
padding-left: 10px;
@@ -565,6 +570,11 @@ td.right {
padding-right: 10px;
}
+td.wideright {
+ text-align: right;
+ padding-left: 25px;
+}
+
/* Tag cloudlist. */
commit ec21c78a14d963b228ce50311b0050c657ecad73
Author: Werner Koch <wk at gnupg.org>
Date: Wed Mar 11 20:48:34 2015 +0100
blog: Typo fix.
diff --git a/misc/blog.gnupg.org/20150310-gnupg-in-february.org b/misc/blog.gnupg.org/20150310-gnupg-in-february.org
index ea089cd..4fe8680 100644
--- a/misc/blog.gnupg.org/20150310-gnupg-in-february.org
+++ b/misc/blog.gnupg.org/20150310-gnupg-in-february.org
@@ -10,7 +10,7 @@ GnuPG Project is over. Due to an unexpected amount of donations
received in the first days of February we can keep on working for at
least the next 2 or 3 years.
-How did this happen? At the [[https://events.ccc.de/congress/2014/wiki/Main_Page][31C3]] Nico Josattis arranged an Interview
+How did this happen? At the [[https://events.ccc.de/congress/2014/wiki/Main_Page][31C3]] Nico Josuttis arranged an Interview
with [[http://juliaangwin.com][Julia Angwin]] who writes for [[http://www.propublica.org][ProPublica]]. Eventually on the 5th
her [[http://www.propublica.org/article/the-worlds-email-encryption-software-relies-on-one-guy-who-is-going-broke][article]] was published and immediately received a lot of attention.
Not only at the ProPublica site but at many other news site as well.
-----------------------------------------------------------------------
Summary of changes:
misc/blog.gnupg.org/20150310-gnupg-in-february.org | 2 +-
tools/mkkudos.sh | 13 +++++++------
web/donate/kudos.org | 4 +++-
web/share/gpgweb.el | 9 +++++++++
web/share/site.css | 10 ++++++++++
5 files changed, 30 insertions(+), 8 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list