diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py index f2d731b52b17d6529642f2bd58a2801c48c4602e..9554d57a40fa35cbc73fdd55084896ba32a5cec3 100644 --- a/i2p2www/downloads.py +++ b/i2p2www/downloads.py @@ -79,6 +79,9 @@ def downloads_firefox(): def downloads_lab(): return render_template('downloads/lab.html') +def downloads_config(): + return render_template('downloads/config.html') + # Specific file downloader def downloads_select(version, file): mirrors=read_mirrors() diff --git a/i2p2www/pages/downloads/browser-content.html b/i2p2www/pages/downloads/browser-content.html new file mode 100644 index 0000000000000000000000000000000000000000..21d74d342c58057cf2909ad6ec77fa786a6c8786 --- /dev/null +++ b/i2p2www/pages/downloads/browser-content.html @@ -0,0 +1,142 @@ +<p>{% trans -%} +Your web browser will need to be configured in order to browse web sites on I2P +and to utilize the outproxies available within I2P. Below are walkthroughs for +some of the most popular browsers. +{%- endtrans %}</p> + +<h2>{{ _('Firefox Profile for Windows') }}</h2> +<p>{% trans profile='/firefox' -%} +If you are using Windows, the recommended way of accessing I2P is using the +<a href='{{ profile }}'>Firefox profile</a>. +{%- endtrans %}</p> +<p>{% trans -%} +If you do not wish to use that profile or are not on Windows, you need to +configure your browser yourself. Read below on how to that. +{%- endtrans %}</p> + +<h2>{{ _('How to configure your browser') }}</h2> + +<ul> + <li><a href="#firefox">Firefox</a></li> + <li><a href="#chrome">Chrome</a></li> + <li><a href="#ie8">Internet Explorer 8</a></li> + <li><a href="#TOS">{{ _('Outproxy Terms Of Service') }}</a></li> +</ul> + +<a name="firefox"></a> +<h3>Firefox</h3> +<h4>{% trans %}Instructions for Firefox 57 and above:{% endtrans %}</h4> +<p>{% trans -%} +From the Menu button in the top right, select <em>Preferences</em>. +Scroll down until you see the <em>Network Proxy</em> section, as shown in the +screenshot below. Click on <em>Settings</em> +{%- endtrans %}</p> +<img src="{{ url_for('static', filename='images/firefox57.preferences.png') }}" +alt="{{ _('Firefox57 Network Options') }}" title="{{ _('Firefox57 Network Options') }}"> +<p>{% trans -%} +In the <em>Connection Settings</em> pop-up, select <em>Manual proxy + configuration</em>. Set both the HTTP and SSL Proxy to address +<code>127.0.0.1</code> with port <code>4444</code> as shown in the following +screenshot. +{%- endtrans %}</p> +<img src="{{ url_for('static', +filename='images/firefox57.connectionsettings.png') }}" alt="{{ _('Firefox57 +Connection Settings') }}" title="{{ _('Firefox57 Connection Settings') }}"> +<p>{% trans -%} +Finally, go to the address <em>about:config</em> and find the property +media.peerConnection.ice.proxy_only. Ensure that this setting is True. +{%- endtrans %}</p> +<img src="{{ url_for('static', +filename='images/firefox.webrtc.png') }}" alt="{{ _('Firefox57 +PeerConnection Settings') }}" title="{{ _('Firefox57 PeerConnection Settings') }}"> +<!--<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4> +<p>{% trans %}A new way of automatically configuring the I2P Browser is +currently being tested. It uses the Firefox's "Container Tabs" to build private +browsing tools for use with I2P and I2P applications.{% endtrans %}</p> +<p>{% trans %}It does pre-configuration of your browser by enabling some of +the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy +obedience. It also contains menus, shortcuts, and monitoring tools improving +Firefox's integration with I2P. It is a by-product of the I2P Browser project. +{% endtrans %}</p> +<p>{% trans %}The extension, <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>, +can be obtained from the Mozilla addon store or any of these mirrors: +{% endtrans %}</p> +<ul> + <li><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases">{% trans %}Github Releases{% endtrans %}</a></li> + <li><a href="http://idk.i2p/I2P-in-Private-Browsing-Mode-Firefox/i2ppb@eyedeekay.github.io">{% trans %}In-I2P Mirror{% endtrans %}</a></li> + <li><a href="magnet:?xt=urn:btih:90f1cef9f03f802499ecd7e22226aae72ddaa9c0">{% trans %}Bittorrent Magnet Link{% endtrans %}</a></li> + <li><a href="https://eyedeekay.github.io/I2P-in-Private-Browsing-Mode-Firefox/i2ppb@eyedeekay.github.io.xpi.torrent">{% trans %}Bittorrent Torrent File(Hosted at Github){% endtrans %}</a></li> +</ul>--> + +<a name="chrome"></a> +<h3>Chrome</h3> +<p>{% trans -%} +Chromium-Based Browsers like Chrome have slightly different places for their +proxy settings depending on variant and platform. These instructions may be +slightly different in Brave or Iridium, for instance. From the <em>Main</em> +menu, navigate to the <em>Settings</em>, and search for the <em></em> menu item. +Clicking it will open the right settings for your platform. +{%- endtrans %}</p> +<img src="{{ url_for('static', filename='images/chrome.proxy.png') }}" alt="{{ _('Chrome Proxy Options') }}" title="{{ _('Chrome Proxy Options') }}"> +<p>{% trans -%} +On Windows, this button will launch you into the shared proxy settings used +by <a href="#ie8"><em>Internet Explorer</em></a>, and you can configure it by +following the Internet Explorer 8 guide. +{%- endtrans %}</p> +<!--<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4> +<p>{% trans %}An experimental, partially-automated configuration process for +Chrome is available. In order to configure it, create a new <em>Profile</em> +especially for your I2P browsing, separate from the default profile. Then install +this <a href=""><em>Extension</em></a> in your newly-created profile. This profile +is now configured to use I2P. Highly detailed instructions are available at the +<a href="https://eyedeekay.github.io/I2P-Configuration-for-Chromium">homepage.</a> +{% endtrans %}</p>--> + +<a name="ie8"></a> +<h3>{{ _('Internet Explorer') }}</h3> +<p>{% trans -%} +In the start menu search for the the "Network and Internet Settings" to open the +settings. The last entry in the menu is the Proxy Settings, click it to +your proxy to connect to I2P. +{%- endtrans %}</p> +<img src="{{ url_for('static', filename='images/ie.options.png') }}" alt="{{ _('IE Internet Options') }}" title="{{ _('IE Internet Options') }}"> +<p>{% trans -%} +Now set the checkmark at "use a proxy server for your LAN" and at the "Bypass +proxy server for local addresses". With a click on Advanced-button you open the +window to open the ports. Enter the values like on the picture, IP 127.0.0.1 +and port 4444 for HTTP, port 4445 for HTTPS. With clicks on OK you save the +settings and your browser is set to use the I2P proxy. +{%- endtrans %}</p> +<img src="{{ url_for('static', filename='images/ie.proxyports.png') }}" alt="{{ _('IE Proxy Settings') }}" title="{{ _('IE Proxy Settings') }}"> + + +<a name="TOS"></a> +<h3>{{ _('Outproxy Terms Of Service') }}</h3> +<p>{% trans -%} +Remember: I2P was not designed for creating proxies to the outer Internet. +Instead, it is meant to be used as an internal network. +{%- endtrans %}</p> +<p>{% trans -%} +<p><b>The I2P project itself does not run any proxies to the Internet.</b> +The only outproxy is a service from the privacy solutions project. +Consider donating to them for a continued stable service. Increased funding will +allow them to improve this service. </p> +<a href="http://privacysolutions.no" + target="_blank">http://privacysolutions.no</a> +{%- endtrans %}</p> +<p>{% trans http='false.i2p', https='outproxy-tor.meeh.i2p' -%} +By default, I2P comes with two outproxies configured: <code>{{ http }}</code> +and <code>{{ https }}</code>. Even the domain names are different, it's the same outproxy you hit. +(multi-homed/keyed for better performance) +{%- endtrans %}</p> +<p>{% trans -%} +Filtering is active on these outproxies (for example, mibbit and torrent +tracker access is blocked). Eepsites +that are accessible via .i2p addresses are also not allowed via the outproxies. +As a convenience, the outproxy blocks ad servers. +{%- endtrans %}</p> +<p>{% trans -%} +<a href="https://www.torproject.org">Tor</a> is good application to use as an +outproxy to the Internet. +{%- endtrans %}</p> +<!-- vim: set noai ff=unix nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: --> diff --git a/i2p2www/pages/downloads/config.html b/i2p2www/pages/downloads/config.html new file mode 100644 index 0000000000000000000000000000000000000000..e3a653acf904e1e8c7e8a3f6e06f6df775bfdcce --- /dev/null +++ b/i2p2www/pages/downloads/config.html @@ -0,0 +1,7 @@ +{% extends "global/layout.html" %} +{% block title %}{{ _('Configuration') }}{% endblock %} +{% block content %} + +{% include "downloads/post-install.html" %} +{% include "downloads/browser-content.html" %} +{% endblock %} diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html index aace478ae6e49183557a3cd565f104f034b42c12..1e8ac0137ace1d2bc8be5e481c0581fa237108ae 100644 --- a/i2p2www/pages/downloads/list.html +++ b/i2p2www/pages/downloads/list.html @@ -199,9 +199,6 @@ The Mac OS X native installer is signed by {{ signer }} with his Apple Developer <a href="{{ signingkey }}">whose key is here</a>. {%- endtrans %} - -{% include "downloads/post-install.html" %} - <h3 id="update">{{ _('Updates from earlier releases:') }}</h3> <p>{% trans -%} diff --git a/i2p2www/pages/downloads/post-install.html b/i2p2www/pages/downloads/post-install.html index 5e60705c67b6e5ab7f6803734854c19f0c7c8594..445eaad5725c8ac0bcb546c53c7e6c68ad82053b 100644 --- a/i2p2www/pages/downloads/post-install.html +++ b/i2p2www/pages/downloads/post-install.html @@ -1,4 +1,4 @@ -<h3>{{ _('Post-install work') }}</h3> +<h2>{{ _('Post-install work') }}</h2> <p>{% trans -%} After running the installer on windows, simply click on the "Start I2P" button diff --git a/i2p2www/pages/downloads/redirect.html b/i2p2www/pages/downloads/redirect.html index 523225f5ab1276a7ae15dfc357c3061a2d427318..0b11bf40ca3215ce932df707e9ca97c5ea04a60d 100644 --- a/i2p2www/pages/downloads/redirect.html +++ b/i2p2www/pages/downloads/redirect.html @@ -11,4 +11,5 @@ Your download will begin shortly. If it doesn't start within 5 seconds, click <a </div> {% include "downloads/post-install.html" %} +{% include "downloads/browser-content.html" %} {% endblock %} diff --git a/i2p2www/pages/site/about/browser-config.html b/i2p2www/pages/site/about/browser-config.html index 57561b260299d27f3525bd5133d54f9066fc35e9..ffa727739d2eaaa7c8c03b98320b0bd7f0e7e6f1 100644 --- a/i2p2www/pages/site/about/browser-config.html +++ b/i2p2www/pages/site/about/browser-config.html @@ -1,147 +1,5 @@ {% extends "global/layout.html" %} {% block title %}{{ _('Web Browser Configuration') }}{% endblock %} {% block content %} - -<p>{% trans -%} -Your web browser will need to be configured in order to browse eepsites and to -utilize the outproxies available within I2P. Below are walkthroughs for some of -the most popular browsers. -{%- endtrans %}</p> - -<h2>{{ _('Firefox Profile for Windows') }}</h2> -<p>{% trans profile='/firefox' -%} -If you are using Windows, the recommended way of accessing I2P is using the -<a href='{{ profile }}'>Firefox profile</a>. -{%- endtrans %}</p> -<p>{% trans -%} -If you do not wish to use that profile or are not on Windows, you need to -configure your browser yourself. Read below on how to that. -{%- endtrans %}</p> - -<h2>{{ _('How to configure your browser') }}</h2> - -<ul> - <li><a href="#firefox">Firefox</a></li> - <li><a href="#chrome">Chrome</a></li> - <li><a href="#ie8">Internet Explorer 8</a></li> - <li><a href="#TOS">{{ _('Outproxy Terms Of Service') }}</a></li> -</ul> - -<a name="firefox"></a> -<h3>Firefox</h3> -<h4>{% trans %}Instructions for Firefox 57 and above:{% endtrans %}</h4> -<p>{% trans -%} -From the Menu button in the top right, select <em>Preferences</em>. -Scroll down until you see the <em>Network Proxy</em> section, as shown in the -screenshot below. Click on <em>Settings</em> -{%- endtrans %}</p> -<img src="{{ url_for('static', filename='images/firefox57.preferences.png') }}" -alt="{{ _('Firefox57 Network Options') }}" title="{{ _('Firefox57 Network Options') }}"> -<p>{% trans -%} -In the <em>Connection Settings</em> pop-up, select <em>Manual proxy - configuration</em>. Set both the HTTP and SSL Proxy to address -<code>127.0.0.1</code> with port <code>4444</code> as shown in the following -screenshot. -{%- endtrans %}</p> -<img src="{{ url_for('static', -filename='images/firefox57.connectionsettings.png') }}" alt="{{ _('Firefox57 -Connection Settings') }}" title="{{ _('Firefox57 Connection Settings') }}"> -<p>{% trans -%} -Finally, go to the address <em>about:config</em> and find the property -media.peerConnection.ice.proxy_only. Ensure that this setting is True. -{%- endtrans %}</p> -<img src="{{ url_for('static', -filename='images/firefox.webrtc.png') }}" alt="{{ _('Firefox57 -PeerConnection Settings') }}" title="{{ _('Firefox57 PeerConnection Settings') }}"> -<!--<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4> -<p>{% trans %}A new way of automatically configuring the I2P Browser is -currently being tested. It uses the Firefox's "Container Tabs" to build private -browsing tools for use with I2P and I2P applications.{% endtrans %}</p> -<p>{% trans %}It does pre-configuration of your browser by enabling some of -the privacy Browser Settings like ResistFingerprinting, and enforces WebRTC proxy -obedience. It also contains menus, shortcuts, and monitoring tools improving -Firefox's integration with I2P. It is a by-product of the I2P Browser project. -{% endtrans %}</p> -<p>{% trans %}The extension, <a href="https://addons.mozilla.org/en-US/firefox/addon/i2p-in-private-browsing/">I2P in Private Browsing</a>, -can be obtained from the Mozilla addon store or any of these mirrors: -{% endtrans %}</p> -<ul> - <li><a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases">{% trans %}Github Releases{% endtrans %}</a></li> - <li><a href="http://idk.i2p/I2P-in-Private-Browsing-Mode-Firefox/i2ppb@eyedeekay.github.io">{% trans %}In-I2P Mirror{% endtrans %}</a></li> - <li><a href="magnet:?xt=urn:btih:90f1cef9f03f802499ecd7e22226aae72ddaa9c0">{% trans %}Bittorrent Magnet Link{% endtrans %}</a></li> - <li><a href="https://eyedeekay.github.io/I2P-in-Private-Browsing-Mode-Firefox/i2ppb@eyedeekay.github.io.xpi.torrent">{% trans %}Bittorrent Torrent File(Hosted at Github){% endtrans %}</a></li> -</ul>--> - -<a name="chrome"></a> -<h3>Chrome</h3> -<p>{% trans -%} -Chromium-Based Browsers like Chrome have slightly different places for their -proxy settings depending on variant and platform. These instructions may be -slightly different in Brave or Iridium, for instance. From the <em>Main</em> -menu, navigate to the <em>Settings</em>, and search for the <em></em> menu item. -Clicking it will open the right settings for your platform. -{%- endtrans %}</p> -<img src="{{ url_for('static', filename='images/chrome.proxy.png') }}" alt="{{ _('Chrome Proxy Options') }}" title="{{ _('Chrome Proxy Options') }}"> -<p>{% trans -%} -On Windows, this button will launch you into the shared proxy settings used -by <a href="#ie8"><em>Internet Explorer</em></a>, and you can configure it by -following the Internet Explorer 8 guide. -{%- endtrans %}</p> -<!--<h4>{% trans %}Experimental, extension-based Configuration{% endtrans %}</h4> -<p>{% trans %}An experimental, partially-automated configuration process for -Chrome is available. In order to configure it, create a new <em>Profile</em> -especially for your I2P browsing, separate from the default profile. Then install -this <a href=""><em>Extension</em></a> in your newly-created profile. This profile -is now configured to use I2P. Highly detailed instructions are available at the -<a href="https://eyedeekay.github.io/I2P-Configuration-for-Chromium">homepage.</a> -{% endtrans %}</p>--> - -<a name="ie8"></a> -<h3>{{ _('Internet Explorer') }}</h3> -<p>{% trans -%} -In the start menu search for the the "Network and Internet Settings" to open the -settings. The last entry in the menu is the Proxy Settings, click it to -your proxy to connect to I2P. -{%- endtrans %}</p> -<img src="{{ url_for('static', filename='images/ie.options.png') }}" alt="{{ _('IE Internet Options') }}" title="{{ _('IE Internet Options') }}"> -<p>{% trans -%} -Now set the checkmark at "use a proxy server for your LAN" and at the "Bypass -proxy server for local addresses". With a click on Advanced-button you open the -window to open the ports. Enter the values like on the picture, IP 127.0.0.1 -and port 4444 for HTTP, port 4445 for HTTPS. With clicks on OK you save the -settings and your browser is set to use the I2P proxy. -{%- endtrans %}</p> -<img src="{{ url_for('static', filename='images/ie.proxyports.png') }}" alt="{{ _('IE Proxy Settings') }}" title="{{ _('IE Proxy Settings') }}"> - - -<a name="TOS"></a> -<h3>{{ _('Outproxy Terms Of Service') }}</h3> -<p>{% trans -%} -Remember: I2P was not designed for creating proxies to the outer Internet. -Instead, it is meant to be used as an internal network. -{%- endtrans %}</p> -<p>{% trans -%} -<p><b>The I2P project itself does not run any proxies to the Internet.</b> -The only outproxy is a service from the privacy solutions project. -Consider donating to them for a continued stable service. Higher bandwidth will -increase with the founding of the organization. Maybe more outproxies too.</p> -<a href="http://privacysolutions.no" - target="_blank">http://privacysolutions.no</a> -{%- endtrans %}</p> -<p>{% trans http='false.i2p', https='outproxy-tor.meeh.i2p' -%} -By default, I2P comes with two outproxies configured: <code>{{ http }}</code> -and <code>{{ https }}</code>. Even the domain names are different, it's the same outproxy you hit. -(multi-homed/keyed for better performance) -{%- endtrans %}</p> -<p>{% trans -%} -Filtering is active on these outproxies (for example, mibbit and torrent -tracker access is blocked). Eepsites -that are accessible via .i2p addresses are also not allowed via the outproxies. -As a convenience, the outproxy blocks ad servers. -{%- endtrans %}</p> -<p>{% trans -%} -<a href="https://www.torproject.org">Tor</a> is good application to use as an -outproxy to the Internet. -{%- endtrans %}</p> -<!-- vim: set noai ff=unix nosi ft=html tw=79 et sw=4 ts=4 spell spelllang=en: --> +{% include "downloads/browser-content.html" %} {% endblock %} diff --git a/i2p2www/static/images/firefox57.preferences.png b/i2p2www/static/images/firefox57.preferences.png index 7c4f83de5a6e737ff8a84c8330cde90b4e05b87f..400e34eb83c2e983fd343af5a08b07e1d0f3d29d 100644 Binary files a/i2p2www/static/images/firefox57.preferences.png and b/i2p2www/static/images/firefox57.preferences.png differ diff --git a/i2p2www/static/styles/duck/default.css b/i2p2www/static/styles/duck/default.css index 331da3049e8597ade28b1de9d912adedd575d0fe..c72e4173683dd31cf617fb7cbb6b7950b672d106 100644 --- a/i2p2www/static/styles/duck/default.css +++ b/i2p2www/static/styles/duck/default.css @@ -736,6 +736,7 @@ a.get-i2p-browser:hover { .browser-onboarding { width: 100%; + min-height: 35rem; } .browser-onboarding .row { diff --git a/i2p2www/static/styles/duck/desktop.css b/i2p2www/static/styles/duck/desktop.css index e88b3bf53ef9a015b8979ae500d922628f9d98f8..c3ad8394600388184b4b6102f6c4bf77bf9bdf5c 100644 --- a/i2p2www/static/styles/duck/desktop.css +++ b/i2p2www/static/styles/duck/desktop.css @@ -295,7 +295,10 @@ div#content .aside:first-child { */ .inner .fluid img { - max-width: 100%; + max-width: 80%; + margin-left: 10% !important; + margin-right: 10%; + box-shadow: 2px 2px 5px #265ea7; } div#content .inner .fluid { diff --git a/i2p2www/urls.py b/i2p2www/urls.py index c9a962f3d31ee8f4c1333d938120813afd121e76..58fea21ffb489afffd696134f7c5a758759c179b 100644 --- a/i2p2www/urls.py +++ b/i2p2www/urls.py @@ -91,6 +91,7 @@ url('/<lang:lang>/browser/develop', 'browser.browser_develop') url('/<lang:lang>/download', 'downloads.downloads_list') url('/<lang:lang>/download/debian', 'downloads.downloads_debian') url('/<lang:lang>/download/firefox', 'downloads.downloads_firefox') +url('/<lang:lang>/download/config', 'downloads.downloads_config') url('/<lang:lang>/download/lab', 'downloads.downloads_lab') url('/<lang:lang>/download/<string:version>/<path:file>/mirrors', 'downloads.downloads_select') url('/<lang:lang>/download/<string:version>/<string:net>/any/<path:file>/download', 'downloads.downloads_redirect', defaults={'protocol': None, 'domain': None})