split roadmap/release notes for browser page, fix translation tags, improve get involved pages, other tweaks to I2P Browser pages text

i2p2www/browser.py

@@ -21,6 +21,9 @@ def browser_download():
 def browser_releasenotes():
   return render_template('site/browser/releasenotes.html')
 
+def browser_roadmap():
+  return render_template('site/browser/roadmap.html')
+
 #def browser_known_issues():
 #  return render_template('site/browser/known_issues.html')
 

i2p2www/pages/site/browser/_front.html

@@ -10,6 +10,7 @@
 <!--<li style="list-style: none;">{% trans troubleshooting=get_url('browser_troubleshooting') %}<a href="{{ troubleshooting }}">Troubleshooting</a>{% endtrans %}</li>-->
 <!--<li style="list-style: none;">{% trans known_issues=get_url('browser_known_issues') %}<a href="{{ known_issues }}">Known Issues</a>{% endtrans %}</li>-->
 <li style="list-style: none;">{% trans releasenotes=get_url('browser_releasenotes') %}<a href="{{ releasenotes }}">Release Notes</a>{% endtrans %}</li>
+<li style="list-style: none;">{% trans releasenotes=get_url('browser_roadmap') %}<a href="{{ releasenotes }}">Road Map</a>{% endtrans %}</li>
 <li style="list-style: none;">{% trans develop=get_url('browser_develop') %}<a href="{{ develop }}">Get Involved</a>{% endtrans %}</li>
 <li style="list-style: none;">{% trans donate=site_url('get-involved/donate') %}<a href="{{ donate }}">Donate</a>{% endtrans %}</li>
 

i2p2www/pages/site/browser/develop.html

@@ -14,20 +14,58 @@
 
 <h1>{% trans %}Get Involved{% endtrans %}</h1>
 
+{% trans %}
+<p>
+Like other browsers, I2P Browser is actually built from a group of tools that
+work together to start and stop applications, configure settings, and secure the
+user against attacks.
+</p>
+{% endtrans %}
+
+<h2>{% trans %}Source Code{% endtrans %}</h2>
+
 <ul>
   <li>
-Source Code: <a href="https://github.com/mikalv/i2p-browser-build-scripts">https://github.com/mikalv/i2p-browser-build-scripts</a>
+  <a href="https://github.com/mikalv/i2p-browser-build-scripts">{% trans %}Build Scripts(Github):{% endtrans %}</a>
+  {% trans %}Start here to build from source. This is the collection of build scripts that
+  gathers the source code for all the components and executes each step of the
+  build process.{% endtrans %}
   </li>
   <li>
-I2P Browser Development and Hacking Guide: <a href="http://{{ i2pconv('trac.i2p2.i2p') }}//wiki/I2P_Browser_develop_n_hacks">{{ i2pconv('trac.i2p2.i2p') }}/wiki/I2P_Browser_develop_n_hacks</a> .
+  <a href="https://github.com/i2p/i2p-browser">{% trans %}Firefox Source Code(Github):{% endtrans %}</a>
+  {% trans %}This is the source code of our fork of Firefox LTS, which is in turn based on the
+  work of the Tor Browser team and modified for use with I2P.{% endtrans%}
   </li>
   <li>
-Mailing List: <a href="http://{{ i2pconv('lists.i2p') }}/hyperkitty/list/i2p-browser-dev@lists.i2p.email/2019/8/">{{ i2pconv('lists.i2p') }}</a>
+  <a href="https://github.com/i2p/i2pbutton">{% trans %}I2PButton Browser Extension(Github):{% endtrans %}</a>
-  </li>
+  {% trans %} Start here to experiment with your changes. Many of our essential features
-  <li>
+  are facilitated by this plugin.
-Trac: <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/">{{ i2pconv('trac.i2p2.i2p') }}</a>.
+  {% endtrans %}
   </li>
+</ul>
+
+<h2>{% trans %}Essential Documentation{% endtrans %}</h2>
+
 <ul>
+  <li>
+  <a href="http://{{ i2pconv('trac.i2p2.i2p') }}//wiki/I2P_Browser_develop_n_hacks">{% trans %}I2P Browser Development:{% endtrans %}</a>
+  {% trans %}Meeh's notes on developing and porting features to the I2P Browser{% endtrans %}.
+  </li>
+</ul>
+
+<h2>{% trans %}Contact Us{% endtrans %}</h2>
+
+<ul>
+  <li>
+  <a href="http://{{ i2pconv('trac.i2p2.i2p') }}">{% trans %}Bug Tracker{% endtrans %}</a>
+  {% trans %}Should you wish to communicate with us on a service other than Github,
+  you may contact us via the I2P Bug Tracker.{% endtrans %}
+  </li>
+  <li>
+  <a href="http://{{ i2pconv('lists.i2p') }}/hyperkitty/list/i2p-browser-dev@lists.i2p.email/2019/8/">{% trans %}Mailing List{% endtrans %}</a>
+  {% trans %} We also have a public mailing list for discussion of the I2P Browser.{% endtrans %}
+  </li>
+</ul>
 
 {% endblock %}
 

