From 2faf4fff0f3427f80e8a5b9d5640acf8f6ff976e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 1 Jan 2013 10:28:57 +0000
Subject: [PATCH] Split off academic papers into a new research section

---
 i2p2www/pages/global/nav.html                 |   8 +-
 .../site/about/{papers.html => media.html}    |  98 +---------------
 i2p2www/pages/site/research/index.html        |  11 ++
 i2p2www/pages/site/research/papers.html       | 107 ++++++++++++++++++
 4 files changed, 128 insertions(+), 96 deletions(-)
 rename i2p2www/pages/site/about/{papers.html => media.html} (63%)
 create mode 100644 i2p2www/pages/site/research/index.html
 create mode 100644 i2p2www/pages/site/research/papers.html

diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index eea2bed0..41110946 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -92,7 +92,7 @@
       <li><a href="{{ site_url('about/team') }}"><span>{{ _('Team') }}</span></a></li>
       <li><a href="{{ get_url('blog_index') }}"><span>{{ _('Blog') }}</span></a></li>
       <li><a href="{{ site_url('about/halloffame') }}"><span>{{ _('Hall of Fame') }}</span></a></li>
-      <li><a href="{{ site_url('about/papers') }}"><span>{{ _('Papers and presentations') }}</span></a></li>
+      <li><a href="{{ site_url('about/media') }}"><span>{{ _('Presentations, tutorials and articles') }}</span></a></li>
       <li><a href="{{ site_url('about/contact') }}"><span>{{ _('Contact us') }}</span></a></li>
     </ul>
   </li>
@@ -118,6 +118,12 @@
           <li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><span>{{ _('Bug tracker') }}</span></a></li>
         </ul>
       </li>
+      <li class="has-sub"><a href="#"><span>{{ _('Research') }}</span></a>
+        <ul>
+          <li><a href="{{ site_url('research') }}"><span>{{ _('Academic research') }}</span></a></li>
+          <li><a href="{{ site_url('research/papers') }}"><span>{{ _('Papers on I2P') }}</span></a></li>
+        </ul>
+      </li>
       <li class="has-sub"><a href="#"><span>{{ _('Guides') }}</span></a>
         <ul>
           <li><a href="{{ site_url('volunteer/guides/newdevelopers') }}"><span>{{ _('New developers') }}</span></a></li>
diff --git a/i2p2www/pages/site/about/papers.html b/i2p2www/pages/site/about/media.html
similarity index 63%
rename from i2p2www/pages/site/about/papers.html
rename to i2p2www/pages/site/about/media.html
index 9a0fe279..c4dddaa4 100644
--- a/i2p2www/pages/site/about/papers.html
+++ b/i2p2www/pages/site/about/media.html
@@ -1,9 +1,9 @@
 {% extends "global/layout.html" %}
-{% block title %}Papers and Presentations on I2P{% endblock %}
+{% block title %}Presentations on I2P{% endblock %}
 {% block content %}
-<h1>Papers and Presentations on I2P</h1>
+<h1>Presentations on I2P</h1>
 <p>
-Following are links to papers, presentations, videos, and tutorials about I2P.
+Following are links to presentations, videos, and tutorials about I2P. Links to research papers on I2P are available <a href="{{ site_url('research/papers') }}">here</a>.
 </p><p>
 To request an addition to this page, please send to press ~~~at~~~ i2p2.de.
 </p><p>
@@ -11,98 +11,6 @@ Newest links are at the bottom of each section.
 </p>
 <div class="links">
 
