web: Fix Paypal button and publish 2.0.23 news.
authorWerner Koch <wk@gnupg.org>
Tue, 3 Jun 2014 12:01:57 +0000 (14:01 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 3 Jun 2014 12:01:57 +0000 (14:01 +0200)
* cgi/procdonate.cgi (write_template): Add template var PUBLISH_NAME.
* web/donate/checkout.org: Pass PUBLISH_NAME to Paypal.
* web/index.org: Add news item
* web/share/site.css: Add rules for makeinfo.

cgi/procdonate.cgi
web/donate/checkout.org
web/index.org
web/share/site.css
web/swdb.mac

index ad95369..61ecce2 100755 (executable)
@@ -70,6 +70,7 @@ sub write_template ($) {
     my $sel_gbp = '';
     my $sel_jpy = '';
     my $message_fmt;
+    my $publishname;
 
     # Avoid broken HTML attributes.
     $amount =~ s/\x22/\x27/g;
@@ -102,6 +103,13 @@ sub write_template ($) {
         $sel_jpy = ' selected="selected"';
     }
 
+    # Set var for the paypal button
+    if ( $name eq 'Anonymous' or $name eq '') {
+        $publishname = 'No';
+    } else {
+        $publishname = 'Yes';
+    }
+
     # Build error strings.
     foreach (keys %errdict)
     {
@@ -137,6 +145,7 @@ sub write_template ($) {
             || s/(<selected=\x22selected\x22)?><!--SEL_USD-->/$sel_usd>/
             || s/(<selected=\x22selected\x22)?><!--SEL_GBP-->/$sel_gbp>/
             || s/(<selected=\x22selected\x22)?><!--SEL_JPY-->/$sel_jpy>/
+            || s/<!--PUBLISH_NAME-->/$publishname/
             || s/<!--ERRORSTR-->/$errorstr/
             || s/<!--ERR_AMOUNT-->/$err_amount/
             || s/<!--ERR_NAME-->/$err_name/
index 8f09b9d..ad69fcd 100644 (file)
@@ -70,6 +70,8 @@
       <input type="image" src="https://gnupg.org/share/btn-donate.png"
            border="0" name="submit" alt="Donate using PayPal"
                                   title="Donate using PayPal">
+      <input type="hidden" name="os0" value="<!--PUBLISH_NAME-->">
+      <input type="hidden" name="os1" value="<!--NAME-->">
     </form>
   </p>
 #+END_HTML
index d42c997..1e643c0 100644 (file)
@@ -51,6 +51,14 @@ all [[file:news.org][news of previous years]] is also available.
 # GnuPG's latest news are available as [[http://feedvalidator.org/check.cgi?url%3Dhttps://www.gnupg.org/news.en.rss][RSS 2.0 compliant]] feed.  Just
 # point or paste the [[news.en.rss][RSS file]] into your aggregator.
 
+2014q2/000342.html
+
+** GnuPG 2.0.23 released (2014-06-03)
+
+We are pleased to announce the availability of GnuPG 2.0.23.  This is
+a maintenance release with a few new features. [[http://lists.gnupg.org/pipermail/gnupg-announce/2014q2/000342.html][{more}]]
+
+
 ** Goteo campaign: preliminary results (2014-05-12)
 
 The blog has a report on the current status of the campaign including
index 37460d3..6f0e373 100644 (file)
@@ -302,6 +302,41 @@ pre {
     overflow: auto;
 }
 
+/* Classes used by makeinfo (manuals).  */
+
+pre.display {
+    font-family:inherit;
+}
+pre.format {
+    font-family:inherit;
+}
+pre.smalldisplay {
+    font-family:inherit;
+    font-size:smaller;
+}
+pre.smallformat {
+    font-family:inherit;
+    font-size:smaller;
+}
+pre.smallexample {
+    font-size:smaller;
+}
+pre.smalllisp {
+    font-size:smaller;
+}
+
+span.sc {
+    font-variant:small-caps;
+}
+span.roman {
+    font-family:serif;
+    font-weight:normal;
+}
+span.sansserif {
+    font-family:sans-serif;
+    font-weight:normal;
+}
+
 
 /* Table stuff */
 
@@ -360,6 +395,8 @@ td.right  {
 }
 
 
+/* A box of logos.  */
+
 .logobox p {
   margin-top: 20px;
 }
index 522a4c6..b443bbf 100644 (file)
@@ -8,10 +8,10 @@
 #
 # GnuPG-2
 #
-#+macro: gnupg_ver     2.0.22
+#+macro: gnupg_ver     2.0.23
 #+macro: gnupg_branch  STABLE-BRANCH-2-0
-#+macro: gnupg_size    4177k
-#+macro: gnupg_sha1    9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8
+#+macro: gnupg_size    4196k
+#+macro: gnupg_sha1    c90e47ab95a40dd070fd75faef0a05c7b679553b
 
 #
 # GnuPG-1