i2p2www/pages/site/browser/intro.html

@@ -12,32 +12,32 @@
 
 {% block content %}
 
-<h1>About</h1>
+<h1>{% trans %}About{% endtrans %}</h1>
 <p>
-I2P Browser is for anyone who wants to protect their privacy either for
+{% trans %}I2P Browser is for anyone who wants to protect their privacy either for
-preference or safety. It enables netizens to defend themselves from tracking,
+preference or safety. It enables people to defend themselves from tracking,
-surveillance, spyware and in some cases it will help to circumvent censorship.
+surveillance, spyware and in some cases it will help to circumvent censorship.{% endtrans %}
 </p>
 <p>
-Like other browsers, I2P Browser enables you to browse and search the internet.
+{% trans %}Like other browsers, I2P Browser enables you to browse and search the internet.
 I2P Browser however, is very focused on the privacy rights of the user and does
-not monetize data in trade of your privacy.
+not monetize data in trade of your privacy.{% endtrans %}
 </p>
 <p>
-Most websites now use numerous third-party services, including social networking
+{% trans %}Most websites now use numerous third-party services, including social networking
 “Like” buttons, analytics trackers, and advertising beacons, all of which can
 link your activity across different sites. And because of that, the I2P Browser
 is designed to prevent websites from “fingerprinting” or identifying you based
 on your browser configuration. By default, I2P Browser does not keep any
 browsing history. Cookies are only valid for a single session (until I2P Browser
-is exited or a New Identity is requested).
+is exited or a New Identity is requested).{% endtrans %}
 </p>
 <p>
-I2P Browser blocks plugins like Flash, RealPlayer, Quicktime and others that can
+{% trans %}I2P Browser blocks plugins like Flash, RealPlayer, Quicktime and others that can
 be manipulated into revealing your IP address. I2P Browser also comes with
 NoScript and other patches to protect your privacy and security. We do not
 recommend installing additional plugins or add-ons to I2P Browser since they may
-bypass or compromise your privacy.
+bypass or compromise your privacy.{% endtrans %}
 </p>
 {% endblock %}
 

i2p2www/pages/site/browser/releasenotes.html

@@ -15,15 +15,8 @@
 <li style="list-style: none;"><a href="#r20b2">{% trans %}Version 2.0 Beta 2{% endtrans %}</a></li>
 <li style="list-style: none;"><a href="#r20b1">{% trans %}Version 2.0 Beta 1{% endtrans %}</a></li>
 </ol>
