propagate from branch 'i2p.www' (head 3a0922a7dadd3bd3da78f979e22d19e587736830)

to branch 'i2p.www.revamp' (head 5821b19a04fd11c8b9f2db7e967c9c01c785736b)

i2p2www/pages/blog/post.html

@@ -2,11 +2,13 @@
 {%- from "global/macros" import render_categories with context -%}
 {% block title %}{{ title }} - {{ _('Blog') }}{% endblock %}
 {% block content %}
-<ul id="post-info" class="lastupdated">
+<div class="meta">
+<ul id="post-info">
   <li class="date">{{ _('Posted:') }} {{ meta.date }}</li>
   <li class="author">{{ _('Author:') }} {{ meta.author }}</li>
   <li class="category">{{ render_categories(meta.category)|safe }}</li>
 </ul>
+</div>
 {% autoescape false %}
 {{ body }}
 {% endautoescape %}

i2p2www/pages/global/layout.html

@@ -13,6 +13,7 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.css') }}" media="screen, handheld, print, projection" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen and (min-device-width:320px) and (max-width:767px)" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" />
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/widescreen.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:1120px) and (min-width:1120px), print, projection" />
     <!--[if IEMobile]>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen" />
     <![endif]-->
@@ -22,6 +23,7 @@
     {% if is_rtl() -%}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.rtl.css') }}" media="screen, handheld, print, projection" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.rtl.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" />
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/widescreen.rtl.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:1120px) and (min-width:1120px), print, projection" />
     {%- endif %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/syntax.css') }}" media="screen, handheld, print, projection" />
     {%- endif %}
@@ -49,9 +51,27 @@
     <div class="container-fluid{% if not self.content() %} well{% endif %}">
       <div id="content">
         {% block content_outer %}
-        <article class="inner">
+        <div class="title">
+          <h1>{{ self.title() }}</h1>
+        </div>
+
+        <main role="main" class="inner">
+        <div class="fluid">
+          {% if self.content_nav() or self.sidebar() -%}
+          <aside class="sidebar">
+            {% if self.content_nav() -%}
+            <nav{% if self.sidebar() %} class="top"{% endif %}>
+            {% block content_nav %}{% endblock %}
+            </nav>
+            {%- endif %}
+
+            {% block sidebar %}{% endblock %}
+          </aside>
+          {%- endif %}
+
+          <article class="content-inner">
           {% if self.lastupdated() or self.accuratefor() -%}
-          <div class="lastupdated">
+          <div class="meta">
             <!--
             {% block lastupdated %}{% endblock %}
             {% block accuratefor %}{% endblock %}
@@ -72,11 +92,10 @@
           </div>
           {%- endif %}
 
-          <div class="title">
-            <h1>{{ self.title() }}</h1>
-          </div>
-        {% block content %}{% endblock %}
-        </article>
+          {% block content %}{% endblock %}
+          </article>
+        </div>
+        </main>
       {% endblock %}
       </div>
       <footer id="global-footer">

i2p2www/pages/papers/list.html

@@ -3,7 +3,7 @@
 {% block headextra %}
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/pubs.css') }}" />
 {% endblock %}
-{% block content %}
+{% block content_nav %}
 <div class="biblinks">
 <p align="center">
 {%- if bib.tag|length %}<a href='{% if bib.field != 'date' -%}
@@ -41,14 +41,8 @@
 </p>
 </div>
 
-<!-- Table 1: contains the sidebar and the body. -->
-<table cellspacing="3" cellpadding="0" border="0" align="center" width="100%%">
-<tr valign="top">
-<td>
-
 <!-- Table 2: The sidebar-->
-<table align="right" cellspacing="0" cellpadding="5" width="100"
-     class="sidebar">
+<table align="right" cellspacing="0" cellpadding="5" width="100%">
 <tr valign="top"><td><p class="l1"><strong>{{ bib.sectiontypes }}:</strong><br /></p>
 {% for section in bib.sections %}
 <p class="l2"><a href="#{{ section.slug }}">{{ section.name }}</a></p>
@@ -56,10 +50,9 @@
 </td>
 </tr>
 </table><!-- End of table 2 -->
-</td>
-
-<td width="85%%">
+{% endblock %}
 
+{% block content %}
 <h2>Publications by {{ bib.field }}</h2>
 
 <ul class="sections">
@@ -73,13 +66,6 @@
 {% endfor %}
 </ul>
 
-</td>
-
-<td width="5%%"><br /></td>
-
-</tr>
-</table><!-- End of table 1 -->
-
 <p class="contact">{% trans email="press&#64;i2<!-- -->p2.de"|safe,
 bibtex = get_url('papers_bibtex', tag=bib.tag) if bib.tag else get_url('papers_bibtex'),
 citeseer = 'http://citeseer.ist.psu.edu/online-nature01/' -%}

i2p2www/pages/site/docs/applications/supported.html

@@ -1,10 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Supported Applications{% endtrans %}{% endblock %}
-{% block content %}
-
-<h1 class="title">{% trans %}Supported Applications{% endtrans %}</h1>
-
-<div id="TOC">
+{% block content_nav %}
   <ul>
     <li><a href="#blogging-and-forums">{% trans %}Blogging, Forums, and Wikis{% endtrans %}</a></li>
 
@@ -80,8 +76,9 @@
       </ul>
     </li>
   </ul>
-</div>
+{% endblock %}
 
+{% block content %}
 <p>{% trans trac='https://trac.i2p2.de/report/1' -%}
 This is intended to be a comprehensive listing of applications used with
 I2P. If you know of something that's missing please submit a ticket on

i2p2www/pages/site/docs/how/tech-intro.html

@@ -1,26 +1,22 @@
 {% extends "global/layout.html" %}
-{% block title %}{% trans %}Introducing I2P{% endtrans %}{% endblock %}
+{% block title %}{% trans %}I2P: A scalable framework for anonymous communication{% endtrans %}{% endblock %}
+{% block content_nav %}
+<ul>
+  <li><a href="#intro">{% trans %}Introduction{% endtrans %}</a></li>
+  <li>
+    <a href="#op">{% trans %}I2P Operation{% endtrans %}</a>
+    <ul>
+      <li><a href="#op.overview">{% trans %}Overview{% endtrans %}</a></li>
+      <li><a href="#op.tunnels">{% trans %}Tunnels{% endtrans %}</a></li>
+      <li><a href="#op.netdb">{% trans %}Network Database{% endtrans %}</a></li>
+      <li><a href="#op.transport">{% trans %}Transport protocols{% endtrans %}</a></li>
+      <li><a href="#op.crypto">{% trans %}Cryptography{% endtrans %}</a></li>
+    </ul>
+  </li>
+</ul>
+{% endblock %}
+
 {% block content %}
-
-<h1 class="title">{% trans %}I2P: A scalable framework for anonymous communication{% endtrans %}</h1>
-  <div id="toc">
-    <h2>{% trans %}Table of Contents{% endtrans %}</h2>
-      <ul>
-        <li><a href="#intro">{% trans %}Introduction{% endtrans %}</a></li>
-        <li>
-              <a href="#op">{% trans %}I2P Operation{% endtrans %}</a>
-              <ul>
-                <li><a href="#op.overview">{% trans %}Overview{% endtrans %}</a></li>
-                <li><a href="#op.tunnels">{% trans %}Tunnels{% endtrans %}</a></li>
-                <li><a href="#op.netdb">{% trans %}Network Database{% endtrans %}</a></li>
-                <li><a href="#op.transport">{% trans %}Transport protocols{% endtrans %}</a></li>
-                <li><a href="#op.crypto">{% trans %}Cryptography{% endtrans %}</a></li>
-              </ul>
-        </li>
-      </ul>
-  </div> 
-
-  <br/>
   <h1 id="intro">{% trans %}Introduction{% endtrans %}</h1>
   <p>{% trans -%}
 I2P is a scalable, self organizing, resilient packet switched anonymous 

i2p2www/pages/site/docs/how/threat-model.html

@@ -41,6 +41,30 @@
 </ul>
 {% endmacro %}
 
+{% block content_nav %}
+<h3>{% trans %}Index of Attacks{% endtrans %}</h3>
+<ul>
+<li><a href="#bruteforce">{% trans %}Brute force attacks{% endtrans %}</a></li>
+<li><a href="#timing">{% trans %}Timing attacks{% endtrans %}</a></li>
+<li><a href="#intersection">{% trans %}Intersection attacks{% endtrans %}</a></li>
+<li><a href="#dos">{% trans %}Denial of service attacks{% endtrans %}</a></li>
+<li><a href="#tagging">{% trans %}Tagging attacks{% endtrans %}</a></li>
+<li><a href="#partitioning">{% trans %}Partitioning attacks{% endtrans %}</a></li>
+<li><a href="#predecessor">{% trans %}Predecessor attacks{% endtrans %}</a></li>
+<li><a href="#harvesting">{% trans %}Harvesting attacks{% endtrans %}</a></li>
+<li><a href="#traffic">{% trans %}Identification Through Traffic Analysis{% endtrans %}</a></li>
+<li><a href="#sybil">{% trans %}Sybil attacks{% endtrans %}</a></li>
+<li><a href="#buddy">{% trans %}Buddy Exhaustion attacks{% endtrans %}</a></li>
+<li><a href="#crypto">{% trans %}Cryptographic attacks{% endtrans %}</a></li>
+<li><a href="#floodfill">{% trans %}Floodfill attacks{% endtrans %}</a></li>
+<li><a href="#netdb">{% trans %}Other Network Database attacks{% endtrans %}</a></li>
+<li><a href="#central">{% trans %}Attacks on centralized resources{% endtrans %}</a></li>
+<li><a href="#dev">{% trans %}Development attacks{% endtrans %}</a></li>
+<li><a href="#impl">{% trans %}Implementation attacks{% endtrans %}</a></li>
+<li><a href="#blocklist">{% trans %}Other Defenses{% endtrans %}</a></li>
+</ul>
+{% endblock %}
+
 {% block content %}
 <h2>{% trans %}What do we mean by "anonymous"?{% endtrans %}</h2>
 
@@ -179,28 +203,6 @@ and priority scores are calculated using the equations outlined
 
 #}
 
-<h3 id="index">{% trans %}Index of Attacks{% endtrans %}</h3>
-<ul>
-<li><a href="#bruteforce">{% trans %}Brute force attacks{% endtrans %}</a></li>
-<li><a href="#timing">{% trans %}Timing attacks{% endtrans %}</a></li>
-<li><a href="#intersection">{% trans %}Intersection attacks{% endtrans %}</a></li>
-<li><a href="#dos">{% trans %}Denial of service attacks{% endtrans %}</a></li>
-<li><a href="#tagging">{% trans %}Tagging attacks{% endtrans %}</a></li>
-<li><a href="#partitioning">{% trans %}Partitioning attacks{% endtrans %}</a></li>
-<li><a href="#predecessor">{% trans %}Predecessor attacks{% endtrans %}</a></li>
-<li><a href="#harvesting">{% trans %}Harvesting attacks{% endtrans %}</a></li>
-<li><a href="#traffic">{% trans %}Identification Through Traffic Analysis{% endtrans %}</a></li>
-<li><a href="#sybil">{% trans %}Sybil attacks{% endtrans %}</a></li>
-<li><a href="#buddy">{% trans %}Buddy Exhaustion attacks{% endtrans %}</a></li>
-<li><a href="#crypto">{% trans %}Cryptographic attacks{% endtrans %}</a></li>
-<li><a href="#floodfill">{% trans %}Floodfill attacks{% endtrans %}</a></li>
-<li><a href="#netdb">{% trans %}Other Network Database attacks{% endtrans %}</a></li>
-<li><a href="#central">{% trans %}Attacks on centralized resources{% endtrans %}</a></li>
-<li><a href="#dev">{% trans %}Development attacks{% endtrans %}</a></li>
-<li><a href="#impl">{% trans %}Implementation attacks{% endtrans %}</a></li>
-<li><a href="#blocklist">{% trans %}Other Defenses{% endtrans %}</a></li>
-</ul>
-
 <h3 id="bruteforce">{% trans %}Brute force attacks{% endtrans %}</h3>
 
 {# DREAD_score(2, 1, 1, 1, 3) #}

i2p2www/pages/site/docs/spec/common-structures.html

@@ -2,16 +2,7 @@
 {% block title %}{% trans %}Common structures Specification{% endtrans %}{% endblock %}
 {% block lastupdated %}{% trans %}April 2015{% endtrans %}{% endblock %}
 {% block accuratefor %}0.9.19{% endblock %}
-{% block content %}
-<p>{% trans i2np=site_url('docs/protocol/i2np'),
-i2cp=site_url('docs/protocol/i2cp'),
-ssu=site_url('docs/transport/ssu') -%}
-This document describes some data types common to all I2P protocols, like
-<a href="{{ i2np }}">I2NP</a>, <a href="{{ i2cp }}">I2CP</a>,
-<a href="{{ ssu }}">SSU</a>, etc.
-{%- endtrans %}</p>
-
-<h2>Index</h2>
+{% block content_nav %}
 <table border=1>
 <tr><th>{% trans %}Type{% endtrans %}</th></tr>
 <tr><td><a href="#type_Boolean">Boolean</a></td></tr>
@@ -37,6 +28,16 @@ This document describes some data types common to all I2P protocols, like
 <tr><td><a href="#type_String">String</a></td></tr>
 <tr><td><a href="#type_TunnelId">TunnelId</a></td></tr>
 </table>
+{% endblock %}
+
+{% block content %}
+<p>{% trans i2np=site_url('docs/protocol/i2np'),
+i2cp=site_url('docs/protocol/i2cp'),
+ssu=site_url('docs/transport/ssu') -%}
+This document describes some data types common to all I2P protocols, like
+<a href="{{ i2np }}">I2NP</a>, <a href="{{ i2cp }}">I2CP</a>,
+<a href="{{ ssu }}">SSU</a>, etc.
+{%- endtrans %}</p>
 
 <h2 id="type_Integer">Integer</h2>
 <h4>{% trans %}Description{% endtrans %}</h4>

i2p2www/pages/site/faq.html

@@ -1,7 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Frequently Asked Questions') }}{% endblock %}
-{% block content %}
-<h3 id="index">{{ _('Index') }}</h3>
+{% block content_nav %}
 <ol>
 <li style="list-style: none; display: inline">
 <h4>{{ _('General') }}</h4>
@@ -47,7 +46,9 @@
 <li><a href="#compat6x">{% trans %}I'm using FreeBSD and when I start I2P I receive an error about <code>libm.so.4</code>!{% endtrans %}</a></li>
 <li><a href="#protocolfamily">{% trans %}In <code>wrapper.log</code> I see an error stating <code>Protocol family unavailable</code> when I2P is loading{% endtrans %}</a></li>
 </ol>
+{% endblock %}
 
+{% block content %}
 <h3 id="systems">{% trans %}What systems will I2P run on?{% endtrans %}
 <span class="permalink">(<a href="#systems">{{ _('link') }}</a>)</span></h3>
 <p>{% trans chart='https://trac.i2p2.de/wiki/java' -%}

i2p2www/pages/site/get-involved/develop/applications.html

@@ -2,17 +2,16 @@
 {% block title %}{{ _('Application Development') }}{% endblock %}
 {% block lastupdated %}{% trans %}May 2013{% endtrans %}{% endblock %}
 {% block accuratefor %}0.9.6{% endblock %}
-{% block content %}
-<h1>{{ _('Application Development Guide') }}</h1>
-
-<h2>{{ _('Contents') }}</h2>
+{% block content_nav %}
 <ul>
     <li><a href="#why">{{ _('Why write I2P-specific code?') }}</a></li>
     <li><a href="#concepts">{{ _('Important concepts') }}</a></li>
     <li><a href="#options">{{ _('Development options') }}</a></li>
     <li><a href="#start"><b>{{ _('Start developing - a simple guide') }}</b></a></li>
 </ul>
+{% endblock %}
 
+{% block content %}
 <h2 id="why">{{ _('Why write I2P-specific code?') }}</h2>
 
 <p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}

i2p2www/pages/site/get-involved/guides/monotone.html

@@ -1,7 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Monotone Guide{% endtrans %}{% endblock %}
-{% block content %}
-<div id="TOC">
+{% block content_nav %}
   <ol>
     <li>
       <a href="#operating-a-monotone-client">{% trans %}Operating a Monotone client{% endtrans %}</a>
@@ -26,8 +25,9 @@
       </ol>
     </li>
   </ol>
-</div>
+{% endblock %}
 
+{% block content %}
 <p><i>
   {% trans transitionguide=site_url('misc/transition-guide'), newdevs=site_url('get-involved/guides/new-developers') -%}
   This is a revised version of <a href="{{ transitionguide }}">Complication's original

i2p2www/pages/site/get-involved/guides/new-developers.html

@@ -1,17 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}New Developer's Guide{% endtrans %}{% endblock %}
-{% block content %}
-<p>{% trans %}
-So you want to start work on I2P? Great!
-Here's a quick guide to getting started
-on contributing to the website or the software, doing development or creating translations.
-{%- endtrans %}</p>
-<p>{% trans volunteer=site_url('get-involved') %}
-Not quite ready for coding?
-Try <a href="{{ volunteer }}">getting involved</a> first.
-{%- endtrans %}</p>
-
-<div id="TOC">
+{% block content_nav %}
   <ol>
     <li><a href="#basic-study">{% trans %}Basic study{% endtrans %}</a></li>
     <li><a href="#getting-the-i2p-code">{% trans %}Getting the I2P code{% endtrans %}</a></li>
