diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py
index ad424d8658282cc0ef0cafe00fa508d05c216629..38b5a91229e6c934df0c67ee278b4f7290fc1bee 100644
--- a/i2p2www/__init__.py
+++ b/i2p2www/__init__.py
@@ -23,7 +23,7 @@ except ImportError:
# Constants
CURRENT_I2P_VERSION = '1.5.0'
-CURRENT_I2P_FIREFOX_PROFILE_VERSION = '0.03'
+CURRENT_I2P_FIREFOX_PROFILE_VERSION = '1.05.0'
CANONICAL_DOMAIN = 'geti2p.net'
diff --git a/i2p2www/blog/2021/09/07/Level-Up-Encrypted-Leasesets.draft.rst b/i2p2www/blog/2021/09/07/Level-Up-Encrypted-Leasesets.rst
similarity index 100%
rename from i2p2www/blog/2021/09/07/Level-Up-Encrypted-Leasesets.draft.rst
rename to i2p2www/blog/2021/09/07/Level-Up-Encrypted-Leasesets.rst
diff --git a/i2p2www/blog/2021/09/15/i2p-jpackages.draft.rst b/i2p2www/blog/2021/09/15/i2p-jpackages.rst
similarity index 97%
rename from i2p2www/blog/2021/09/15/i2p-jpackages.draft.rst
rename to i2p2www/blog/2021/09/15/i2p-jpackages.rst
index 70c39d0f51d25b3c7700f0541a8b20fd9432cbc5..2b57acabebb6c1de3b7d8d930b36aaab38c081da 100644
--- a/i2p2www/blog/2021/09/15/i2p-jpackages.draft.rst
+++ b/i2p2www/blog/2021/09/15/i2p-jpackages.rst
@@ -74,7 +74,7 @@ makes setting up I2P on Mac OSX easier than it's ever been.
Get the dmg_.
-.. _dmg: https://geti2p.net/en/download/mac
+.. _dmg: /mac
{% trans -%}
The I2P of the future is Easy to Install
@@ -99,4 +99,4 @@ Windows.
Get the installer_.
-.. _installer: https://geti2p.net/en/download/nsis
+.. _installer: /nsis
diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py
index 4f5b9d0f9164eaabd8be7c584072988a54bfb46b..59c1f6ccacd3e492eabf6336406e7aaad50df7aa 100644
--- a/i2p2www/legacy.py
+++ b/i2p2www/legacy.py
@@ -20,6 +20,8 @@ LEGACY_FUNCTIONS_MAP={
'firefox': {'function': 'downloads_firefox', 'params': {}},
'lab': {'function': 'downloads_lab', 'params': {}},
'mac': {'function': 'downloads_mac', 'params': {}},
+ 'nsis': {'function': 'downloads_nsis', 'params': {}},
+ 'windows': {'function': 'downloads_windows', 'params': {}},
'download': {'function': 'downloads_list', 'params': {}},
'installation': {'function': 'downloads_list', 'params': {}},
'meetings': {'function': 'meetings_index', 'params': {}},
diff --git a/i2p2www/pages/downloads/firefox.html b/i2p2www/pages/downloads/firefox.html
index 0962573ef289d4ada33379cadd82e05a2ee8a5de..981099a3e4def33f3048b6baa0236dced099fdba 100644
--- a/i2p2www/pages/downloads/firefox.html
+++ b/i2p2www/pages/downloads/firefox.html
@@ -4,14 +4,15 @@
{% block content %}
<h1>{{ _('I2P Easy Install Bundle(Beta)') }}</h1>
-<p>{% trans -%}
+<p>{% trans nsis="/nsis" -%}
The I2P Firefox Browser Profile has been expanded into the new I2P Easy Install
Bundle, which is in Beta. If you already have an I2P Router installed, it is
still safe to use this installer to configure your I2P Browser. Your existing
I2P Settings will be left untouched. If you do not have an I2P router installed,
then you do not need to install I2P. This package will install I2P at the same
time it installs the browser profile. This page has been kept to document the
-motivations and design of the included Firefox profile.
+motivations and design of the included Firefox profile. To learn more about the
+new bundle, visit <a href="{{ nsis }}">The Easy-Install Bundle Page</a>.
{%- endtrans %}</p>
<h2>{{ _('I2P Firefox Browser Profile') }}</h2>
<p>{% trans -%}
@@ -38,8 +39,8 @@ just download and install <a href="{{ postfilename }}">this installer</a>.
{%- set name = 'Windows' -%}
{%- set icon = 'images/download/windows.png' -%}
-{%- set filename = 'I2P-Profile-Installer-%s.exe' -%}
-{%- set hash = '8eb1e9f69200a42192acabe4686bb3541f7f409b2f9702f2f9e5c6870515fa56' -%}
+{%- set filename = 'I2P-Profile-Installer-%s-signed.exe' -%}
+{%- set hash = 'eadb338a5895f73e6ed4985a9f7dfdac722f74c9bcdd0bd35957e7dcd5759a3a' -%}
{% call package_outer('windows', name, icon) %}
<div class = "file">
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index d6f2a9416dd78a583fa613602b1c39e95c9d058b..c02fd1a89e3cca18ad9548bd7246b522a4ec28ce 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -99,13 +99,19 @@ I2P connections.</p>
<h5>{%- trans %}I2P for Windows{%- endtrans %}</h5>
{% call package('windows') %}
<p>{% trans -%}
- Download the file and double-click to run it.
+ After installing Java, download the file and double-click to run it.
{%- endtrans %}</p>
<div class="file">
- <a class="default" href="{{ get_url('downloads_windows') }}">{% trans %}Here is a helpful guide to installing I2P for Windows.{% endtrans %}</a>
+ <p></p>
+ <a class="default" href="/nsis"><strong>{% trans %}It's now possible to install all
+ I2P components using a single package(No Java Required). To try out the new installer,
+ click here. I2P Easy-Install Bundle(Beta).{% endtrans %}</strong>{% trans %}This
+ bundle can also be used to configure a Firefox Profile. It will not interfere with an
+ existing I2P installation if one exists.{% endtrans %}</a>
</div>
<div class="file">
- <a class="default" href="/firefox">{% trans %}I2P Firefox Browser Profile{% endtrans %}</a>
+ <p></p>
+ <a class="default" href="{{ get_url('downloads_windows') }}">{% trans %}Here is a helpful guide to installing I2P for Windows using a separate Java installation and the classic installer.{% endtrans %}</a>
</div>
{% endcall %}
diff --git a/i2p2www/pages/downloads/nsis.html b/i2p2www/pages/downloads/nsis.html
index bcc45f4494ac65f1d8064c897c202463df5e7211..d4e64c4c399fe4a117cfc0e3aa93382d2d88be38 100644
--- a/i2p2www/pages/downloads/nsis.html
+++ b/i2p2www/pages/downloads/nsis.html
@@ -4,12 +4,13 @@
{% block content %}
<h1>{{ _('I2P Easy Install Bundle(Beta)') }}</h1>
-<p>{% trans -%}
+<p>{% trans firefox="/firefox" -%}
This is an "All-in-One" installer which includes the complete I2P desktop
software and all of it's dependencies in a single, easy-to-install package. It
is built on the premise that I2P should be easy, and that we should help our
users get their initial configuration in place instead of requiring an elaborate
-install process.
+install process. To learn more about the Firefox profile that comes bundled with
+this installer, visit <a href="{{ nsis }}">The Firefox Profile Page</a>.
{%- endtrans %}</p>
<h2>{{ _('Is it a Zero-Dependency I2P Browser?') }}</h2>
<p><strong>{% trans -%}
@@ -39,8 +40,8 @@ just download and install <a href="{{ postfilename }}">this installer</a>.
{%- set name = 'Windows' -%}
{%- set icon = 'images/download/windows.png' -%}
-{%- set filename = 'I2P-Profile-Installer-%s.exe' -%}
-{%- set hash = '8eb1e9f69200a42192acabe4686bb3541f7f409b2f9702f2f9e5c6870515fa56' -%}
+{%- set filename = 'I2P-Profile-Installer-%s-signed.exe' -%}
+{%- set hash = 'eadb338a5895f73e6ed4985a9f7dfdac722f74c9bcdd0bd35957e7dcd5759a3a' -%}
{% call package_outer('windows', name, icon) %}
<div class = "file">
diff --git a/i2p2www/pages/downloads/windows.html b/i2p2www/pages/downloads/windows.html
index 9a5ce6748c35185606a58d3466e07194c7220276..8d6f123b609bb7d96eee856492823d7702ab90c8 100644
--- a/i2p2www/pages/downloads/windows.html
+++ b/i2p2www/pages/downloads/windows.html
@@ -2,7 +2,14 @@
{% block title %}Microsoft Windows{% endblock %}
{% block accuratefor %}0.9.47{% endblock %}
{% block content %}
-<h1>{{ _('Installing I2P, its dependencies, and recommended external software on Windows 10') }}</h1>
+<h1>{{ _('Separately Installing I2P, its dependencies, and recommended external software on Windows 10(The Long Way)') }}</h1>
+
+<p><strong>{% trans -%}This is the long way of installing I2P for Windows, using the IzPack based
+installer and a separate Java Virtual Machine installed on the host. If you're new to I2P, you may
+want to try the Beta installer, which requires fewer total steps and automatically configures a JVM,
+I2P, and sets up a Firefox Profile in a single step.{%- endtrans %}</strong></p>
+
+<p><strong><a href="/en/download/nsis">{% trans -%}Follow this link to the beta installer{%- endtrans %}</a></strong><p>
<p>{% trans -%}This is a detailed, step-by-step guide to installing and configuring I2P, including
all dependencies and setting up a browser, on a new Windows 10 system. Many users
diff --git a/i2p2www/sitemap.py b/i2p2www/sitemap.py
index 77202a041f469173ee628e10ac38ed51365b7d97..27066bb97c19b0be9f981e35129129df7ce5f731 100644
--- a/i2p2www/sitemap.py
+++ b/i2p2www/sitemap.py
@@ -118,7 +118,12 @@ def render_sitemap():
urls.append({
'path': '/download/mac',
})
-
+ urls.append({
+ 'path': '/download/nsis',
+ })
+ urls.append({
+ 'path': '/download/windows',
+ })
# Render and return the sitemap
response = make_response(render_template('global/sitemap.xml', url_root=url_root, langs=LANG_FRAGS,
curlang=to_url(g.lang), urls=urls))