diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html index 934ba8764389ee24ca33cf6af16378f3d63750e9..455ba594c1b6688b9d8368f45a7d8a53a84be0cd 100644 --- a/i2p2www/pages/global/footer.html +++ b/i2p2www/pages/global/footer.html @@ -16,6 +16,7 @@ <ul> <li><a href="{{ site_url('get-involved') }}"><div class="footeritem"><span>{{ _('Get involved!') }}</span></div></a></li> <li><a href="{{ site_url('get-involved/donate') }}"><div class="footeritem"><span>{{ _('Donate') }}</span></div></a></li> + <li><a href="{{ site_url('docs') }}"><div class="footeritem"><span>{{ _('Learn More!') }}</span></div></a></li> </ul> </div> diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html index 842b503a568e778e62de6cfa87b48c765c420aaf..8b147c07f357f9c8d455af9a703edbae6d66b488 100644 --- a/i2p2www/pages/global/nav.html +++ b/i2p2www/pages/global/nav.html @@ -57,125 +57,129 @@ <li><a href="{{ site_url('links') }}"><div class="menuitem"><span>{{ _('Links') }}</span></div></a></li> </ul> <li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Docs') }}</span></div> + <!--<li class="has-sub"><div class="menuitem"><span>{{ _('Learn') }}</span></div> <ul> - <li><a href="{{ site_url('docs') }}"><div class="menuitem"><span>{{ _('Documentation index') }}</span></div></a></li> - <li class="has-sub"><div class="menuitem"><span>{{ _('How does it work?') }}</span></div> + <li class="has-sub"><div class="menuitem"><span>{{ _('Docs') }}</span></div> <ul> - <li><a href="{{ site_url('docs/how/intro') }}"><div class="menuitem"><span>{{ _('Gentle intro') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/tech-intro') }}"><div class="menuitem"><span>{{ _('Tech intro') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/threat-model') }}"><div class="menuitem"><span>{{ _('Threat model') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/garlic-routing') }}"><div class="menuitem"><span>{{ _('Garlic routing') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/network-database') }}"><div class="menuitem"><span>{{ _('Network database') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/tunnel-routing') }}"><div class="menuitem"><span>{{ _('Tunnel routing') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/peer-selection') }}"><div class="menuitem"><span>{{ _('Peer selection') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/cryptography') }}"><div class="menuitem"><span>{{ _('Cryptography') }}</span></div></a></li> - <li><a href="{{ site_url('docs/how/elgamal-aes') }}"><div class="menuitem"><span>{{ _('ElGamal/AES+SessionTags') }}</span></div></a></li> - </ul> - </li> - <li><a href="{{ url_for('spec_index') }}"><div class="menuitem"><span>{{ _('Specifications') }}</span></div></a></li> - <li><a href="{{ url_for('proposal_index') }}"><div class="menuitem"><span>{{ _('Proposals') }}</span></div></a></li> - <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div> - <ul> - <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><div class="menuitem"><span>I2PTunnel</span></div></a></li> - <li><a href="{{ site_url('docs/api/socks') }}"><div class="menuitem"><span>SOCKS</span></div></a></li> - <li><a href="{{ site_url('docs/api/samv3') }}"><div class="menuitem"><span>SAM v3</span></div></a></li> - <li><a href="{{ site_url('docs/api/bob') }}"><div class="menuitem"><span>BOB</span></div></a></li> - <li><a href="{{ site_url('docs/api/streaming') }}"><div class="menuitem"><span>{{ _('Streaming library') }}</span></div></a></li> - <li><a href="{{ site_url('docs/api/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li> - <li><a href="{{ site_url('docs/api/i2pcontrol') }}"><div class="menuitem"><span>I2PControl</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div> - <ul> - <li><a href="{{ site_url('docs/applications/supported') }}"><div class="menuitem"><span>{{ _('Supported applications') }}</span></div></a></li> - <li><a href="{{ site_url('docs/applications/bittorrent') }}"><div class="menuitem"><span>{{ _('Bittorrent') }}</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Protocols') }}</span></div> - <ul> - <li><a href="{{ site_url('docs/protocol') }}"><div class="menuitem"><span>{{ _('Protocol stack') }}</span></div></a></li> - <li><a href="{{ site_url('docs/protocol/i2cp') }}"><div class="menuitem"><span>I2CP</span></div></a></li> - <li><a href="{{ site_url('docs/protocol/i2np') }}"><div class="menuitem"><span>I2NP</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Transports') }}</span></div> - <ul> - <li><a href="{{ site_url('docs/transport') }}"><div class="menuitem"><span>{{ _('Transport layer overview') }}</span></div></a></li> - <li><a href="{{ site_url('docs/transport/ntcp') }}"><div class="menuitem"><span>NTCP</span></div></a></li> - <li><a href="{{ site_url('docs/transport/ssu') }}"><div class="menuitem"><span>SSU</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Tunnels') }}</span></div> - <ul> - <li><a href="{{ site_url('docs/tunnels/implementation') }}"><div class="menuitem"><span>{{ _('Tunnel implementation') }}</span></div></a></li> - <li><a href="{{ site_url('docs/tunnels/unidirectional') }}"><div class="menuitem"><span>{{ _('Unidirectional tunnels') }}</span></div></a></li> - <li><a href="{{ site_url('docs/tunnels/old-implementation') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li> + <li><a href="{{ site_url('docs') }}"><div class="menuitem"><span>{{ _('Documentation index') }}</span></div></a></li> + <li class="has-sub"><div class="menuitem"><span>{{ _('How does it work?') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/how/intro') }}"><div class="menuitem"><span>{{ _('Gentle intro') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/tech-intro') }}"><div class="menuitem"><span>{{ _('Tech intro') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/threat-model') }}"><div class="menuitem"><span>{{ _('Threat model') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/garlic-routing') }}"><div class="menuitem"><span>{{ _('Garlic routing') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/network-database') }}"><div class="menuitem"><span>{{ _('Network database') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/tunnel-routing') }}"><div class="menuitem"><span>{{ _('Tunnel routing') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/peer-selection') }}"><div class="menuitem"><span>{{ _('Peer selection') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/cryptography') }}"><div class="menuitem"><span>{{ _('Cryptography') }}</span></div></a></li> + <li><a href="{{ site_url('docs/how/elgamal-aes') }}"><div class="menuitem"><span>{{ _('ElGamal/AES+SessionTags') }}</span></div></a></li> + </ul> + </li> + <li><a href="{{ url_for('spec_index') }}"><div class="menuitem"><span>{{ _('Specifications') }}</span></div></a></li> + <li><a href="{{ url_for('proposal_index') }}"><div class="menuitem"><span>{{ _('Proposals') }}</span></div></a></li> + <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><div class="menuitem"><span>I2PTunnel</span></div></a></li> + <li><a href="{{ site_url('docs/api/socks') }}"><div class="menuitem"><span>SOCKS</span></div></a></li> + <li><a href="{{ site_url('docs/api/samv3') }}"><div class="menuitem"><span>SAM v3</span></div></a></li> + <li><a href="{{ site_url('docs/api/bob') }}"><div class="menuitem"><span>BOB</span></div></a></li> + <li><a href="{{ site_url('docs/api/streaming') }}"><div class="menuitem"><span>{{ _('Streaming library') }}</span></div></a></li> + <li><a href="{{ site_url('docs/api/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li> + <li><a href="{{ site_url('docs/api/i2pcontrol') }}"><div class="menuitem"><span>I2PControl</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/applications/supported') }}"><div class="menuitem"><span>{{ _('Supported applications') }}</span></div></a></li> + <li><a href="{{ site_url('docs/applications/bittorrent') }}"><div class="menuitem"><span>{{ _('Bittorrent') }}</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Protocols') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/protocol') }}"><div class="menuitem"><span>{{ _('Protocol stack') }}</span></div></a></li> + <li><a href="{{ site_url('docs/protocol/i2cp') }}"><div class="menuitem"><span>I2CP</span></div></a></li> + <li><a href="{{ site_url('docs/protocol/i2np') }}"><div class="menuitem"><span>I2NP</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Transports') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/transport') }}"><div class="menuitem"><span>{{ _('Transport layer overview') }}</span></div></a></li> + <li><a href="{{ site_url('docs/transport/ntcp') }}"><div class="menuitem"><span>NTCP</span></div></a></li> + <li><a href="{{ site_url('docs/transport/ssu') }}"><div class="menuitem"><span>SSU</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Tunnels') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/tunnels/implementation') }}"><div class="menuitem"><span>{{ _('Tunnel implementation') }}</span></div></a></li> + <li><a href="{{ site_url('docs/tunnels/unidirectional') }}"><div class="menuitem"><span>{{ _('Unidirectional tunnels') }}</span></div></a></li> + <li><a href="{{ site_url('docs/tunnels/old-implementation') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li> + </ul> + </li> + <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li> + <li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li> + <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li> </ul> </li> - <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li> - <li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li> - <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Research') }}</span></div> - <ul> <li class="has-sub"><div class="menuitem"><span>{{ _('Research') }}</span></div> <ul> - <li><a href="{{ site_url('research') }}"><div class="menuitem"><span>{{ _('Academic research') }}</span></div></a></li> - <li><a href="{{ site_url('research/questions') }}"><div class="menuitem"><span>{{ _('Open research questions') }}</span></div></a></li> - </ul> - <li><a href="{{ get_url('papers_list') }}"><div class="menuitem"><span>{{ _('Academic papers and peer review') }}</span></div></a></li> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div> - <ul> - <li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>Media</span></div></li> - <li><a href="{{ site_url('about/i2pcon') }}"><div class="menuitem"><span>I2PCon</span></div></a></li> - </ul> - </li> - <li><a href="{{ site_url('impressum') }}"><div class="menuitem"><span>{{ _('Impressum') }}</span></div></a></li> - <li><a href="https://i2p-metrics.np-tokumei.net/"><div class="menuitem"><span>{{ _('I2P Metrics') }}</span></div></a></li> - </ul> - </li> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Develop') }}</span></div> - <ul> - <li class="has-sub"><div class="menuitem"><span>{{ _('Guides') }}</span></div> - <ul> - <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div> - <ul> - <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><div class="menuitem"><span>I2PTunnel</span></div></a></li> - <li><a href="{{ site_url('docs/api/socks') }}"><div class="menuitem"><span>SOCKS</span></div></a></li> - <li><a href="{{ site_url('docs/api/samv3') }}"><div class="menuitem"><span>SAM v3</span></div></a></li> - <li><a href="{{ site_url('docs/api/bob') }}"><div class="menuitem"><span>BOB</span></div></a></li> - <li><a href="{{ site_url('docs/api/streaming') }}"><div class="menuitem"><span>{{ _('Streaming library') }}</span></div></a></li> - <li><a href="{{ site_url('docs/api/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li> - <li><a href="{{ site_url('docs/api/i2pcontrol') }}"><div class="menuitem"><span>I2PControl</span></div></a></li> - </ul> - </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('License') }}</span></div> - <ul> - <li><a href="{{ site_url('get-involved/develop/applications') }}"><div class="menuitem"><span>{{ _('Applications') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/develop/licenses') }}"><div class="menuitem"><span>{{ _('Licenses') }}</span></div></a></li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Research') }}</span></div> + <ul> + <li><a href="{{ site_url('research') }}"><div class="menuitem"><span>{{ _('Academic research') }}</span></div></a></li> + <li><a href="{{ site_url('research/questions') }}"><div class="menuitem"><span>{{ _('Open research questions') }}</span></div></a></li> + </ul> + <li><a href="{{ get_url('papers_list') }}"><div class="menuitem"><span>{{ _('Academic papers and peer review') }}</span></div></a></li> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div> + <ul> + <li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>Media</span></div></li> + <li><a href="{{ site_url('about/i2pcon') }}"><div class="menuitem"><span>I2PCon</span></div></a></li> + </ul> + </li> + <li><a href="{{ site_url('impressum') }}"><div class="menuitem"><span>{{ _('Impressum') }}</span></div></a></li> + <li><a href="https://i2p-metrics.np-tokumei.net/"><div class="menuitem"><span>{{ _('I2P Metrics') }}</span></div></a></li> </ul> + </li> </li> - <li class="has-sub"><div class="menuitem"><span>{{ _('Meetings, Roadmap') }}</span></div> + <li class="has-sub"><div class="menuitem"><span>{{ _('Develop') }}</span></div> <ul> - <li><a href="{{ get_url('meetings_index') }}"><div class="menuitem"><span>{{ _('Meeting Logs') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/roadmap') }}"><div class="menuitem"><span>{{ _('Project Roadmap') }}</span></div></a></li> - <li><a href="{{ site_url('get-involved/todo') }}"><div class="menuitem"><span>{{ _('Task list') }}</span></div></a></li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Guides') }}</span></div> + <ul> + <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div> + <ul> + <li><a href="{{ site_url('docs/api/i2ptunnel') }}"><div class="menuitem"><span>I2PTunnel</span></div></a></li> + <li><a href="{{ site_url('docs/api/socks') }}"><div class="menuitem"><span>SOCKS</span></div></a></li> + <li><a href="{{ site_url('docs/api/samv3') }}"><div class="menuitem"><span>SAM v3</span></div></a></li> + <li><a href="{{ site_url('docs/api/bob') }}"><div class="menuitem"><span>BOB</span></div></a></li> + <li><a href="{{ site_url('docs/api/streaming') }}"><div class="menuitem"><span>{{ _('Streaming library') }}</span></div></a></li> + <li><a href="{{ site_url('docs/api/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li> + <li><a href="{{ site_url('docs/api/i2pcontrol') }}"><div class="menuitem"><span>I2PControl</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('License') }}</span></div> + <ul> + <li><a href="{{ site_url('get-involved/develop/applications') }}"><div class="menuitem"><span>{{ _('Applications') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/develop/licenses') }}"><div class="menuitem"><span>{{ _('Licenses') }}</span></div></a></li> + </ul> + </li> + <li class="has-sub"><div class="menuitem"><span>{{ _('Meetings, Roadmap') }}</span></div> + <ul> + <li><a href="{{ get_url('meetings_index') }}"><div class="menuitem"><span>{{ _('Meeting Logs') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/roadmap') }}"><div class="menuitem"><span>{{ _('Project Roadmap') }}</span></div></a></li> + <li><a href="{{ site_url('get-involved/todo') }}"><div class="menuitem"><span>{{ _('Task list') }}</span></div></a></li> + </ul> + </li> + <li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><div class="menuitem"><span>{{ _('Bug tracker') }}</span></div></a></li> </ul> </li> - <li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><div class="menuitem"><span>{{ _('Bug tracker') }}</span></div></a></li> </ul> - </li> + </li>--> <li><a href="{{ get_url('blog_index') }}"><div class="menuitem"><span>{{ _('Blog') }}</span></div></a></li> <li class="has-sub"><div class="menuitem"><span>{{ _('Labs') }}</span></div> <ul> diff --git a/i2p2www/pages/site/about/browser-config.html b/i2p2www/pages/site/about/browser-config.html index 11458ec356abf85088302a3ea45885016596f5b3..57561b260299d27f3525bd5133d54f9066fc35e9 100644 --- a/i2p2www/pages/site/about/browser-config.html +++ b/i2p2www/pages/site/about/browser-config.html @@ -81,6 +81,7 @@ 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 @@ -98,9 +99,9 @@ is now configured to use I2P. Highly detailed instructions are available at the <a name="ie8"></a> <h3>{{ _('Internet Explorer') }}</h3> <p>{% trans -%} -In the tools menu select the "Internet Options" line to open the settings. In the -settings window choose the connections tab and click on LAN settings for the -proxy port configuration. +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 -%} diff --git a/i2p2www/static/images/chrome.proxy.png b/i2p2www/static/images/chrome.proxy.png new file mode 100644 index 0000000000000000000000000000000000000000..32178f07233fe3e8c3311d0a52500a8ecaf0ca72 Binary files /dev/null and b/i2p2www/static/images/chrome.proxy.png differ