diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py index 44421ebe..031d85b7 100644 --- a/i2p2www/downloads.py +++ b/i2p2www/downloads.py @@ -90,6 +90,10 @@ def downloads_debian(): def downloads_windows(): return render_template('downloads/windows.html') +# MacOS-specific page +def downloads_macos(): + return render_template('downloads/macos.html') + # AIO-Windows-specific page def downloads_easyinstall(): # TODO: read mirror list or list of available files diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py index f507b451..013c9d5e 100644 --- a/i2p2www/legacy.py +++ b/i2p2www/legacy.py @@ -23,6 +23,7 @@ LEGACY_FUNCTIONS_MAP={ 'easyinstall': {'function': 'downloads_easyinstall', 'params': {}}, 'nsis': {'function': 'downloads_easyinstall', 'params': {}}, 'windows': {'function': 'downloads_windows', 'params': {}}, + 'macos': {'function': 'downloads_macos', 'params': {}}, 'download': {'function': 'downloads_list', 'params': {}}, 'installation': {'function': 'downloads_list', 'params': {}}, 'meetings': {'function': 'meetings_index', 'params': {}}, diff --git a/i2p2www/pages/downloads/windows.html b/i2p2www/pages/downloads/windows.html index 8d6f123b..081b7bda 100644 --- a/i2p2www/pages/downloads/windows.html +++ b/i2p2www/pages/downloads/windows.html @@ -131,7 +131,11 @@ and configure Firefox for I2P.{%- endtrans %}

