propagate from branch 'i2p.www' (head 22904ca45ea1c7c298f3f7de9627dacc6f77d013)

to branch 'i2p.www.str4d' (head 7e3d922345edd815f99d9e3b28d58b9eca48b162)

i2p2www/pages/global/macros

@@ -1,6 +1,7 @@
 {%- macro change_lang(lang) -%}
 {%- if request.endpoint == 'site_show' -%}{{ url_for('site_show', lang=lang, page=page) }}
 {%- elif request.endpoint == 'spec_show' -%}{{ url_for('spec_show', name=name) }}
+{%- elif request.endpoint == 'proposal_show' -%}{{ url_for('proposal_show', name=name) }}
 {%- elif request.endpoint == 'blog_index' -%}
   {%- if category -%}{{ url_for('blog_index', lang=lang, category=category) }}
   {%- else -%}{{ url_for('blog_index', lang=lang) }}
@@ -41,6 +42,12 @@
   </div>
 {%- endmacro -%}
 
+{%- macro render_supercedes(supercedes) -%}
+{%- if supercedes and supercedes|length -%}
+{% for proposal in supercedes %}<a href="{{ proposal_url(proposal) }}">{{ proposal }}</a>{% if not loop.last %}, {% endif %}{% endfor %}
+{%- endif %}
+{%- endmacro %}
+
 {%- macro render_categories(categories) -%}
 {%- if categories and categories|length -%}
 {{ _('Posted in') }} {% for category in categories %}<a href="{{ get_url('blog_index', category=category) }}">{{ category }}</a>{% if not loop.last %}, {% endif %}{% endfor %}

i2p2www/pages/global/nav.html

@@ -30,6 +30,7 @@
         </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>

i2p2www/pages/spec/index.html

@@ -1,9 +1,13 @@
 {% extends "global/layout.html" %}
 {% block title %}I2P Specification Documents{% endblock %}
 {% block content %}
+<p>
 This page provides the specifications for various components of the I2P network
 and router software. These are living documents, and the specifications are
-updated as modifications are made to the network and software.
+updated as modifications are made to the network and software. The proposal
+documents that track changes to these specifications can be viewed
+<a href="{{ url_for('proposal_index') }}">here</a>.
+</p>
 
 <ul><li>
 "Last updated" is the last date when the specification given within a document

i2p2www/pages/spec/proposal-index.html

@@ -0,0 +1,36 @@
+{% extends "global/layout.html" %}
+{% block title %}I2P Proposal Documents{% endblock %}
+{% block content %}
+<p>
+This page is the central index of proposed changes to the
+<a href="{{ url_for('spec_index') }}">I2P specifications</a>.
+</p>
+
+<p>{% trans dev='http://'+i2pconv('zzz.i2p')+'/topics/new?forum_id=7-big-topics-ideas-proposals-and-discussion',
+trac='http://'+i2pconv('trac.i2p2.i2p')+'/newticket?summary=New%20proposal:%20&type=enhancement&milestone=n/a&component=www/i2p&keywords=review-needed' -%}
+To submit a proposal, post it on the <a href="{{ dev }}">development forum</a>
+or <a href="{{ trac }}">enter a ticket with the proposal attached</a>.
+{%- endtrans %}</p>
+
+<table>
+  <tr>
+    <th>Number</th>
+    <th>Title</th>
+    <th>Last updated</th>
+    <th>Status</th>
+    <th>Link</th>
+  </tr>
+  {% for proposal in proposals %}
+  <tr>
+    <td>{{ proposal.num }}</td>
+    <td>{{ proposal.title }}</td>
+    <td><time>{{ proposal.lastupdated }}</time></td>
+    <td>{{ proposal.status }}</td>
+    <td>
+      <a href="{{ url_for('proposal_show', name=proposal.name) }}">HTML</a> |
+      <a href="{{ url_for('proposal_show_txt', name=proposal.name) }}">TXT</a>
+    </td>
+  </tr>
+{% endfor %}
+</table>
+{% endblock %}

i2p2www/pages/spec/proposal-show.html

@@ -0,0 +1,34 @@
+{% extends "global/layout.html" %}
+{%- from "global/macros" import render_supercedes with context -%}
+{% block title %}{{ title }}{% endblock %}
+{% block content_nav %}
+{% autoescape false %}
+{{ toc }}
+{% endautoescape %}
+{% endblock %}
+{% block content %}
+<dl class="meta">
+  <dt>Number</dt>
+  <dd>{{ meta.num }}</dd>
+  <dt>Author</dt>
+  <dd>{{ meta.author }}</dd>
+  <dt>Created</dt>
+  <dd><time datetime="{{ meta.created }}">{{ meta.created }}</time></dd>
+  <dt>Thread</dt>
+  <dd><a href="{{ meta.thread }}">{{ meta.thread }}</a></dd>
+  <dt>Last updated</dt>
+  <dd><time datetime="{{ meta.lastupdated }}">{{ meta.lastupdated }}</time></dd>
+  <dt>Status</dt><dd>{{ meta.status }}</dd>
+  {% if meta.supercededby -%}
+  <dt>Superceded by</dt>
+  <dd><a href="{{ proposal_url(meta.supercededby) }}">{{ meta.supercededby }}</a></dd>
+  {%- endif %}
+  {% if meta.supercedes -%}
+  <dt>Supercedes</dt>
+  <dd>{{ render_supercedes(meta.supercedes)|safe }}</dd>
+  {%- endif %}
+</dl>
+{% autoescape false %}
+{{ body }}
+{% endautoescape %}
+{% endblock %}