From ade45d01072c50444e638da6728f5d5319cab690 Mon Sep 17 00:00:00 2001
From: idk <idk@laptop.idk.i2p>
Date: Fri, 23 Oct 2020 16:21:47 -0400
Subject: [PATCH] WIP: more menu fixups

---
 i2p2www/pages/global/nav.html | 68 +++++++++++++++++------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 6adb7e51..9142ad4e 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -4,11 +4,11 @@
   <li class="has-sub"><div class="menuitem"><span>{{ _('About') }}</span></div>
     <ul>
       <li><a href="{{ site_url('about/intro') }}"><div class="menuitem"><span>{{ _('Introduction to I2P') }}</span></div></a></li>
-      <li><a href="{{ site_url('about/software') }}"><div class="menuitem"><span>{{ _('Guide to I2P Software') }}</span></div></a></li>
-      <li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
+      <li class="has-sub"><div class="menuitem"><span>{{ _('Guide to I2P Software') }}</span></div>
         <ul>
-          <li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
+          <li><a href="{{ site_url('about/software') }}"><div class="menuitem"><span>{{ _('What is Included') }}</span></div></a><li>
           <li><a href="{{ site_url('about/browser-config') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
+          <li><a href="{{ site_url('faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div>
             <ul>
               <li><a href="{{ site_url('docs/applications/supported') }}"><div class="menuitem"><span>{{ _('Supported applications') }}</span></div></a></li>
@@ -18,19 +18,12 @@
               <li><a href="{{ site_url('docs/applications/git-bundle') }}"><div class="menuitem"><span>{{ _('git+Bittorrent') }}</span></div></a></li>
             </ul>
           </li>
-          <li class="has-sub"><div class="menuitem"><span>{{ _('References') }}</span></div>
-            <ul>
-              <li><a href="{{ site_url('about/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
-              <li><a href="{{ site_url('about/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
-            </ul>
-          </li>
-          <li class="has-sub"><div class="menuitem"><span>{{ _('Verify I2P') }}</span></div>
-            <ul>
-              <li><a href="{{ site_url('get-involved/develop/release-signing-key') }}"><div class="menuitem"><span>{{ _('Release signing keys') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/develop/signed-keys') }}"><div class="menuitem"><span>{{ _('Signed keys') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
-            </ul>
-          </li>
+        </ul>
+      </li>
+      <li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
+        <ul>
+          <li><a href="{{ site_url('about/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
+          <li><a href="{{ site_url('about/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('Comparisons') }}</span></div>
             <ul>
               <li><a href="{{ site_url('comparison') }}"><div class="menuitem"><span>{{ _('Overview of comparisons') }}</span></div></a></li>
@@ -40,25 +33,37 @@
               <li><a href="{{ site_url('comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
             </ul>
           </li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Verify I2P') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('get-involved/develop/release-signing-key') }}"><div class="menuitem"><span>{{ _('Release signing keys') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/develop/signed-keys') }}"><div class="menuitem"><span>{{ _('Signed keys') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
+            </ul>
+          </li>
           <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
         </ul>
       </li>
-      <li class="has-sub"><div class="menuitem"><span>{{ _('Get involved!') }}</span></div>
+      <li class="has-sub"><div class="menuitem"><span>{{ _('Contributing') }}</span></div>
         <ul>
           <li><a href="{{ site_url('get-involved') }}"><div class="menuitem"><span>{{ _('Get involved!') }}</span></div></a><li>
+          <li class="has-sub"><div class="menuitem"><span>{{ _('Develop Software') }}</span></div>
+            <ul>
+              <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
+              <li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
+              <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
+            </ul>
+          </li>
+          <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('Translate I2P into more Languages') }}</span></div></a></li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('Hosting Services') }}</span></div>
             <ul>
+              <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li>
               <li><a href="{{ site_url('docs/applications/gitlab') }}"><div class="menuitem"><span>{{ _('GitLab') }}</span></div></a></li>
             </ul>
           </li>
         </ul>
       </li>
-      <li class="has-sub"><div class="menuitem"><span>{{ _('People') }}</span></div>
-        <ul>
-          <li><a href="{{ site_url('about/team') }}"><div class="menuitem"><span>{{ _('Team') }}</span></div></a></li>
-          <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
-        </ul>
-      </li>
   </ul>
   <li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>
@@ -140,17 +145,6 @@
               </li>
               <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li>
               <li><a href="{{ site_url('docs/plugins') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li>
-              <li><a href="{{ site_url('docs/reseed') }}"><div class="menuitem"><span>{{ _('Reseed') }}</span></div></a></li>
-            </ul>
-          </li>
-          <li class="has-sub"><div class="menuitem"><span>{{ _('Guides') }}</span></div>
-            <ul>
-              <li><a href="{{ site_url('get-involved/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
-              <li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li>
             </ul>
           </li>
           <li class="has-sub"><div class="menuitem"><span>{{ _('API') }}</span></div>
@@ -180,6 +174,12 @@
           <li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><div class="menuitem"><span>{{ _('Bug tracker') }}</span></div></a></li>
         </ul>
       </li>
+      <li class="has-sub"><div class="menuitem"><span>{{ _('People') }}</span></div>
+        <ul>
+          <li><a href="{{ site_url('about/team') }}"><div class="menuitem"><span>{{ _('Team') }}</span></div></a></li>
+          <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
+        </ul>
+      </li>
     </ul>
   </li>
   <li><a href="{{ get_url('blog_index') }}"><div class="menuitem"><span>{{ _('Blog') }}</span></div></a></li>