@@ -22,7 +11,18 @@ Try <a href="{{ volunteer }}">getting involved</a> first.
     <li><a href="#translations">{% trans %}Translations{% endtrans %}</a></li>
     <li><a href="#tools">{% trans %}Tools{% endtrans %}</a></li>
   </ol>
-</div>
+{% endblock %}
+
+{% block content %}
+<p>{% trans %}
+So you want to start work on I2P? Great!
+Here's a quick guide to getting started
+on contributing to the website or the software, doing development or creating translations.
+{%- endtrans %}</p>
+<p>{% trans volunteer=site_url('get-involved') %}
+Not quite ready for coding?
+Try <a href="{{ volunteer }}">getting involved</a> first.
+{%- endtrans %}</p>
 
 <h2 id="basic-study">{% trans %}Basic study{% endtrans %}</h2>
 

i2p2www/pages/site/get-involved/todo.html

@@ -1,24 +1,14 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('I2P Project Targets') }}{% endblock %}
-{% block content %}
-<p>{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
-Below is a more detailed (yet still incomplete) discussion of the major areas
-of future development on the core I2P network, spanning the plausibly planned
-releases. This does not include stego transports, porting to wireless devices,
-or tools to secure the local machine, nor does it include client applications
-that will be essential in I2P's success. There are probably other things that
-will come up, especially as I2P gets more peer review, but these are the main
-'big things'. See also <a href="{{ roadmap }}">the roadmap</a>. Want to help?
-<a href="{{ volunteer }}">Get involved</a>!
-{%- endtrans %}</p>
-
-<h2>{{ _('Core functionality') }} <span class="permalink"><a href="#core">[{{ _('link') }}]</a></span></h2>
+{% block content_nav %}
+<ul>
+<li><a href="#core">{{ _('Core functionality') }}</a>
   <ul class="targetlist">
     <li><a href="#netdb">{% trans -%}
 NetworkDB and profile tuning and ejection policy for large nets
 {%- endtrans %}</a></li>
-  </ul>
-<h2>{{ _('Security / anonymity') }} <span class="permalink"><a href="#security">[{{ _('link') }}]</a></span></h2>
+  </ul></li>
+<li><a href="#security">{{ _('Security / anonymity') }}</a>
   <ul class="targetlist">
     <li><a href="#fullRestrictedRoutes">{% trans -%}
 Full blown n-hop restricted routes with optional trusted links
@@ -32,8 +22,22 @@ Advanced tunnel operation (batching/mixing/throttling/padding)
     <li><a href="#stop">{% trans -%}
 Stop &amp; go mix w/ garlics &amp; tunnels
 {%- endtrans %}</a></li>
-  </ul>
-<h2>{{ _('Performance') }} <span class="permalink"><a href="{{ site_url('about/performance/future') }}">[{{ _('link') }}]</a></span></h2>
+  </ul></li>
+<li><a href="{{ site_url('about/performance/future') }}">{{ _('Performance') }}</a></li>
+</ul>
+{% endblock %}
+
+{% block content %}
+<p>{% trans roadmap=site_url('get-involved/roadmap'), volunteer=site_url('get-involved') -%}
+Below is a more detailed (yet still incomplete) discussion of the major areas
+of future development on the core I2P network, spanning the plausibly planned
+releases. This does not include stego transports, porting to wireless devices,
+or tools to secure the local machine, nor does it include client applications
+that will be essential in I2P's success. There are probably other things that
+will come up, especially as I2P gets more peer review, but these are the main
+'big things'. See also <a href="{{ roadmap }}">the roadmap</a>. Want to help?
+<a href="{{ volunteer }}">Get involved</a>!
+{%- endtrans %}</p>
 
   <h2 id="core">{{ _('Core functionality') }}</h2>
   <ul class="targetlist">