[git] gnupg-doc - branch, preview, updated. 380d608dd169a90c9c89d54f2135809893bd1e6e
by Kai Michaelis
cvs at cvs.gnupg.org
Thu May 18 14:05:44 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 380d608dd169a90c9c89d54f2135809893bd1e6e (commit)
from 4d732209433df0968c3383434769b102c91c1917 (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 380d608dd169a90c9c89d54f2135809893bd1e6e
Author: Kai Michaelis <kai at gnupg.org>
Date: Thu May 18 14:07:10 2017 +0200
campaign: boostrap checkout-cc
diff --git a/web/donate/checkout-cc.org b/web/donate/checkout-cc.org
index 7573d64..6aea8a5 100644
--- a/web/donate/checkout-cc.org
+++ b/web/donate/checkout-cc.org
@@ -5,86 +5,148 @@
#+BEGIN_HTML
<!--custom-page--> <!-- this disables all standard processing. -->
-<link rel="stylesheet" href="/share/site.css" type="text/css" />
+ <!-- bootstrap core and site css -->
+ <link href="/share/3rdparty/bootstrap/bootstrap-gnupg.css" rel="stylesheet">
+ <link href="/share/campaign/campaign.css" rel="stylesheet">
+
+ <script defer src="/share/3rdparty/jquery/jquery.min.js"></script>
+ <script defer src="/share/3rdparty/bootstrap/bootstrap.min.js"></script>
+
</head>
-<body lang="en">
+ <body lang="en">
+ <!-- Fixed navbar -->
+ <nav class="navbar navbar-default navbar-fixed-top">
+ <div class="container">
+
+ <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>
-<p>
-Information on your intended donation:
-</p>
+ <div id="navbar" class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="/">Home</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </nav>
-<table border="0" cellpadding="0" cellspacing="4" id="checkoutSummary">
- <tr>
- <td align="right">Amount:</td>
- <td><!--AMOUNT-->
- <!--CURRENCY-->
- <!--RECUR_TEXT--></td>
- </tr>
- <tr>
- <td align="right">Name:</td>
- <td><!--NAME--></td>
- </tr>
- <tr>
- <td align="right">Mail:</td>
- <td><!--MAIL--></td>
- </tr>
- <tr>
- <td align="right" valign="top">Message:</td>
- <td><!--MESSAGE_FMT--></td>
- </tr>
-</table>
+ <div class="camp-gutter container">
+ <div class="row">
+ <div class="col-md-7 col-md-offset-2">
+ <h2>Summary</h2>
+ <p>Information on your intended donation.</p>
+ <form class="form-horizontal">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">Amount</label>
+ <div class="col-sm-9">
+ <p class="form-control-static"><!--AMOUNT--> <!--CURRENCY--> <!--RECUR_TEXT--></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">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">Message</label>
+ <div class="col-sm-9">
+ <p class="form-control-static"><!--MESSAGE_FMT--></p>
+ </div>
+ </div>
+ </form>
+ <p>
+ If something is wrong, please use the back button below to change
+ it. If the data is correct, you may now continue with the payment.
+ </p>
-<p>
- If something is wrong, please use the back button below to change
- it. If the data is correct, you may now continue with the payment.
-</p>
+ <noscript>
+ <div class="alert alert-danger" role="alert">
+ <p>
+ <strong>Please enable Javascript.</strong>
+ Right, for security reasons it is in general preferable to
+ disable Javascript in a browser. However, we do not want
+ to handle credit card numbers ourselves and use a service of
+ our payment processor to convey this sensitive information
+ directly between your browser and them. This requires that
+ you enable enable Javascript for <em>gnupg.org</em>
+ and <em>stripe.com</em>.
+ </p>
+ </div>
+ </noscript>
- <noscript>
- <p>
- <strong>Please enable Javascript.</strong>
- </p>
- <p id="smallnote">
- Right, for security reasons it is in general preferable to
- disable Javascript in a browser. However, we do not want
- to handle credit card numbers ourselves and use a service of
- our payment processor to convey this sensitive information
- directly between your browser and them. This requires that
- you enable enable Javascript for <emph>gnupg.org</emph>
- and <emph>stripe.com</emph>.
- </p>
- </noscript>
+ </div>
+ </div>
+ <div class="row">
+ <!-- ERRORSTR -->
+ </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-stripe">
+ <input type="hidden" name="sessid" value="<!--SESSID-->">
+ <script
+ src="https://checkout.stripe.com/checkout.js"
+ class="stripe-button"
+ data-key="<!--STRIPEPUBKEY-->"
+ data-image="/share/gnupg-badge-128x128.png"
+ data-name="GnuPG"
+ data-description="Donation to the GnuPG project"
+ data-locale="<!--STRIPELOCALE-->"
+ data-amount="<!--STRIPEAMOUNT-->"
+ data-currency="<!--CURRENCY-->"
+ data-panel-label="Donate {{amount}} <!--RECUR_TEXT-->"
+ data-label="<!--STRIPE_DATA_LABEL_VALUE-->"
+ <!--STRIPE_DATA_EMAIL-->
+ >
+ </script>
+ </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="Back" />
+ </form>
+ </p>
+ </div>
+ </div>
+ </div>
- <!--ERRORSTR-->
- <div class="buttonbox">
- <p>
- <form action="/cgi-bin/procdonate.cgi" method="POST">
- <input type="hidden" name="mode" value="checkout-stripe">
- <input type="hidden" name="sessid" value="<!--SESSID-->">
- <script
- src="https://checkout.stripe.com/checkout.js"
- class="stripe-button"
- data-key="<!--STRIPEPUBKEY-->"
- data-image="/share/gnupg-badge-128x128.png"
- data-name="GnuPG"
- data-description="Donation to the GnuPG project"
- data-locale="<!--STRIPELOCALE-->"
- data-amount="<!--STRIPEAMOUNT-->"
- data-currency="<!--CURRENCY-->"
- data-panel-label="Donate {{amount}} <!--RECUR_TEXT-->"
- data-label="<!--STRIPE_DATA_LABEL_VALUE-->"
- <!--STRIPE_DATA_EMAIL-->
- >
- </script>
- </form>
- </p>
- <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="hidden" name="lang" value="<!--LANG-->">
- <input type="submit" class="donate-button-low" value="Back" />
- </form>
- </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>
+ </body>
</html>
#+END_HTML
-----------------------------------------------------------------------
Summary of changes:
web/donate/checkout-cc.org | 210 +++++++++++++++++++++++++++++----------------
1 file changed, 136 insertions(+), 74 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list