diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py index 44421ebe313732a506feb5ba7f6e57655126c042..031d85b74a5b12fd74f1b8486e222f4e183f3aff 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 f507b4519041f85cd22d9408825947a4ac14f556..013c9d5ecd45a941482533eaa337e84f79d47a4a 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 8d6f123b609bb7d96eee856492823d7702ab90c8..081b7bda28d38a7a5ebba60461c0cb3d1528587d 100644 --- a/i2p2www/pages/downloads/windows.html +++ b/i2p2www/pages/downloads/windows.html @@ -131,7 +131,11 @@ and configure Firefox for I2P.{%- endtrans %} </p> <h4>{{ _('Install the I2P Firefox Profile') }}</h4> <ol> -<li>{% trans -%}Download the Firefox Profile Bundle from the I2P Web Site.{%- endtrans %} +<li>{% 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 %} <ul style="list-style-type: none;"> <li><img src="/_static/images/download/windows/profile.png" alt="Grab the Firefox Profile" title="" /></li> </ul></li> diff --git a/i2p2www/sitemap.py b/i2p2www/sitemap.py index 245884056e102f68c711d3d7ca92938990000a5e..1db626aeca88d8f58191af74444bed332c97b65d 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 c8d95b3147f22e11e10aa22f1292281fb584f7ac..ac0b89d4204690b920440e7759a2f794a14d8d97 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 a39b73c924e54681a81646350f2ce6ff1ff73e10..c8d95b3147f22e11e10aa22f1292281fb584f7ac 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 949b256ecf1d85034803cfd8db96ab13628a8cf9..22b5ad38cf6e3d44364b2b2058007d033ecc5b7a 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 22b5ad38cf6e3d44364b2b2058007d033ecc5b7a..17f74bf1839bbc11aa0eff3448d57fccb8896559 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 17f74bf1839bbc11aa0eff3448d57fccb8896559..0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..cb0dabccf611d2f07870aa560829dc7731fff847 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 a6a3b8581a0107df85be3b41922da7cee4186884..a39b73c924e54681a81646350f2ce6ff1ff73e10 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 cb0dabccf611d2f07870aa560829dc7731fff847..b99776e875d55120b504a1397d521032e48a1fc2 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 916504be04094066dff5fea9653b828dca5e76f3..a6a3b8581a0107df85be3b41922da7cee4186884 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 b99776e875d55120b504a1397d521032e48a1fc2..29b20cc8eed7cbcca362e5503f87ee7bf52357bb 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 3b8fbc90c3506c58f529b7e9250dfb434fa4e290..916504be04094066dff5fea9653b828dca5e76f3 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 29b20cc8eed7cbcca362e5503f87ee7bf52357bb..d73db7a41eed1334689ce657fcc90103782ba58e 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 0000000000000000000000000000000000000000..3b8fbc90c3506c58f529b7e9250dfb434fa4e290 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 d73db7a41eed1334689ce657fcc90103782ba58e..0777be49671747bd2a592dd7648efeae3909db0e 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 0777be49671747bd2a592dd7648efeae3909db0e..80be1274d24ed0040a8409286c61632ef6cc551e 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 80be1274d24ed0040a8409286c61632ef6cc551e..7dc883a8f26039e20660c15a4fbad76bbf2690da 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 7dc883a8f26039e20660c15a4fbad76bbf2690da..949b256ecf1d85034803cfd8db96ab13628a8cf9 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 fe0486bc434f60096e6522373d355a7f502f16a6..fd83b52786ab4c6327b8ca09d00098e4f50a2b4d 100644 --- a/i2p2www/urls.py +++ b/i2p2www/urls.py @@ -92,6 +92,7 @@ url('/<lang:lang>/download', 'downloads.downloads_list') url('/<lang:lang>/download/debian', 'downloads.downloads_debian') url('/<lang:lang>/download/docker', 'downloads.downloads_docker') url('/<lang:lang>/download/windows', 'downloads.downloads_windows') +url('/<lang:lang>/download/macos', 'downloads.downloads_macos') url('/<lang:lang>/download/easyinstall', 'downloads.downloads_easyinstall') url('/<lang:lang>/download/nsis', 'downloads.downloads_easyinstall') url('/<lang:lang>/download/firefox', 'downloads.downloads_firefox')