diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py index f2d731b5..9554d57a 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 00000000..21d74d34 --- /dev/null +++ b/i2p2www/pages/downloads/browser-content.html @@ -0,0 +1,142 @@ +

{% 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 %}

+ +

{{ _('Firefox Profile for Windows') }}

+

{% trans profile='/firefox' -%} +If you are using Windows, the recommended way of accessing I2P is using the +Firefox profile. +{%- endtrans %}

+

{% 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 %}

+ +

{{ _('How to configure your browser') }}

+ + + + +

Firefox

+

{% trans %}Instructions for Firefox 57 and above:{% endtrans %}

+

{% trans -%} +From the Menu button in the top right, select Preferences. +Scroll down until you see the Network Proxy section, as shown in the +screenshot below. Click on Settings +{%- endtrans %}

+ +

{% trans -%} +In the Connection Settings pop-up, select Manual proxy + configuration. Set both the HTTP and SSL Proxy to address +127.0.0.1 with port 4444 as shown in the following +screenshot. +{%- endtrans %}

+{{ _('Firefox57 +Connection Settings') }} +

{% trans -%} +Finally, go to the address about:config and find the property +media.peerConnection.ice.proxy_only. Ensure that this setting is True. +{%- endtrans %}

+{{ _('Firefox57 +PeerConnection Settings') }} + + + +

Chrome

+

{% 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 Main +menu, navigate to the Settings, and search for the menu item. +Clicking it will open the right settings for your platform. +{%- endtrans %}

+{{ _('Chrome Proxy Options') }} +

{% trans -%} +On Windows, this button will launch you into the shared proxy settings used +by Internet Explorer, and you can configure it by +following the Internet Explorer 8 guide. +{%- endtrans %}

+ + + +

{{ _('Internet Explorer') }}

+

{% 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 %}

+{{ _('IE Internet Options') }} +

{% 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 %}

+{{ _('IE Proxy Settings') }} + + + +

{{ _('Outproxy Terms Of Service') }}

+

{% 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 %}

+

{% trans -%} +

The I2P project itself does not run any proxies to the Internet. +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.

+http://privacysolutions.no +{%- endtrans %}

+

{% trans http='false.i2p', https='outproxy-tor.meeh.i2p' -%} +By default, I2P comes with two outproxies configured: {{ http }} +and {{ https }}. Even the domain names are different, it's the same outproxy you hit. +(multi-homed/keyed for better performance) +{%- endtrans %}

+

{% 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 %}

+

{% trans -%} +Tor is good application to use as an +outproxy to the Internet. +{%- endtrans %}

+ diff --git a/i2p2www/pages/downloads/config.html b/i2p2www/pages/downloads/config.html new file mode 100644 index 00000000..e3a653ac --- /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 aace478a..1e8ac013 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 whose key is here. {%- endtrans %} - -{% include "downloads/post-install.html" %} -

{{ _('Updates from earlier releases:') }}

{% trans -%} diff --git a/i2p2www/pages/downloads/post-install.html b/i2p2www/pages/downloads/post-install.html index 5e60705c..445eaad5 100644 --- a/i2p2www/pages/downloads/post-install.html +++ b/i2p2www/pages/downloads/post-install.html @@ -1,4 +1,4 @@ -

{{ _('Post-install work') }}

+

{{ _('Post-install work') }}

{% 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 523225f5..0b11bf40 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 {% 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 57561b26..ffa72773 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 %} - -

{% 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 %}

- -

{{ _('Firefox Profile for Windows') }}

-

{% trans profile='/firefox' -%} -If you are using Windows, the recommended way of accessing I2P is using the -Firefox profile. -{%- endtrans %}

-

{% 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 %}

- -

{{ _('How to configure your browser') }}

- - - - -

Firefox

-

{% trans %}Instructions for Firefox 57 and above:{% endtrans %}

-

{% trans -%} -From the Menu button in the top right, select Preferences. -Scroll down until you see the Network Proxy section, as shown in the -screenshot below. Click on Settings -{%- endtrans %}

- -

{% trans -%} -In the Connection Settings pop-up, select Manual proxy - configuration. Set both the HTTP and SSL Proxy to address -127.0.0.1 with port 4444 as shown in the following -screenshot. -{%- endtrans %}

-{{ _('Firefox57 -Connection Settings') }} -

{% trans -%} -Finally, go to the address about:config and find the property -media.peerConnection.ice.proxy_only. Ensure that this setting is True. -{%- endtrans %}

-{{ _('Firefox57 -PeerConnection Settings') }} - - - -

Chrome

-

{% 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 Main -menu, navigate to the Settings, and search for the menu item. -Clicking it will open the right settings for your platform. -{%- endtrans %}

-{{ _('Chrome Proxy Options') }} -

{% trans -%} -On Windows, this button will launch you into the shared proxy settings used -by Internet Explorer, and you can configure it by -following the Internet Explorer 8 guide. -{%- endtrans %}

- - - -

{{ _('Internet Explorer') }}

-

{% 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 %}

-{{ _('IE Internet Options') }} -

{% 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 %}

-{{ _('IE Proxy Settings') }} - - - -

{{ _('Outproxy Terms Of Service') }}

-

{% 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 %}

-

{% trans -%} -

The I2P project itself does not run any proxies to the Internet. -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.

-http://privacysolutions.no -{%- endtrans %}

-

{% trans http='false.i2p', https='outproxy-tor.meeh.i2p' -%} -By default, I2P comes with two outproxies configured: {{ http }} -and {{ https }}. Even the domain names are different, it's the same outproxy you hit. -(multi-homed/keyed for better performance) -{%- endtrans %}

-

{% 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 %}

-

{% trans -%} -Tor is good application to use as an -outproxy to the Internet. -{%- endtrans %}

- +{% include "downloads/browser-content.html" %} {% endblock %} diff --git a/i2p2www/static/images/firefox57.preferences.png b/i2p2www/static/images/firefox57.preferences.png index 7c4f83de..400e34eb 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 331da304..c72e4173 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 e88b3bf5..c3ad8394 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 c9a962f3..58fea21f 100644 --- a/i2p2www/urls.py +++ b/i2p2www/urls.py @@ -91,6 +91,7 @@ url('//browser/develop', 'browser.browser_develop') url('//download', 'downloads.downloads_list') url('//download/debian', 'downloads.downloads_debian') url('//download/firefox', 'downloads.downloads_firefox') +url('//download/config', 'downloads.downloads_config') url('//download/lab', 'downloads.downloads_lab') url('//download///mirrors', 'downloads.downloads_select') url('//download///any//download', 'downloads.downloads_redirect', defaults={'protocol': None, 'domain': None})