From 899892e6f7fce3df4527870e206d960f8f800cc3 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 11 Nov 2012 03:12:16 +0000
Subject: [PATCH] Moved developer and translator guides into volunteer/guides

---
 i2p2www/pages/global/nav.html                 |  7 ++++++
 .../site/volunteer/guides/devguidelines.html  |  4 ++--
 .../site/volunteer/guides}/newdevelopers.html | 22 +++++++++----------
 .../volunteer/guides}/newtranslators.html     |  6 ++---
 i2p2www/pages/site/volunteer/index.html       |  8 +++----
 5 files changed, 27 insertions(+), 20 deletions(-)
 rename www.i2p2/pages/dev-guidelines.html => i2p2www/pages/site/volunteer/guides/devguidelines.html (97%)
 rename {www.i2p2/pages => i2p2www/pages/site/volunteer/guides}/newdevelopers.html (89%)
 rename {www.i2p2/pages => i2p2www/pages/site/volunteer/guides}/newtranslators.html (96%)

diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 8d6a2dee..ee7b9fb5 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -69,6 +69,13 @@
   <li class="has-sub"><a href="#"><span>{{ _('Volunteer') }}</span></a>
     <ul>
       <li><a href="{{ site_url('volunteer') }}"><span>{{ _('Get involved!') }}</span></a></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>
+          <li><a href="{{ site_url('volunteer/guides/devguidelines') }}"><span>{{ _('Developer guidelines and coding style') }}</span></a></li>
+          <li><a href="{{ site_url('volunteer/guides/newtranslators') }}"><span>{{ _('New translators') }}</span></a></li>
+        </ul>
+      </li>
       <li><a href="{{ site_url('volunteer/team') }}"><span>{{ _('Team') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/halloffame') }}"><span>{{ _('Hall of Fame') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/bounties') }}"><span>{{ _('Bounties') }}</span></a></li>
diff --git a/www.i2p2/pages/dev-guidelines.html b/i2p2www/pages/site/volunteer/guides/devguidelines.html
similarity index 97%
rename from www.i2p2/pages/dev-guidelines.html
rename to i2p2www/pages/site/volunteer/guides/devguidelines.html
index 2943f1ad..4e21f36c 100644
--- a/www.i2p2/pages/dev-guidelines.html
+++ b/i2p2www/pages/site/volunteer/guides/devguidelines.html
@@ -1,8 +1,8 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Developer Guidelines and Coding Style{% endblock %}
 {% block content %}
 <p>
-  Read the <a href="newdevelopers.html">new developers guide</a> first.  
+  Read the <a href="{{ site_url('volunteer/guides/newdevelopers') }}">new developers guide</a> first.  
 </p>
 
 <h2>Basic Guidelines and Coding Style</h2>
diff --git a/www.i2p2/pages/newdevelopers.html b/i2p2www/pages/site/volunteer/guides/newdevelopers.html
similarity index 89%
rename from www.i2p2/pages/newdevelopers.html
rename to i2p2www/pages/site/volunteer/guides/newdevelopers.html
index 5b107257..cc81ad00 100644
--- a/www.i2p2/pages/newdevelopers.html
+++ b/i2p2www/pages/site/volunteer/guides/newdevelopers.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}New Developer's Guide{% endblock %}
 {% block content %}
 <p>
@@ -8,7 +8,7 @@
 </p>
 <p>
   Not quite ready for coding?
-  Try <a href="getinvolved">getting involved</a> first.
+  Try <a href="{{ site_url('volunteer') }}">getting involved</a> first.
 </p>
 
 <div id="TOC">
@@ -31,9 +31,9 @@
   If you don't have experience with Java, you can always have a look at <a href="http://www.mindview.net/Books/TIJ/">Thinking in Java</a>.
 </p>
 <p>
-  Study the <a href="how_intro">how intro</a>,
-  the <a href="how">other "how" documents</a>,
-  the <a href="techintro">tech intro</a>,
+  Study the <a href="{{ site_url('docs/how/intro') }}">how intro</a>,
+  the <a href="{{ site_url('docs') }}">other "how" documents</a>,
+  the <a href="{{ site_url('docs/how/techintro') }}">tech intro</a>,
   and associated documents.
   These will give you a good overview of how I2P is structured and what different things it does.
 </p>
@@ -56,14 +56,14 @@
       If you want to remain anonymous, you need to do an additional step, to set up a connection to a monotone server over I2P:
     </p>
     <p>
-      Enable the <a href="i2ptunnel">i2ptunnel</a> client tunnel on port 8998 pointing to mtn.i2p2.i2p.
+      Enable the <a href="{{ site_url('docs/api/i2ptunnel') }}">i2ptunnel</a> client tunnel on port 8998 pointing to mtn.i2p2.i2p.
     </p>
   </li>
   <li>
   Pick a directory where you want to put all your I2P files, and create a monotone database: <code><b>mtn -d i2p.mtn db init</b></code>
   </li>
   <li>Define the trust list by creating <code>~/.monotone/monotonerc</code> (or <code>_MTN/monotonerc</code> in the i2p.i2p workspace) with the following contents:
-{% include "_monotonerc.html" %}
+{% include "include/monotonerc.html" %}
 </li>
   <li>Copy and paste the <a href="developerskeys">developer's commit keys</a> into a new file (e.g. <code>keys.txt</code>) in the same directory
   that <code>i2p.mtn</code> is in. Import the keys into your database with <br><code><pre>      mtn -d i2p.mtn read < keys.txt</pre></code>
