[git] gnupg-doc - branch, preview, updated. d2678ffc771d206c516767c519fced664192755a

by Justus Winter cvs at cvs.gnupg.org
Fri May 19 11:49:38 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  d2678ffc771d206c516767c519fced664192755a (commit)
       via  9c8f86bbcfb9fe7402a9c71edb56486f520d3caf (commit)
      from  1539cc59f77b00bdec6611a7060a1452350ea462 (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 d2678ffc771d206c516767c519fced664192755a
Author: Justus Winter <justus at g10code.com>
Date:   Fri May 19 11:49:34 2017 +0200

    campaign,de: translate headings

diff --git a/web/donate/checkout-bc.de.org b/web/donate/checkout-bc.de.org
index 3b89347..dfa354d 100644
--- a/web/donate/checkout-bc.de.org
+++ b/web/donate/checkout-bc.de.org
@@ -42,7 +42,7 @@
     <div class="camp-gutter container">
       <div class="row">
         <div class="col-md-7 col-md-offset-2">
-          <h2>Summary</h2>
+          <h2>Übersicht</h2>
           <p>
 	    Gespendete Bitcoins gehen an den
 	    <a href="https://www.gnupg.org/verein">GnuPG e.V.</a>
diff --git a/web/donate/checkout-cc.de.org b/web/donate/checkout-cc.de.org
index 5c7b7e0..196f3f6 100644
--- a/web/donate/checkout-cc.de.org
+++ b/web/donate/checkout-cc.de.org
@@ -53,7 +53,7 @@
     <div class="camp-gutter container">
       <div class="row">
         <div class="col-md-7 col-md-offset-2">
-          <h2>Summary</h2>
+          <h2>Übersicht</h2>
           <p>Informationen zu Ihrer gewünschten Spende:</p>
           <form class="form-horizontal">
             <div class="form-group">

commit 9c8f86bbcfb9fe7402a9c71edb56486f520d3caf
Author: Justus Winter <justus at g10code.com>
Date:   Fri May 19 11:49:26 2017 +0200

    campaign,de: bootstrap wip checkout page for pp

diff --git a/web/donate/checkout-pp.de.org b/web/donate/checkout-pp.de.org
index 1841836..674fc48 100644
--- a/web/donate/checkout-pp.de.org
+++ b/web/donate/checkout-pp.de.org
@@ -1,50 +1,134 @@
-#+TITLE: GnuPG - Donate - Checkout with PayPal
+#                                                    -*- html -*-
+#+TITLE: GnuPG - Spenden - Bezahlen mit PayPal
 #+STARTUP: showall
 #+SETUPFILE: "../share/setup.inc"
 
-* Spenden an das GnuPG Projekt mit PayPal
+#+BEGIN_HTML
+<!--custom-page-->  <!-- this disables all standard processing. -->
+  <!-- bootstrap core and site css -->
+  <link href="/share/3rdparty/bootstrap/bootstrap-gnupg.css" rel="stylesheet">
+  <link href="/share/campaign/campaign.css" rel="stylesheet">
 
-  Informationen zu Ihrer gewünschten Spende:
+  <script defer src="/share/3rdparty/jquery/jquery.min.js"></script>
+  <script defer src="/share/3rdparty/bootstrap/bootstrap.min.js"></script>
 
-#+BEGIN_HTML
-  <table border="0" cellpadding="0" cellspacing="4" id="checkoutSummary">
-   <tr>
-     <td align="right">Betrag:</td>
-     <td><!--AMOUNT-->
-         <!--CURRENCY--></td>
-   </tr>
-   <tr>
-     <td align="right">Name:</td>
-     <td><!--NAME--></td>
-   </tr>
-   <tr>
-     <td align="right">E-Mail:</td>
-     <td><!--MAIL--></td>
-   </tr>
-   <tr>
-     <td align="right" valign="top">Nachricht:</td>
-     <td><!--MESSAGE_FMT--></td>
-   </tr>
-  </table>
-#+END_HTML
+</head>
+  <body lang="en">
+<style>
+.control-label {
+  padding-top: 0 !important;
+}
 
-  Falls etwas nicht korrekt ist, benutzen Sie bitte den /Zurück/-Knopf
-  weiter unten auf dieser Seite.  Wenn die Daten korrekt sind, können
-  sie nun mittels des /Jetzt bezahlen/-Knopfes mit der Spende
-  fortfahren.
+.form-control-static {
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+  min-height: 0 !important;
+}
+</style>
+    <!-- Fixed navbar -->
+    <nav class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
 
-#+BEGIN_HTML
-  <div class="buttonbox">
-  <form action="/cgi-bin/procdonate.cgi" method="POST">
-    <input type="hidden" name="mode" value="checkout-paypal" />
-    <input type="hidden" name="sessid" value="<!--SESSID-->" />
-    <input type="submit" class="donate-button" value="Jetzt bezahlen" />
-  </form>
-
-  <form action="/cgi-bin/procdonate.cgi" method="POST">
-    <input type="hidden" name="mode" value="re-main">
-    <input type="hidden" name="sessid" value="<!--SESSID-->">
-    <input type="submit" class="donate-button-low" value="Zurück" />
-  </form>
-  </div>
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed"
+                  data-toggle="collapse" data-target="#navbar"
+                  aria-expanded="false" aria-controls="navbar">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <img class="navbar-brand" alt="GnuPG"
+               src="/share/gnupg-lock-white-250x250.png">
+        </div>
+
+        <div id="navbar" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li><a href="/donate/index.de.html">Home</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </nav>
+
+    <div class="camp-gutter container">
+      <div class="row">
+        <div class="col-md-7 col-md-offset-2">
+          <h2>Übersicht</h2>
+          <p>Informationen zu Ihrer gewünschten Spende:</p>
+          <form class="form-horizontal">
+            <div class="form-group">
+              <label class="col-sm-3 control-label">Betrag</label>
+              <div class="col-sm-9">
+                <p class="form-control-static"><!--AMOUNT--> <!--CURRENCY--></p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-3 control-label">Name</label>
+              <div class="col-sm-9">
+                <p class="form-control-static"><!--NAME--></p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-3 control-label">E-Mail</label>
+              <div class="col-sm-9">
+                <p class="form-control-static"><!--MAIL--></p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-3 control-label">Nachricht</label>
+              <div class="col-sm-9">
+                <p class="form-control-static"><!--MESSAGE_FMT--></p>
+              </div>
+            </div>
+          </form>
+          <p>
+	    Falls etwas nicht korrekt ist, benutzen Sie bitte den
+	    <em>Zurück</em>-Knopf weiter unten auf dieser Seite.  Wenn
+	    die Daten korrekt sind, können sie nun mittels
+	    des <em>Jetzt bezahlen</em>-Knopfes mit der Spende
+	    fortfahren.
+          </p>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-sm-5 col-md-offset-2">
+          <p>
+            <form action="/cgi-bin/procdonate.cgi" method="POST" class="form-inline">
+              <input type="hidden" name="mode" value="checkout-paypal" />
+              <input type="hidden" name="sessid" value="<!--SESSID-->" />
+              <input type="submit" class="btn btn-primary btn-sm" value="Jetzt bezahlen" />
+            </form>
+          </p>
+          <p>
+            <form action="/cgi-bin/procdonate.cgi" method="POST" class="form-inline">
+              <input type="hidden" name="mode" value="re-main">
+              <input type="hidden" name="sessid" value="<!--SESSID-->">
+              <input type="hidden" name="lang" value="<!--LANG-->">
+              <input type="submit" class="btn btn-default btn-sm" value="Zurück" />
+            </form>
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="camp-gutter container-fluid" id="camp-footer">
+      <div class="container">
+        <div class="row">
+          <div id="cpyright">
+            <a rel="license" href="https://creativecommons.org/licenses/by-sa/3.0/">
+              <img alt="CC-BY-SA 4.0" style="border: 0"
+                    src="/share/cc-by-sa_80x15.png"/></a> 
+            This web page is
+            Copyright 2017 The GnuPG Project and licensed under a
+            <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
+            Creative Commons Attribution-ShareAlike 4.0 International License</a>.  See
+            <a href="/copying.html">copying</a> for details.
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </body>
+</html>
 #+END_HTML

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

Summary of changes:
 web/donate/checkout-bc.de.org |   2 +-
 web/donate/checkout-cc.de.org |   2 +-
 web/donate/checkout-pp.de.org | 168 +++++++++++++++++++++++++++++++-----------
 3 files changed, 128 insertions(+), 44 deletions(-)


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




More information about the Gnupg-commits mailing list