{{ _('Install the I2P Firefox Profile') }}

    -
  1. {% trans -%}Download the Firefox Profile Bundle from the I2P Web Site.{%- endtrans %} +
  2. {% trans -%} + Download the Firefox Profile Bundle from the I2P Web Site. + The I2P Firefox Profile has been replaced by the Easy Install Bundle for Windows. + The Easy-Installl can still be used as a profile manager for an Un-Bundled I2P router installed via this procedure. + {%- endtrans %}
  3. diff --git a/i2p2www/sitemap.py b/i2p2www/sitemap.py index 24588405..1db626ae 100644 --- a/i2p2www/sitemap.py +++ b/i2p2www/sitemap.py @@ -124,6 +124,9 @@ def render_sitemap(): urls.append({ 'path': '/download/windows', }) + urls.append({ + 'path': '/download/macos', + }) # 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)) diff --git a/i2p2www/static/images/macos/0-jre.png b/i2p2www/static/images/macos/0-jre.png index c8d95b31..ac0b89d4 100644 Binary files a/i2p2www/static/images/macos/0-jre.png and b/i2p2www/static/images/macos/0-jre.png differ diff --git a/i2p2www/static/images/macos/1-jre.png b/i2p2www/static/images/macos/1-jre.png index a39b73c9..c8d95b31 100644 Binary files a/i2p2www/static/images/macos/1-jre.png and b/i2p2www/static/images/macos/1-jre.png differ diff --git a/i2p2www/static/images/macos/10-i2p.png b/i2p2www/static/images/macos/10-i2p.png index 949b256e..22b5ad38 100644 Binary files a/i2p2www/static/images/macos/10-i2p.png and b/i2p2www/static/images/macos/10-i2p.png differ diff --git a/i2p2www/static/images/macos/11-i2p.png b/i2p2www/static/images/macos/11-i2p.png index 22b5ad38..17f74bf1 100644 Binary files a/i2p2www/static/images/macos/11-i2p.png and b/i2p2www/static/images/macos/11-i2p.png differ diff --git a/i2p2www/static/images/macos/12-i2p.png b/i2p2www/static/images/macos/12-i2p.png deleted file mode 100644 index 17f74bf1..00000000 Binary files a/i2p2www/static/images/macos/12-i2p.png and /dev/null differ diff --git a/i2p2www/static/images/macos/2-i2p.png b/i2p2www/static/images/macos/2-i2p.png new file mode 100644 index 00000000..cb0dabcc Binary files /dev/null and b/i2p2www/static/images/macos/2-i2p.png differ diff --git a/i2p2www/static/images/macos/2-jre.png b/i2p2www/static/images/macos/2-jre.png index a6a3b858..a39b73c9 100644 Binary files a/i2p2www/static/images/macos/2-jre.png and b/i2p2www/static/images/macos/2-jre.png differ diff --git a/i2p2www/static/images/macos/3-i2p.png b/i2p2www/static/images/macos/3-i2p.png index cb0dabcc..b99776e8 100644 Binary files a/i2p2www/static/images/macos/3-i2p.png and b/i2p2www/static/images/macos/3-i2p.png differ diff --git a/i2p2www/static/images/macos/3-jre.png b/i2p2www/static/images/macos/3-jre.png index 916504be..a6a3b858 100644 Binary files a/i2p2www/static/images/macos/3-jre.png and b/i2p2www/static/images/macos/3-jre.png differ diff --git a/i2p2www/static/images/macos/4-i2p.png b/i2p2www/static/images/macos/4-i2p.png index b99776e8..29b20cc8 100644 Binary files a/i2p2www/static/images/macos/4-i2p.png and b/i2p2www/static/images/macos/4-i2p.png differ diff --git a/i2p2www/static/images/macos/4-jre.png b/i2p2www/static/images/macos/4-jre.png index 3b8fbc90..916504be 100644 Binary files a/i2p2www/static/images/macos/4-jre.png and b/i2p2www/static/images/macos/4-jre.png differ diff --git a/i2p2www/static/images/macos/5-i2p.png b/i2p2www/static/images/macos/5-i2p.png index 29b20cc8..d73db7a4 100644 Binary files a/i2p2www/static/images/macos/5-i2p.png and b/i2p2www/static/images/macos/5-i2p.png differ diff --git a/i2p2www/static/images/macos/5-jre.png b/i2p2www/static/images/macos/5-jre.png new file mode 100644 index 00000000..3b8fbc90 Binary files /dev/null and b/i2p2www/static/images/macos/5-jre.png differ diff --git a/i2p2www/static/images/macos/6-i2p.png b/i2p2www/static/images/macos/6-i2p.png index d73db7a4..0777be49 100644 Binary files a/i2p2www/static/images/macos/6-i2p.png and b/i2p2www/static/images/macos/6-i2p.png differ diff --git a/i2p2www/static/images/macos/7-i2p.png b/i2p2www/static/images/macos/7-i2p.png index 0777be49..80be1274 100644 Binary files a/i2p2www/static/images/macos/7-i2p.png and b/i2p2www/static/images/macos/7-i2p.png differ diff --git a/i2p2www/static/images/macos/8-i2p.png b/i2p2www/static/images/macos/8-i2p.png index 80be1274..7dc883a8 100644 Binary files a/i2p2www/static/images/macos/8-i2p.png and b/i2p2www/static/images/macos/8-i2p.png differ diff --git a/i2p2www/static/images/macos/9-i2p.png b/i2p2www/static/images/macos/9-i2p.png index 7dc883a8..949b256e 100644 Binary files a/i2p2www/static/images/macos/9-i2p.png and b/i2p2www/static/images/macos/9-i2p.png differ diff --git a/i2p2www/urls.py b/i2p2www/urls.py index fe0486bc..fd83b527 100644 --- a/i2p2www/urls.py +++ b/i2p2www/urls.py @@ -92,6 +92,7 @@ url('//download', 'downloads.downloads_list') url('//download/debian', 'downloads.downloads_debian') url('//download/docker', 'downloads.downloads_docker') url('//download/windows', 'downloads.downloads_windows') +url('//download/macos', 'downloads.downloads_macos') url('//download/easyinstall', 'downloads.downloads_easyinstall') url('//download/nsis', 'downloads.downloads_easyinstall') url('//download/firefox', 'downloads.downloads_firefox')