From 4f22e44b67e23b91d35eb2d59b543f43da6d4659 Mon Sep 17 00:00:00 2001
From: idk <idk@laptop.idk.i2p>
Date: Sat, 24 Oct 2020 16:01:38 -0400
Subject: [PATCH] Slowly combine the contact and team pages

---
 i2p2www/pages/global/nav.html   |  2 +-
 i2p2www/pages/site/contact.html | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index a2538d6f..069fdd52 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -40,7 +40,6 @@
               <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>{{ _('Contributor Guides') }}</span></div>
@@ -64,6 +63,7 @@
           </li>
         </ul>
       </li>
+      <li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></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>
diff --git a/i2p2www/pages/site/contact.html b/i2p2www/pages/site/contact.html
index a6519765..548601e6 100644
--- a/i2p2www/pages/site/contact.html
+++ b/i2p2www/pages/site/contact.html
@@ -27,6 +27,16 @@ GPG Key fingerprint: <tt>EA27 06D6 14F5 28DB 764B  F47E CFCD C461 75E6 694A</tt>
   Most of the discussion about I2P's development happens on the <a href="http://{{ zzz }}">I2P developer forum</a> (only reachable from within I2P network). This is usually the best place to start with inquiries, if the dev IRC channel is inactive.
 {%- endtrans %}</p>
 
+<h2>{{ _('Social Media') }}</h2>
+
+<p>{% trans -%}
+<ul>
+  <li><a href="https://mastodon.social/@i2p">Mastodon - https://mastodon.social/@i2p</a></li>
+  <li><a href="https://twitter.com/GetI2P">Twitter - https://twitter.com/GetI2P</a></li>
+  <li><a href="https://old.reddit.com/i2p">Reddit - https://old.reddit.com/i2p</a></li>
+</ul>
+{%- endtrans %}</p>
+
 <h2>IRC</h2>
 <p>{% trans -%}
   Our primary IRC network is the Irc2P network within I2P; a default tunnel to this network is set up with new router installs.