@@ -124,13 +124,13 @@
 
 <p>
   For development on new applications,
-  see the <a href="applications">application development guide</a>.
+  see the <a href="{{ site_url('develop/applications') }}">application development guide</a>.
 </p>
 
 <h2 id="development-ideas">Development ideas</h2>
 <p>
   See <a href="http://zzz.i2p/forums/3">zzz's TODO lists</a>,
-  <a href="todo">this website's TODO list</a> or
+  <a href="{{ site_url('volunteer/todo') }}">this website's TODO list</a> or
   <a href="http://trac.i2p2.de/report/1">Trac</a>
   for ideas.
 </p>
@@ -138,7 +138,7 @@
 <h2 id="making-the-results-available">Making the results available</h2>
 
 <p>
-  See the bottom of <a href="licenses#commit">licenses.html</a> for
+  See the bottom of <a href="{{ site_url('develop/licenses') }}#commit">licenses.html</a> for
   commit privilege requirements. You need these to put code into i2p.i2p (not required for the website!).
 </p>
 
@@ -163,7 +163,7 @@
 
 <h2 id="translations">Translations</h2>
 <p>
-  Website and router console translators: See the <a href="newtranslators">New Translators Page</a>
+  Website and router console translators: See the <a href="{{ site_url('volunteer/guides/newtranslators') }}">New Translators Page</a>
   for next steps.
 </p>
 
diff --git a/www.i2p2/pages/newtranslators.html b/i2p2www/pages/site/volunteer/guides/newtranslators.html
similarity index 96%
rename from www.i2p2/pages/newtranslators.html
rename to i2p2www/pages/site/volunteer/guides/newtranslators.html
index 064f3d77..174f69ac 100644
--- a/www.i2p2/pages/newtranslators.html
+++ b/i2p2www/pages/site/volunteer/guides/newtranslators.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}New Translator's Guide{% endblock %}
 {% block content %}
 Here's a very quick guide to getting started.
@@ -15,7 +15,7 @@ Preparation
    To make sure other coworkers don't bump onto the files you are working on,
    please update the translation status on <a href="http://ugha.i2p/i2pTranslation">this wiki page</a>.</li>
   <li>
-   Follow the <a href="newdevelopers">new developer's guide</a>,
+   Follow the <a href="{{ site_url('volunteer/guides/newdevelopers') }}">new developer's guide</a>,
    Including the installation of monotone,
    checking out i2p.www branch, and generate your own monotone keys.
    It is not required that you sign a dev agreement.</li>
@@ -62,7 +62,7 @@ Preparation
    To make sure other coworkers don't bump onto the files you are working on,
    please update the translation status on <a href="http://ugha.i2p/i2pTranslation">this wiki page</a>.</li>
   <li>
-   Follow the <a href="newdevelopers.html">new developer's guide</a>,
+   Follow the <a href="{{ site_url('volunteer/guides/newdevelopers') }}">new developer's guide</a>,
    Including the installation of monotone and the gettext tools,
    checking out i2p.i2p branch, and generate your own monotone keys.</li>
   <li>
diff --git a/i2p2www/pages/site/volunteer/index.html b/i2p2www/pages/site/volunteer/index.html
index c436f5c2..e0df20bf 100644
--- a/i2p2www/pages/site/volunteer/index.html
+++ b/i2p2www/pages/site/volunteer/index.html
@@ -4,7 +4,7 @@
 <h1>We need your help!</h1>
 <p>To get involved, please feel free to join us on the #i2p IRC channel (on
 irc.freenode.net, or within I2P on irc.freshcoffee.i2p or irc.postman.i2p).</p>
-<p>If you're interested in joining our <a href="team">team</a>, please get in
+<p>If you're interested in joining our <a href="{{ site_url('volunteer/team') }}">team</a>, please get in
 touch as we're always looking for eager contributors!</p>    
 <p>
 We need help in many areas, and you don't need to know Java to contribute!
@@ -36,17 +36,17 @@ There's plenty to do if you know Java or are ready to learn.
 Check for open tickets on <a href="http://trac.i2p2.de/report/1">Trac</a>
 or the TODO list on <a href="http://zzz.i2p/">zzz.i2p</a> for
 some ideas on where to start.
-See the <a href="newdevelopers.html">new developer's guide</a> for details.
+See the <a href="{{ site_url('volunteer/guides/newdevelopers') }}">new developer's guide</a> for details.
 </li><li><b>Translation</b> &mdash;
 Help translate the website and the software into your language.
-See the <a href="newtranslators.html">new translator's guide</a> for details.
+See the <a href="{{ site_url('volunteer/guides/newtranslators') }}">new translator's guide</a> for details.
 </li><li><b>Analysis</b> &mdash;
 Study or test the code to look for vulnerabilities.
 Both anonymity vulnerabilities from the various
 <a href="{{ site_url('docs/how/threatmodel') }}">threat models</a>,
 and DOS and other weaknesses due to securities holes,
 need researching.
-</li><li><b><a href="donate.html">Donate</a></b>
+</li><li><b><a href="{{ site_url('volunteer/donate') }}">Donate</a></b>
 
 </li></ul>
 {% endblock %}