-<h2>Papers and Research</h2>
-<ul>
-
-<li>
-<a href="{{ url_for('static', filename='pdf/i2p_philosophy.pdf') }}">Invisible Internet Project (I2P) Project Overview</a>, jrandom, August 28, 2003.
-</li>
-
-<li>
-<a href="{{ url_for('static', filename='pdf/I2P-PET-CON-2009.1.pdf') }}">Peer Profiling and Selection in the I2P Anonymous Network</a> -
-zzz and Lars Schimmer,
-presented at
-<a href="http://www.pet-con.org/index.php/PET_Convention_2009.1">PET-CON 2009.1</a>,
-Dresden, Germany, March 24-25, 2009.
-Also available in the
-<a href="http://freehaven.net/~karsten/volatile/petcon-proceedings-2009.1.pdf">Proceedings</a>
-page 59.
-</li>
-
-<li>
-Anonymity Techniques - Usability Tests of Major Anonymity Networks
-- Jens Schomburg,
-Presented at
-<a href="http://www.pet-con.org/index.php/PET_Convention_2009.1">PET-CON 2009.1</a>,
-Dresden, Germany, March 24-25, 2009.
-Available in the
-<a href="http://freehaven.net/~karsten/volatile/petcon-proceedings-2009.1.pdf">Proceedings</a>
-page 49.
-Extended 20-page version also may be available.
-</li>
-
-<li>
-L'émergence au sein d'internet de communautés virtuelles et anonymes, Freenet et i2p
-- Laurie Delmer -
-Université catholique de Louvain
-Département des sciences politiques et sociales
-(Catholic University of Leuven -
-Department of Political and Social Science -
-The rise in internet virtual and anonymous communities, Freenet and I2P)
-Master's Thesis, 2009.
-</li>
-
-<li>
-<a href="http://www.irongeek.com/i.php?page=security/darknets-i2p-identifying-hidden-servers">Darknets - I2P Identifying Hidden Servers</a>
-Adrian Crenshaw.
-Presented at Black Hat DC,
-January 18-19 2011
-<a href="http://translated.by/you/darknets-and-hidden-servers-identifying-the-true-ip-network-identity-of-i2p-service-hosts/into-ru/">Russian translation</a>
-</li>
-
-<li>
-Privacy-Implications of Performance-Based Peer Selection by Onion-Routers: A Real-World Case Study using I2P,
-Michael Hermann. 
-Master's Thesis, TU-Munich, March 28, 2011.
-<a href="http://grothoff.org/christian/i2p.pdf">Privacy-Implications of Performance-Based Peer Selection by Onion-Routers: A Real-World Case Study using I2P</a>,
-Michael Hermann, Christian Grothoff. 
-Presented at PET Symposium, Waterloo Canada, July 27, 2011.
-<a href="http://grothoff.org/christian/teaching/2011/2194/i2p.odp">presentation slides (odp)</a>
-</li>
-
-<li>
-<a href="http://hal.inria.fr/inria-00632259/en/">Monitoring the I2P Network</a>,
-Juan Pablo Timpanaro, Isabelle Chrisment, Olivier Festor,
-INRIA Nancy-Grand Est, France,
-LORIA - ESIAL, Henri Poincare University, Nancy 1, France.
-October 2011.
-</li>
-
-<li>
-<a href="http://userpage.fu-berlin.de/~semu/docs/2011_seminar_ehlert_i2p.pdf">I2P Usability vs. Tor Usability A Bandwidth and Latency Comparison</a>
-Mathias Ehlert,
-Humboldt University of Berlin,
-November 2011.
-<a href="http://translated.by/you/i2p-usability-vs-tor-usability-a-bandwidth-and-latency-comparison/into-ru/">Russian translation</a>
-</li>
-
-<li>
-<a href="http://hal.inria.fr/hal-00744922/">Improving Content Availability in the I2P Anonymous File-Sharing Environment</a>
-Juan Pablo Timpanaro, Isabelle Chrisment, Olivier Festor,
-INRIA Nancy-Grand Est, France,
-LORIA - ESIAL, Universite de Lorraine
-October 2012.
-</li>
-
-<li>
-<a href="http://hal.inria.fr/hal-00744919">A Bird's Eye View on the I2P Anonymous File-sharing Environment</a>
-Juan Pablo Timpanaro, Isabelle Chrisment, Olivier Festor,
-INRIA Nancy-Grand Est, France,
-LORIA - ESIAL, Universite de Lorraine
-November 2012.
-</li>
-</ul>
-
 <h2>Presentations</h2>
 <ul>
 
