Slowly combine the contact and team pages

This commit is contained in:
idk
2020-10-24 16:01:38 -04:00
parent 008e13ba19
commit 4f22e44b67
2 changed files with 11 additions and 1 deletions

View File

@@ -40,7 +40,6 @@
<li><a href="{{ site_url('get-involved/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers 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> </ul>
</li> </li>
<li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
</ul> </ul>
</li> </li>
<li class="has-sub"><div class="menuitem"><span>{{ _('Contributor Guides') }}</span></div> <li class="has-sub"><div class="menuitem"><span>{{ _('Contributor Guides') }}</span></div>
@@ -64,6 +63,7 @@
</li> </li>
</ul> </ul>
</li> </li>
<li><a href="{{ site_url('contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
</ul> </ul>
<li><a href="{{ site_url('get-involved/donate') }}"><div class="menuitem"><span class="donateitem">{{ _('Donate') }}</span></div></a></li> <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> <li class="has-sub"><div class="menuitem"><span>{{ _('Community') }}</span></div>

View File

@@ -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. 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> {%- 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> <h2>IRC</h2>
<p>{% trans -%} <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. Our primary IRC network is the Irc2P network within I2P; a default tunnel to this network is set up with new router installs.