[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-262-g59fb7e6
by Emanuel Schuetze
cvs at cvs.gnupg.org
Thu Oct 13 17:00:17 CEST 2016
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 "GnuPG for Windows".
The branch, website has been updated
via 59fb7e6712cf4d50034123e4be1b8a4bc464c28f (commit)
via 65eabd6092baa54206ad15ac6197ddccfdd9fbc3 (commit)
via 30cc4d5115f066035dcd00793bc9e74087f14492 (commit)
via 84df412f63641db8096180fb7cfdfe01450b05f1 (commit)
via f95e213b806605f6a2b22e1885bc914147006d53 (commit)
from d7e438bd79e34c3204db647b72db5489efb3da9c (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 59fb7e6712cf4d50034123e4be1b8a4bc464c28f
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Oct 13 16:58:59 2016 +0200
Added release date to new download page.
diff --git a/web/get-gpg4win-de.htm4 b/web/get-gpg4win-de.htm4
index 06bf3fd..fe5edf8 100644
--- a/web/get-gpg4win-de.htm4
+++ b/web/get-gpg4win-de.htm4
@@ -12,7 +12,7 @@ m4_define(`NO_DOWNLOAD_HEADER')
PAGE_START
<div id="intro">
- <h2>Download Gpg4win VERSION</h2>
+ <h2>Download Gpg4win VERSION (DL_DATE)</h2>
</div>
<div id="main">
diff --git a/web/get-gpg4win.htm4 b/web/get-gpg4win.htm4
index 9636b69..ccc65b1 100644
--- a/web/get-gpg4win.htm4
+++ b/web/get-gpg4win.htm4
@@ -13,7 +13,7 @@ PAGE_START
<div id="intro">
- <h2>Download Gpg4win VERSION</h2>
+ <h2>Download Gpg4win VERSION (DL_DATE)</h2>
</div>
<div id="main">
commit 65eabd6092baa54206ad15ac6197ddccfdd9fbc3
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Oct 13 16:56:00 2016 +0200
Use direct link to download page for big download button.
diff --git a/web/header.m4 b/web/header.m4
index e4c6ced..4100076 100644
--- a/web/header.m4
+++ b/web/header.m4
@@ -2,20 +2,24 @@
<div class="fancy_intro">
<div id="download_button">
m4_ifelse(LANG_DE, `1', `
- <a href="download-de.html">
+ <a href="get-gpg4win-de.html">
<span class="text">
- Download<br />Gpg4win
+ Download<br />Gpg4win VERSION
</span></a>', `
- <a href="download.html">
+ <a href="get-gpg4win.html">
<span class="text">
- Download<br />Gpg4win
+ Download<br />Gpg4win VERSION
</span></a>')
</div>
<div class="download_button_links">
m4_ifelse(LANG_DE, `1', `
+ <a href="download-de.html">Details</a>', `
+ <a href="download.html">Details</a>')
+ ·
+ m4_ifelse(LANG_DE, `1', `
<a href="change-history-de.html">Änderungshistorie</a>', `
<a href="change-history.html">Change History</a>')
- -
+ ·
m4_ifelse(LANG_DE, `1', `
<a href="package-integrity-de.html">Integrität prüfen</a>', `
<a href="package-integrity.html">Check integrity</a>')
commit 30cc4d5115f066035dcd00793bc9e74087f14492
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Oct 13 16:45:21 2016 +0200
Remove free download link from paypal page.
User can switch to '0,-' to get free download link or use other
payment pages.
diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index 989341b..b3674e6 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -57,7 +57,6 @@
<p>
<button class="donateButton" name="submit" alt="Spenden via PayPal"
type="submit">Spenden & Download</button>
- oder <a href="thanks-for-download-de.html">kostenlos herunterladen</a>
</div>
<!-- download -->
@@ -169,7 +168,6 @@
<p>
<button class="donateButton" name="submit" alt="Spenden via PayPal"
type="submit">Spenden & Download</button>
- oder <a href="thanks-for-download-de.html">kostenlos herunterladen </a>
</form>
</div>
</li>
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index 87cd3f6..265a4ec 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -58,7 +58,6 @@
<p>
<button class="donateButton" name="submit" alt="Donate via PayPal"
type="submit">Donate & Download</button>
- or <a href="thanks-for-download.html">download for free </a>
</div>
<!-- download -->
@@ -170,7 +169,6 @@
<p>
<button class="donateButton" name="submit" alt="Donate via PayPal"
type="submit">Donate & Download</button>
- or <a href="thanks-for-download.html">download for free </a>
</form>
</div>
</li>
commit 84df412f63641db8096180fb7cfdfe01450b05f1
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Oct 13 16:41:31 2016 +0200
Added new sponsors (until 20160930)
diff --git a/web/SPONSORS-2016 b/web/SPONSORS-2016
index d996870..72f826f 100644
--- a/web/SPONSORS-2016
+++ b/web/SPONSORS-2016
@@ -32,5 +32,8 @@
<li> Philipp Offermann </li>
<li> Tomas Ramirez </li>
<li> gregg killingsworth </li>
+<li> Jack Keith Brennan </li>
+<li> Volker Johnen </li>
+<li> Tama Manigam </li>
</ul>
diff --git a/web/donate-de.htm4 b/web/donate-de.htm4
index e85ae3f..7c9e605 100644
--- a/web/donate-de.htm4
+++ b/web/donate-de.htm4
@@ -56,7 +56,7 @@ Eine Zusammenfassung der bisherigen Spenden finden Sie
Eine Zusammenfassung aller Spenden und die Spender der früheren
Jahren finden Sie <a href="https://wiki.gnupg.org/Gpg4win/donations">hier</a>.
- (Zuletzt aktualisiert: 2016/09/15)</p>
+ (Zuletzt aktualisiert: 2016/09/30)</p>
<h3>Spender 2016</h3>
<div class="sponsornames">
diff --git a/web/donate.htm4 b/web/donate.htm4
index bf20d01..f0299da 100644
--- a/web/donate.htm4
+++ b/web/donate.htm4
@@ -54,7 +54,7 @@ A summary of all previous donations you can find
the Gpg4win initiative and agreed to make their donation(s) public.
Donation details and the sponsor lists for previous years are to be found in
<a href="https://wiki.gnupg.org/Gpg4win/donations">the summary of donation</a>.
- (Last updated: 2016/09/15)</p>
+ (Last updated: 2016/09/30)</p>
<h3>Sponsors 2016</h3>
<div class="sponsornames">
commit f95e213b806605f6a2b22e1885bc914147006d53
Author: Emanuel Schuetze <emanuel at intevation.de>
Date: Thu Oct 13 16:38:53 2016 +0200
Use two different landing thanks pages for download/donate.
diff --git a/web/donation-form-de.htm4 b/web/donation-form-de.htm4
index 6817cc1..989341b 100644
--- a/web/donation-form-de.htm4
+++ b/web/donation-form-de.htm4
@@ -51,18 +51,19 @@
<input name="no_shipping" value="1" type="hidden">
<input name="no_note" value="1" type="hidden">
<input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
- <input name="return" value="https://gpg4win.org/thanks.html" type="hidden">
+ <input name="return" value="https://gpg4win.org/thanks-for-donation-de.html" type="hidden">
+ <input name="cancel_return" value="https://gpg4win.org/thanks-for-download-de.html" type="hidden">
<input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
<p>
<button class="donateButton" name="submit" alt="Spenden via PayPal"
type="submit">Spenden & Download</button>
- oder <a href="thanks.html">kostenlos herunterladen</a>
+ oder <a href="thanks-for-download-de.html">kostenlos herunterladen</a>
</div>
<!-- download -->
<div id="download_div">
<p>
- <a href="thanks.html">Gpg4win VERSION herunterladen</a> ohne zu spenden.
+ <a href="thanks-for-download-de.html">Gpg4win VERSION herunterladen</a> ohne zu spenden.
</p>
</div>
</form>
@@ -83,7 +84,7 @@
<p>
<img class="qrcode" src="img/bitcoin-qrcode.png">
<p>
- Nach Abschluss der Transaktion: <a href="thanks-de.html">Gpg4win VERSION herunterladen</a>
+ Nach Abschluss der Transaktion: <a href="thanks-for-download-de.html">Gpg4win VERSION herunterladen</a>
</div>
</li>
@@ -103,7 +104,7 @@
<a href="mailto:gpg4win-professional at intevation.de">Kontaktieren Sie uns</a>,
wenn Sie eine Rechnung benötigen (nur bei Beträgen ab 100,- EUR).
<p>
- Nach Abschluss der Überweisung: <a href="thanks-de.html">Gpg4win VERSION herunterladen</a>
+ Nach Abschluss der Überweisung: <a href="thanks-for-download-de.html">Gpg4win VERSION herunterladen</a>
</p>
</div>
</li>
@@ -160,14 +161,15 @@
<input name="no_shipping" value="1" type="hidden">
<input name="no_note" value="1" type="hidden">
<input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
- <input name="return" value="https://gpg4win.org/thanks.html" type="hidden">
+ <input name="return" value="https://gpg4win.org/thanks-for-donation-de.html" type="hidden">
+ <input name="cancel_return" value="https://gpg4win.org/thanks-for-download-de.html" type="hidden">
<input name="cbt" value="Gpg4win jetzt herunterladen!" type="hidden">
<input type="hidden" name="p3" value="1">
<input type="hidden" name="src" value="1">
<p>
<button class="donateButton" name="submit" alt="Spenden via PayPal"
type="submit">Spenden & Download</button>
- oder <a href="thanks-de.html">kostenlos herunterladen </a>
+ oder <a href="thanks-for-download-de.html">kostenlos herunterladen </a>
</form>
</div>
</li>
diff --git a/web/donation-form.htm4 b/web/donation-form.htm4
index b9ba5c6..87cd3f6 100644
--- a/web/donation-form.htm4
+++ b/web/donation-form.htm4
@@ -52,18 +52,19 @@
<input name="no_shipping" value="1" type="hidden">
<input name="no_note" value="1" type="hidden">
<input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
- <input name="return" value="https://gpg4win.org/thanks.html" type="hidden">
+ <input name="return" value="https://gpg4win.org/thanks-for-donation.html" type="hidden">
+ <input name="cancel_return" value="https://gpg4win.org/thanks-for-download.html" type="hidden">
<input name="cbt" value="Download Gpg4win now!" type="hidden">
<p>
<button class="donateButton" name="submit" alt="Donate via PayPal"
type="submit">Donate & Download</button>
- or <a href="thanks.html">download for free </a>
+ or <a href="thanks-for-download.html">download for free </a>
</div>
<!-- download -->
<div id="download_div">
<p>
- <a href="thanks.html">Download Gpg4win 2.3.2</a> without donation.
+ <a href="thanks-for-download.html">Download Gpg4win 2.3.2</a> without donation.
</p>
</div>
</form>
@@ -84,7 +85,7 @@
<p>
<img class="qrcode" src="img/bitcoin-qrcode.png">
<p>
- After making transfer: <a href="thanks.html">Download Gpg4win VERSION</a>
+ After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
</div>
</li>
@@ -104,7 +105,7 @@
Please <a href="mailto:gpg4win-professional at intevation.de">contact us</a>
if you need an invoice (for more than 100,- EUR/USD only).
<p>
- After making transfer: <a href="thanks.html">Download Gpg4win VERSION</a>
+ After making transfer: <a href="thanks-for-download.html">Download Gpg4win VERSION</a>
</p>
</div>
</li>
@@ -161,14 +162,15 @@
<input name="no_shipping" value="1" type="hidden">
<input name="no_note" value="1" type="hidden">
<input name="image_url" value="https://gpg4win.org/img/logo.png" type="hidden">
- <input name="return" value="https://gpg4win.org/thanks.html" type="hidden">
+ <input name="return" value="https://gpg4win.org/thanks-for-donation.html" type="hidden">
+ <input name="cancel_return" value="https://gpg4win.org/thanks-for-download.html" type="hidden">
<input name="cbt" value="Download Gpg4win now!" type="hidden">
<input type="hidden" name="p3" value="1">
<input type="hidden" name="src" value="1">
<p>
<button class="donateButton" name="submit" alt="Donate via PayPal"
type="submit">Donate & Download</button>
- or <a href="thanks.html">download for free </a>
+ or <a href="thanks-for-download.html">download for free </a>
</form>
</div>
</li>
diff --git a/web/thanks-de.htm4 b/web/thanks-for-donation-de.htm4
similarity index 78%
copy from web/thanks-de.htm4
copy to web/thanks-for-donation-de.htm4
index 846187f..2515757 100644
--- a/web/thanks-de.htm4
+++ b/web/thanks-for-donation-de.htm4
@@ -3,17 +3,17 @@ m4_include(`template.m4')
m4_dnl $Id$
m4_define(`DE')
-m4_define(`EN_FILE', `thanks.html')
+m4_define(`EN_FILE', `thanks-for-donation.html')
-m4_define(`TITLE', `Vielen Dank')
+m4_define(`TITLE', `Vielen Dank für Ihre Spende')
m4_define(`MAIN', `download')
-
+m4_define(`NO_DOWNLOAD_HEADER')
PAGE_START
<meta http-equiv="refresh" content="0; url=DOWNLOAD_URL">
<div id="intro">
- <h2>Vielen Dank for Ihr Interesse an Gpg4win.</h2>
+ <h2>Vielen Dank für Ihre Spende!</h2>
<p><small>Wenn der Download von Gpg4win VERSION nicht automatisch startet,
klicken Sie <a href="DOWNLOAD_URL">hier</a>.</small></p>
</div>
diff --git a/web/thanks.htm4 b/web/thanks-for-donation.htm4
similarity index 79%
copy from web/thanks.htm4
copy to web/thanks-for-donation.htm4
index 24ecbfa..f8df2c6 100644
--- a/web/thanks.htm4
+++ b/web/thanks-for-donation.htm4
@@ -3,17 +3,17 @@ m4_include(`template.m4')
m4_dnl $Id$
m4_define(`EN')
-m4_define(`DE_FILE', `thanks-de.html')
+m4_define(`DE_FILE', `thanks-for-donation-de.html')
-m4_define(`TITLE', `Thank you!')
+m4_define(`TITLE', `Thanks for donating')
m4_define(`MAIN', `download')
-
+m4_define(`NO_DOWNLOAD_HEADER')
PAGE_START
<meta http-equiv="refresh" content="0; url=DOWNLOAD_URL">
<div id="intro">
- <h2>Thank you for downloading Gpg4win.</h2>
+ <h2>Thank you very much for your donation!</h2>
<p><small>If the download of Gpg4win VERSION doesn't start automatically,
click <a href="DOWNLOAD_URL">here</a>.</small></p>
</div>
diff --git a/web/thanks-de.htm4 b/web/thanks-for-download-de.htm4
similarity index 77%
rename from web/thanks-de.htm4
rename to web/thanks-for-download-de.htm4
index 846187f..01932b2 100644
--- a/web/thanks-de.htm4
+++ b/web/thanks-for-download-de.htm4
@@ -3,17 +3,17 @@ m4_include(`template.m4')
m4_dnl $Id$
m4_define(`DE')
-m4_define(`EN_FILE', `thanks.html')
+m4_define(`EN_FILE', `thanks-for-download.html')
-m4_define(`TITLE', `Vielen Dank')
+m4_define(`TITLE', `Vielen Dank für Ihr Interesse')
m4_define(`MAIN', `download')
-
+m4_define(`NO_DOWNLOAD_HEADER')
PAGE_START
<meta http-equiv="refresh" content="0; url=DOWNLOAD_URL">
<div id="intro">
- <h2>Vielen Dank for Ihr Interesse an Gpg4win.</h2>
+ <h2>Vielen Dank für Ihr Interesse an Gpg4win.</h2>
<p><small>Wenn der Download von Gpg4win VERSION nicht automatisch startet,
klicken Sie <a href="DOWNLOAD_URL">hier</a>.</small></p>
</div>
diff --git a/web/thanks.htm4 b/web/thanks-for-download.htm4
similarity index 84%
rename from web/thanks.htm4
rename to web/thanks-for-download.htm4
index 24ecbfa..bb843e8 100644
--- a/web/thanks.htm4
+++ b/web/thanks-for-download.htm4
@@ -3,11 +3,11 @@ m4_include(`template.m4')
m4_dnl $Id$
m4_define(`EN')
-m4_define(`DE_FILE', `thanks-de.html')
+m4_define(`DE_FILE', `thanks-for-download-de.html')
-m4_define(`TITLE', `Thank you!')
+m4_define(`TITLE', `Thanks for downloading')
m4_define(`MAIN', `download')
-
+m4_define(`NO_DOWNLOAD_HEADER')
PAGE_START
<meta http-equiv="refresh" content="0; url=DOWNLOAD_URL">
-----------------------------------------------------------------------
Summary of changes:
web/SPONSORS-2016 | 3 +++
web/donate-de.htm4 | 2 +-
web/donate.htm4 | 2 +-
web/donation-form-de.htm4 | 14 +++++++-------
web/donation-form.htm4 | 14 +++++++-------
web/get-gpg4win-de.htm4 | 2 +-
web/get-gpg4win.htm4 | 2 +-
web/header.m4 | 14 +++++++++-----
web/{thanks-de.htm4 => thanks-for-donation-de.htm4} | 8 ++++----
web/{thanks.htm4 => thanks-for-donation.htm4} | 8 ++++----
web/{thanks-de.htm4 => thanks-for-download-de.htm4} | 8 ++++----
web/{thanks.htm4 => thanks-for-download.htm4} | 6 +++---
12 files changed, 45 insertions(+), 38 deletions(-)
copy web/{thanks-de.htm4 => thanks-for-donation-de.htm4} (78%)
copy web/{thanks.htm4 => thanks-for-donation.htm4} (79%)
rename web/{thanks-de.htm4 => thanks-for-download-de.htm4} (77%)
rename web/{thanks.htm4 => thanks-for-download.htm4} (84%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list