diff --git a/i2p2www/pages/site/research/index.html b/i2p2www/pages/site/research/index.html
new file mode 100644
index 00000000..7de08ed2
--- /dev/null
+++ b/i2p2www/pages/site/research/index.html
@@ -0,0 +1,11 @@
+{% extends "global/layout.html" %}
+{% block title %}Academic Research{% endblock %}
+{% block content %}
+<p>
+Academic research and analysis of I2P is an important part of ensuring that the software and network performs as expected and is safe for users in hostile environments.
+</p>
+
+<p>
+A list of published papers on I2P is available <a href="{{ site_url('research/papers') }}">here</a>.
+</p>
+{% endblock %}
diff --git a/i2p2www/pages/site/research/papers.html b/i2p2www/pages/site/research/papers.html
new file mode 100644
index 00000000..345bbbed
--- /dev/null
+++ b/i2p2www/pages/site/research/papers.html
@@ -0,0 +1,107 @@
+{% extends "global/layout.html" %}
+{% block title %}Papers on I2P{% endblock %}
+{% block content %}
+<h1>Papers on I2P</h1>
+<p>
+Following are links to research papers about I2P.
+</p><p>
+To request an addition to this page, please send to press ~~~at~~~ i2p2.de.
+</p><p>
+Newest links are at the bottom of the page.
+</p>
+<div class="links">
+
+<h2>Papers and Research</h2>
+<ul>
+
+<li>
+<a href="{{ url_for('static', filename='pdf/i2p_philosophy.pdf') }}">Invisible Internet Project (I2P) Project Overview</a>, jrandom, August 28, 2003.
+</li>
+
+<li>
+<a href="{{ url_for('static', filename='pdf/I2P-PET-CON-2009.1.pdf') }}">Peer Profiling and Selection in the I2P Anonymous Network</a> -
+zzz and Lars Schimmer,
+presented at
+<a href="http://www.pet-con.org/index.php/PET_Convention_2009.1">PET-CON 2009.1</a>,
+Dresden, Germany, March 24-25, 2009.
+Also available in the
+<a href="http://freehaven.net/~karsten/volatile/petcon-proceedings-2009.1.pdf">Proceedings</a>
+page 59.
+</li>
+
+<li>
+Anonymity Techniques - Usability Tests of Major Anonymity Networks
+- Jens Schomburg,
+Presented at
+<a href="http://www.pet-con.org/index.php/PET_Convention_2009.1">PET-CON 2009.1</a>,
+Dresden, Germany, March 24-25, 2009.
+Available in the
+<a href="http://freehaven.net/~karsten/volatile/petcon-proceedings-2009.1.pdf">Proceedings</a>
+page 49.
+Extended 20-page version also may be available.
+</li>
+
+<li>
+L'émergence au sein d'internet de communautés virtuelles et anonymes, Freenet et i2p
+- Laurie Delmer -
+Université catholique de Louvain
+Département des sciences politiques et sociales
+(Catholic University of Leuven -
+Department of Political and Social Science -
+The rise in internet virtual and anonymous communities, Freenet and I2P)
+Master's Thesis, 2009.
+</li>
+
+<li>
+<a href="http://www.irongeek.com/i.php?page=security/darknets-i2p-identifying-hidden-servers">Darknets - I2P Identifying Hidden Servers</a>
+Adrian Crenshaw.
+Presented at Black Hat DC,
+January 18-19 2011
+<a href="http://translated.by/you/darknets-and-hidden-servers-identifying-the-true-ip-network-identity-of-i2p-service-hosts/into-ru/">Russian translation</a>
+</li>
+
+<li>
+Privacy-Implications of Performance-Based Peer Selection by Onion-Routers: A Real-World Case Study using I2P,
+Michael Hermann. 
+Master's Thesis, TU-Munich, March 28, 2011.
+<a href="http://grothoff.org/christian/i2p.pdf">Privacy-Implications of Performance-Based Peer Selection by Onion-Routers: A Real-World Case Study using I2P</a>,
+Michael Hermann, Christian Grothoff. 
+Presented at PET Symposium, Waterloo Canada, July 27, 2011.
+<a href="http://grothoff.org/christian/teaching/2011/2194/i2p.odp">presentation slides (odp)</a>
+</li>
+
+<li>
+<a href="http://hal.inria.fr/inria-00632259/en/">Monitoring the I2P Network</a>,
+Juan Pablo Timpanaro, Isabelle Chrisment, Olivier Festor,
+INRIA Nancy-Grand Est, France,
+LORIA - ESIAL, Henri Poincare University, Nancy 1, France.
+October 2011.
+</li>
+
+<li>
+<a href="http://userpage.fu-berlin.de/~semu/docs/2011_seminar_ehlert_i2p.pdf">I2P Usability vs. Tor Usability A Bandwidth and Latency Comparison</a>
+Mathias Ehlert,
+Humboldt University of Berlin,
+November 2011.
+<a href="http://translated.by/you/i2p-usability-vs-tor-usability-a-bandwidth-and-latency-comparison/into-ru/">Russian translation</a>
+</li>
+
+<li>
+<a href="http://hal.inria.fr/hal-00744922/">Improving Content Availability in the I2P Anonymous File-Sharing Environment</a>
+Juan Pablo Timpanaro, Isabelle Chrisment, Olivier Festor,
+INRIA Nancy-Grand Est, France,
+LORIA - ESIAL, Universite de Lorraine
+October 2012.
+</li>
+
+<li>
+<a href="http://hal.inria.fr/hal-00744919">A Bird's Eye View on the I2P Anonymous File-sharing Environment</a>
+Juan Pablo Timpanaro, Isabelle Chrisment, Olivier Festor,
+INRIA Nancy-Grand Est, France,
+LORIA - ESIAL, Universite de Lorraine
+November 2012.
+</li>
+</ul>
+
+</div>
+{% endblock %}