[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-363-g11fe5c6
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Mar 8 13:43:10 CET 2018
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 11fe5c63204bd5c97d5b7e02d560cf9361b6daa8 (commit)
via 1daf1eb4d29c2ef464f61de55af2075d43927b32 (commit)
from 85009a709c52f6ef1faa9cd49602b148b03c3651 (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 11fe5c63204bd5c97d5b7e02d560cf9361b6daa8
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Mar 8 13:42:27 2018 +0100
Improve beta page
* What's new in Version 3 is back in the header
* Link to 3.1 in download style below the download button.
diff --git a/web/gpg4win.css b/web/gpg4win.css
index 696f1c4..5931796 100644
--- a/web/gpg4win.css
+++ b/web/gpg4win.css
@@ -116,16 +116,15 @@ td {
}
#download_button_mini {
- float:right;
- text-align:right;
- width: 189px;
- height: 75px;
- line-height: 100%;
+ position: relative;
+ top: 45px;
+ left: 35px;
+ width: 250px;
+ z-index: 0;
}
#download_button_mini .links {
position: relative;
- top: -13px;
font-size: 10px;
text-align: right;
}
@@ -137,7 +136,8 @@ td {
height: 50px;
width: 189px;
text-align:left;
- font-size: 11px;
+ left: 20px;
+ font-size: 14px;
line-height:50px;
color: #FFFFFF;
font-weight:bold;
diff --git a/web/header.m4 b/web/header.m4
index 315fee0..6e6ff29 100644
--- a/web/header.m4
+++ b/web/header.m4
@@ -24,6 +24,18 @@
<a href="package-integrity-de.html">Integrität prüfen</a>', `
<a href="package-integrity.html">Check integrity</a>')
</div>
+ <br/>
+ <div id="download_button_mini">
+ m4_ifelse(LANG_DE, `1', `
+ <a class="dmini_button" href="version3.1-de.html">
+ <span class="text">
+ Try BETA_VERSION
+ </span></a>', `
+ <a class="dmini_button" href="version3.1.html">
+ <span class="text">
+ Try BETA_VERSION
+ </span></a>')
+ </div>
<div class="h_text">
<p><span class="heading">News</span></p>
<small>2018-03-08</small><br>
@@ -73,5 +85,5 @@
m4_ifelse(MAIN, `donate', `Donate')
')
</div>
- <div id="download_button_mini"></div></div><br clear="all" />
+ </div><br clear="all" />
')
diff --git a/web/template_header.m4 b/web/template_header.m4
index 1fbaa66..1c1a03b 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -40,7 +40,7 @@ m4_define(`RQ',`m4_changequote(<,>)m4_dnl`
m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
</li>
<li class="mwhatsnew">
- m4_ifelse(LANG_DE, `1', `<a href="version3.1-de.html" title="Was ist in Version 3.1 neu"><div>Was ist neu</br>Version 3.1</div></a>', `<a href="version3.1.html" title="What is new in version 3.1"><div>What`'RQ()s new</br>Version 3.1</div></a>')
+ m4_ifelse(LANG_DE, `1', `<a href="version3-de.html" title="Was ist in Version 3 neu"><div>Was ist neu</br>Version 3</div></a>', `<a href="version3.html" title="What is new in version 3"><div>What`'RQ()s new</br>Version 3</div></a>')
</li>
<li class="mbetween">
m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
diff --git a/web/version3.1-de.htm4 b/web/version3.1-de.htm4
index 82a05c1..813fbe6 100644
--- a/web/version3.1-de.htm4
+++ b/web/version3.1-de.htm4
@@ -11,20 +11,15 @@ m4_define(`MAIN', `version3.1')
PAGE_START
<div id="intro">
-<h2>Was ändert sich mit Gpg4win 3.1?</h2>
+<h2>Was kommt mit Gpg4win 3.1?</h2>
</div>
<div id="main">
-Wenn Sie von Gpg4win 2 aktualisieren schauen Sie auch:
-<a href="version3.html">Was in Gpg4win 3 neu ist</a>.
-
<br/>
m4_ifelse(LANG_DE, `1',
-`<h2>Beta Download</h2>
Gpg4win 3.1.0 ist aktuell im Beta Stadium.<br/>Sie können die Entwicklung unterstützen indem Sie es
ausprobieren und Probleme in unserem
<a href="https://dev.gnupg.org/u/gpg4win">Entwicklungs tracker</a> melden.',
-`<h2>Beta Download</h2>
Gpg4win 3.1.0 is currently in beta.<br/>You can help by trying it out and reporting issues in our
<a href="https://dev.gnupg.org/u/gpg4win">development tracker</a>')
@@ -32,11 +27,11 @@ Gpg4win 3.1.0 is currently in beta.<br/>You can help by trying it out and report
m4_ifelse(LANG_DE, `1', `
<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
<span class="text">
- Download<br />BETA_VERSION
+ Download<br/>Gpg4win<br/>BETA_VERSION
</span></a>', `
<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
<span class="text">
- Download<br />BETA_VERSION
+ Download<br/>Gpg4win<br/>BETA_VERSION
</span></a>')
</div>
<div class="download_button_links">
@@ -79,6 +74,6 @@ resolver</img>
<li>Mehrere Stabilitätsverbesserungen.</li>
</ul>
-<img src="https://files.intevation.de/users/aheinecke/notepad-en.gif">Der neue Notizblock</img>
+<img width="150%" src="https://files.intevation.de/users/aheinecke/notepad-en.gif">Der neue Notizblock</img>
</div>
diff --git a/web/version3.1.htm4 b/web/version3.1.htm4
index 3d4127b..e98f2b6 100644
--- a/web/version3.1.htm4
+++ b/web/version3.1.htm4
@@ -11,21 +11,15 @@ m4_define(`MAIN', `version3.1')
PAGE_START
<div id="intro">
-<h2>What's new in Gpg4win 3.1?</h2>
+<h2>What's coming with Gpg4win 3.1?</h2>
</div>
<div id="main">
-When updating from Gpg4win 2 please also see:
-<a href="version3.html">What's new in Gpg4win 3</a>.
-
-<br/>
m4_ifelse(LANG_DE, `1',
-`<h2>Beta Download</h2>
Gpg4win 3.1.0 ist aktuell im Beta Stadium.<br/>Sie können die Entwicklung unterstützen indem Sie es
ausprobieren und Probleme in unserem
<a href="https://dev.gnupg.org/u/gpg4win">Entwicklungs tracker</a> melden.',
-`<h2>Beta Download</h2>
Gpg4win 3.1.0 is currently in beta.<br/>You can help by trying it out and reporting issues in our
<a href="https://dev.gnupg.org/u/gpg4win">development tracker</a>')
@@ -33,11 +27,11 @@ Gpg4win 3.1.0 is currently in beta.<br/>You can help by trying it out and report
m4_ifelse(LANG_DE, `1', `
<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
<span class="text">
- Download<br />BETA_VERSION
+ Download<br/>Gpg4win<br/>BETA_VERSION
</span></a>', `
<a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
<span class="text">
- Download<br />BETA_VERSION
+ Download<br/>Gpg4win<br/>BETA_VERSION
</span></a>')
</div>
<div class="download_button_links">
@@ -80,6 +74,6 @@ resolver</img>
<li>Multiple stability improvements.</li>
</ul>
-<img src="https://files.intevation.de/users/aheinecke/notepad.gif">The new Notepad</img>
+<img width="150%" src="https://files.intevation.de/users/aheinecke/notepad.gif">The new Notepad</img>
</div>
commit 1daf1eb4d29c2ef464f61de55af2075d43927b32
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Mar 8 12:19:01 2018 +0100
Add version 3.1 whats new and beta download
--
diff --git a/web/header.m4 b/web/header.m4
index 21ccc8c..315fee0 100644
--- a/web/header.m4
+++ b/web/header.m4
@@ -26,24 +26,23 @@
</div>
<div class="h_text">
<p><span class="heading">News</span></p>
- <small>2018-01-12</small><br>
+ <small>2018-03-08</small><br>
<span class="serif_word"><img src="img/bulletin.png" alt"" />
m4_ifelse(LANG_DE, `1', `
- <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-January/000040.html">
- Gpg4win 3.0.3 veröffentlicht
+ <a href="version3.1-de.html">Gpg4win 3.1.0-beta veröffentlicht
</a></span>',`
- <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-January/000076.html">
- Gpg4win 3.0.3 released
+ <a href="version3.1.html">
+ Gpg4win 3.1.0-beta released
</a></span>')
<p></p>
- <small>2017-12-08</small><br>
+ <small>2018-01-12</small><br>
<span class="serif_word"><img src="img/bulletin.png" alt"" />
m4_ifelse(LANG_DE, `1', `
- <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2017-December/000039.html">
- Gpg4win 3.0.2 veröffentlicht
+ <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-January/000040.html">
+ Gpg4win 3.0.3 veröffentlicht
</a></span>',`
- <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2017-December/000075.html">
- Gpg4win 3.0.2 released
+ <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-January/000076.html">
+ Gpg4win 3.0.3 released
</a></span>')
<p></p>
<div class="limiter"></div>
diff --git a/web/template_header.m4 b/web/template_header.m4
index 1c1a03b..1fbaa66 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -40,7 +40,7 @@ m4_define(`RQ',`m4_changequote(<,>)m4_dnl`
m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
</li>
<li class="mwhatsnew">
- m4_ifelse(LANG_DE, `1', `<a href="version3-de.html" title="Was ist in Version 3 neu"><div>Was ist neu</br>Version 3</div></a>', `<a href="version3.html" title="What is new in version 3"><div>What`'RQ()s new</br>Version 3</div></a>')
+ m4_ifelse(LANG_DE, `1', `<a href="version3.1-de.html" title="Was ist in Version 3.1 neu"><div>Was ist neu</br>Version 3.1</div></a>', `<a href="version3.1.html" title="What is new in version 3.1"><div>What`'RQ()s new</br>Version 3.1</div></a>')
</li>
<li class="mbetween">
m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
diff --git a/web/version3.1-de.htm4 b/web/version3.1-de.htm4
new file mode 100644
index 0000000..82a05c1
--- /dev/null
+++ b/web/version3.1-de.htm4
@@ -0,0 +1,84 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`DE')
+m4_define(`EN_FILE', `version3.1.html')
+
+m4_define(`TITLE', `Was ist neu in Version 3.1')
+m4_define(`MAIN', `version3.1')
+
+PAGE_START
+
+<div id="intro">
+<h2>Was ändert sich mit Gpg4win 3.1?</h2>
+</div>
+<div id="main">
+
+Wenn Sie von Gpg4win 2 aktualisieren schauen Sie auch:
+<a href="version3.html">Was in Gpg4win 3 neu ist</a>.
+
+<br/>
+m4_ifelse(LANG_DE, `1',
+`<h2>Beta Download</h2>
+Gpg4win 3.1.0 ist aktuell im Beta Stadium.<br/>Sie können die Entwicklung unterstützen indem Sie es
+ausprobieren und Probleme in unserem
+<a href="https://dev.gnupg.org/u/gpg4win">Entwicklungs tracker</a> melden.',
+`<h2>Beta Download</h2>
+Gpg4win 3.1.0 is currently in beta.<br/>You can help by trying it out and reporting issues in our
+<a href="https://dev.gnupg.org/u/gpg4win">development tracker</a>')
+
+<div id="download_button">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+ <span class="text">
+ Download<br />BETA_VERSION
+ </span></a>', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+ <span class="text">
+ Download<br />BETA_VERSION
+ </span></a>')
+</div>
+<div class="download_button_links">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signatur</a>', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signature</a>')
+</div>
+<br/>
+<br/>
+<br/>
+
+<h2>Outlook Plugin (GpgOL)</h2>
+
+<p>Verschlüsseln / Signieren überarbeitet:</p>
+<ul>
+ <li>
+ Robustere Verschlüsselung.
+ </li>
+ <li>
+ Neue Benutzerschnittstelle für die Öschl Auswahl.
+ </li>
+ <li>
+ Verbesserte automatische Schlüsselauswahl mit weniger Interaktion.
+ </li>
+ <li>
+ Verbesserte Exchange unterstützung und viele Fehlerkorrekturen.
+ </li>
+ <li>
+ Basisunterstützung für Web Key Verzeichnisse.
+ </li>
+</ul>
+
+<img src="https://files.intevation.de/users/aheinecke/resolve-recipients-de.gif">The new Pubkey
+resolver</img>
+
+<h2>Krypto-Manager (Kleopatra)</h2>
+<ul>
+ <li>Neue Text basierte Krypto Ansicht.</li>
+ <li>Unterstützung für Heimatverzeichnisse im Netzwerk.</li>
+ <li>Mehrere Stabilitätsverbesserungen.</li>
+</ul>
+
+<img src="https://files.intevation.de/users/aheinecke/notepad-en.gif">Der neue Notizblock</img>
+
+</div>
diff --git a/web/version3.1.htm4 b/web/version3.1.htm4
new file mode 100644
index 0000000..3d4127b
--- /dev/null
+++ b/web/version3.1.htm4
@@ -0,0 +1,85 @@
+m4_dnl -*-html-*-
+m4_include(`template.m4')
+m4_dnl $Id$
+
+m4_define(`EN')
+m4_define(`DE_FILE', `version3.1-de.html')
+
+m4_define(`TITLE', `What's new - Version 3.1')
+m4_define(`MAIN', `version3.1')
+
+PAGE_START
+
+<div id="intro">
+<h2>What's new in Gpg4win 3.1?</h2>
+</div>
+
+<div id="main">
+
+When updating from Gpg4win 2 please also see:
+<a href="version3.html">What's new in Gpg4win 3</a>.
+
+<br/>
+m4_ifelse(LANG_DE, `1',
+`<h2>Beta Download</h2>
+Gpg4win 3.1.0 ist aktuell im Beta Stadium.<br/>Sie können die Entwicklung unterstützen indem Sie es
+ausprobieren und Probleme in unserem
+<a href="https://dev.gnupg.org/u/gpg4win">Entwicklungs tracker</a> melden.',
+`<h2>Beta Download</h2>
+Gpg4win 3.1.0 is currently in beta.<br/>You can help by trying it out and reporting issues in our
+<a href="https://dev.gnupg.org/u/gpg4win">development tracker</a>')
+
+<div id="download_button">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+ <span class="text">
+ Download<br />BETA_VERSION
+ </span></a>', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe">
+ <span class="text">
+ Download<br />BETA_VERSION
+ </span></a>')
+</div>
+<div class="download_button_links">
+ m4_ifelse(LANG_DE, `1', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signatur</a>', `
+ <a href="https://files.gpg4win.org/Beta/gpg4win-BETA_VERSION/gpg4win-BETA_VERSION.exe.sig">Signature</a>')
+</div>
+<br/>
+<br/>
+<br/>
+
+<h2>Outlook Plugin (GpgOL)</h2>
+
+<p>overhauled encrypt / signing:</p>
+<ul>
+ <li>
+ More robust encryption, avoiding to freeze outlook.
+ </li>
+ <li>
+ New user interface pubkey selection.
+ </li>
+ <li>
+ Improved automatic pubkey selection, requiring less interaction by default.
+ </li>
+ <li>
+ Better Exchange support and many bugfixes.
+ </li>
+ <li>
+ Basic Web Key publishing support.
+ </li>
+</ul>
+
+<img src="https://files.intevation.de/users/aheinecke/resolve-recipients-de.gif">The new Pubkey
+resolver</img>
+
+<h2>Crypto-Manager (Kleopatra)</h2>
+<ul>
+ <li>New text based crypto interface.</li>
+ <li>Support for redirected homedirs.</li>
+ <li>Multiple stability improvements.</li>
+</ul>
+
+<img src="https://files.intevation.de/users/aheinecke/notepad.gif">The new Notepad</img>
+
+</div>
diff --git a/web/versions.m4 b/web/versions.m4
index ce34f2a..d635317 100644
--- a/web/versions.m4
+++ b/web/versions.m4
@@ -32,3 +32,6 @@ m4_define(`COMPENDIUM_VERSION_EN',`3.0.0')
m4_define(`COMPENDIUM_DATE_EN',`2016-11-30')
m4_define(`DOWNLOAD_URL_COMPENDIUM_EN',`https://files.gpg4win.org/doc/gpg4win-compendium-en.pdf')
m4_define(`DL_SIZE_COMPENDIUM_EN',`3 MByte')
+
+m4_define(`BETA_VERSION', `3.1.0-beta22')
+m4_define(`BETA_SIZE', `27 MByte')
-----------------------------------------------------------------------
Summary of changes:
web/gpg4win.css | 14 ++++-----
web/header.m4 | 33 ++++++++++++++-------
web/version3.1-de.htm4 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
web/version3.1.htm4 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
web/versions.m4 | 3 ++
5 files changed, 190 insertions(+), 18 deletions(-)
create mode 100644 web/version3.1-de.htm4
create mode 100644 web/version3.1.htm4
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list