-<ol>
-<li style="list-style: none;"><a href="#roadmap">{% trans %}Roadmap{% endtrans %}</li>
-<li style="list-style: none;"><a href="#r20b8">{% trans %}Version 2.0 Beta 8{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r30b9">{% trans %}Version 3.0 Beta 9{% endtrans %}</a></li>
-<li style="list-style: none;"><a href="#r30b10">{% trans %}Version 3.0 Beta 10{% endtrans %}</a></li>
-</ol>
 {% endblock %}
 
-
 {% block content %}
 
 <h1>{% trans %}Release Notes{% endtrans %}</h1>
@@ -52,7 +45,6 @@
   <li>Use better ports for router configuration</li>
 </ol>
 
-
 <h3 id="r20b5">
   <span class="permalink">
     <a href="#r20b5">{% trans %}2.0 Beta 5 (Sep 12 2019){% endtrans %}</a>
@@ -132,47 +124,4 @@
 
 <p>Lost in history, was labeled "Abscond Browser" at the time.</p>
 
-<h1 id="roadmap">{% trans %}Roadmap{% endtrans %}</h1>
-
-<h3 id="r20b8">
-  <span class="permalink">
-    <a href="#r20b8">{% trans %}2.0 Beta 8 (Nov 2019){% endtrans %}</a>
-  </span>
-</h3>
-
-<ol style="list-style-type: square;">
-  <li>Design for Dynamic Themes/Contextual Identities</li>
-  <li>Smart Landing Page</li>
-  <li>Investigate adding a "new tab" application list</li>
-  <li>HTTP Proxy Readiness indicator</li>
-  <li>Application Dialog Boxes with Description of Applications</li>
-  <li>Update/explain long-term product goals on web site</li>
-</ol>
-
-<h3 id="r30b9">
-  <span class="permalink">
-    <a href="#r30b9">{% trans %}3.0 Beta 9 (Dec 2019){% endtrans %}</a>
-  </span>
-</h3>
-
-<ol style="list-style-type: square;">
-  <li>Release using ESR 68, deprecate ESR 60</li>
-  <li>Move JSON-RPC and I2PControl to web extension, simplify I2Pbutton</li>
-  <li>Protocol Handlers for Router Console and Mailto</li>
-  <li>Dynamic Themes/Contextual Identities</li>
-  <li>Donation Call-to-Action</li>
-  <li>Smart Landing Page improvements</li>
-</ol>
-
-<h3 id="r30b10">
-  <span class="permalink">
-    <a href="#r30b10">{% trans %}3.0 Beta 10 (Jan 2019){% endtrans %}</a>
-  </span>
-</h3>
-
-<ol style="list-style-type: square;">
-  <li>Research I2P Plugins Support</li>
-  <li>Research Peer-to-Peer messaging support compatible with BiglyBT</li>
-</ol>
-
 {% endblock %}

i2p2www/pages/site/browser/roadmap.html

@@ -0,0 +1,62 @@
+{% extends "global/layout.html" %}
+{% block title %}{{ _('The I2P Browser - Release Notes') }}{% endblock %}
+{% block content_nav %}
+<ol>
+<li style="list-style: none; display: inline">
+<h4>{{ _('Navigation') }}</h4>
+</li>
+<li style="list-style: none;">{% trans browser_main=get_url('browser_frontpage') %}<a href="{{ browser_main }}">Back to browser front page</a>{% endtrans %}</li>
+<li style="list-style: none;"><a href="#roadmap">{% trans %}Roadmap{% endtrans %}</li>
+<li style="list-style: none;"><a href="#r20b8">{% trans %}Version 2.0 Beta 8{% endtrans %}</a></li>
+<li style="list-style: none;"><a href="#r30b9">{% trans %}Version 3.0 Beta 9{% endtrans %}</a></li>
+<li style="list-style: none;"><a href="#r30b10">{% trans %}Version 3.0 Beta 10{% endtrans %}</a></li>
+</ol>
+{% endblock %}
+
+
+{% block content %}
+
+<h1 id="roadmap">{% trans %}Roadmap{% endtrans %}</h1>
+
+<h3 id="r20b8">
+  <span class="permalink">
+    <a href="#r20b8">{% trans %}2.0 Beta 8 (Nov 2019){% endtrans %}</a>
+  </span>
+</h3>
+
+<ol style="list-style-type: square;">
+  <li>Design for Dynamic Themes/Contextual Identities</li>
+  <li>Smart Landing Page</li>
+  <li>Investigate adding a "new tab" application list</li>
+  <li>HTTP Proxy Readiness indicator</li>
+  <li>Application Dialog Boxes with Description of Applications</li>
+  <li>Update/explain long-term product goals on web site</li>
+</ol>
+
+<h3 id="r30b9">
+  <span class="permalink">
+    <a href="#r30b9">{% trans %}3.0 Beta 9 (Dec 2019){% endtrans %}</a>
+  </span>
+</h3>
+
+<ol style="list-style-type: square;">
+  <li>Release using ESR 68, deprecate ESR 60</li>
+  <li>Move JSON-RPC and I2PControl to web extension, simplify I2Pbutton</li>
+  <li>Protocol Handlers for Router Console and Mailto</li>
+  <li>Dynamic Themes/Contextual Identities</li>
+  <li>Donation Call-to-Action</li>
+  <li>Smart Landing Page improvements</li>
+</ol>
+
+<h3 id="r30b10">
+  <span class="permalink">
+    <a href="#r30b10">{% trans %}3.0 Beta 10 (Jan 2019){% endtrans %}</a>
+  </span>
+</h3>
+
+<ol style="list-style-type: square;">
+  <li>Research I2P Plugins Support</li>
+  <li>Research Peer-to-Peer messaging support compatible with BiglyBT</li>
+</ol>
+
+{% endblock %}

i2p2www/urls.py

@@ -82,6 +82,7 @@ url('/<lang:lang>/browser/faq', 'browser.browser_faq')
 url('/<lang:lang>/browser/known_issues', 'browser.browser_known_issues')
 url('/<lang:lang>/browser/troubleshooting', 'browser.browser_troubleshooting')
 url('/<lang:lang>/browser/releasenotes', 'browser.browser_releasenotes')
+url('/<lang:lang>/browser/roadmap', 'browser.browser_roadmap')
 url('/<lang:lang>/browser/updating', 'browser.browser_updating')
 url('/<lang:lang>/browser/download', 'browser.browser_download')
 url('/<lang:lang>/browser/donate', 'browser.browser_donate')