From d251d09aa45229809f2799733d65dc8d647e8c2f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 11 Dec 2012 05:58:42 +0000
Subject: [PATCH] Moved team and halloffame pages to an about section

---
 i2p2www/pages/global/footer.html                        | 4 ++--
 i2p2www/pages/global/nav.html                           | 8 ++++++--
 i2p2www/pages/site/{volunteer => about}/halloffame.html | 0
 i2p2www/pages/site/{volunteer => about}/team.html       | 0
 i2p2www/pages/site/volunteer/index.html                 | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename i2p2www/pages/site/{volunteer => about}/halloffame.html (100%)
 rename i2p2www/pages/site/{volunteer => about}/team.html (100%)

diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index 510331bc..72f763be 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -8,8 +8,8 @@
       <div class='aside second'>
         <h1>{{ _('About I2P') }}</h1>
         <ul>
-          <li><a href="{{ site_url('volunteer/team') }}">{{ _('I2P Team') }}</a></li>
-          <li><a href="{{ site_url('volunteer/halloffame') }}">{{ _('Hall of Fame') }}</a></li>
+          <li><a href="{{ site_url('about/team') }}">{{ _('I2P Team') }}</a></li>
+          <li><a href="{{ site_url('about/halloffame') }}">{{ _('Hall of Fame') }}</a></li>
         </ul>
       </div>
       <div class='aside third'>
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 426a5d63..4ab13686 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -108,13 +108,17 @@
           <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>
       <li><a href="{{ site_url('volunteer/roadmap') }}"><span>{{ _('Roadmap') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/todo') }}"><span>{{ _('Task list') }}</span></a></li>
     </ul>
   </li>
+  <li class="has-sub"><a href="#"><span>{{ _('About') }}</span></a>
+    <ul>
+      <li><a href="{{ site_url('about/team') }}"><span>{{ _('Team') }}</span></a></li>
+      <li><a href="{{ site_url('about/halloffame') }}"><span>{{ _('Hall of Fame') }}</span></a></li>
+    </ul>
+  </li>
   <li class="has-sub right"><a href="#"><span>{{ _('Language') }}</span></a>
     {% include "global/lang.html" %}
   </li>
diff --git a/i2p2www/pages/site/volunteer/halloffame.html b/i2p2www/pages/site/about/halloffame.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/halloffame.html
rename to i2p2www/pages/site/about/halloffame.html
diff --git a/i2p2www/pages/site/volunteer/team.html b/i2p2www/pages/site/about/team.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/team.html
rename to i2p2www/pages/site/about/team.html
diff --git a/i2p2www/pages/site/volunteer/index.html b/i2p2www/pages/site/volunteer/index.html
index e0df20bf..10dcdb32 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="{{ site_url('volunteer/team') }}">team</a>, please get in
+<p>If you're interested in joining our <a href="{{ site_url('about/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!