# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-10-13 22:29:01
# Node ID ec0da19bfdfdd90e3c5c820cb347511b15f1726d
# Parent  f648ae583d32628b0ca263873328f14043d03c91
# Parent  a69daac094df7574adf73f780436cbf09221fc8c

Merge upstream

diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html
--- a/ennstatus/templates/base.html
+++ b/ennstatus/templates/base.html
@@ -38,6 +38,7 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
           <ul class="dropdown-menu">
+            <li><a href="https://wiki.enn.lu/doku.php?id=news" target="blank">News</a></li>
             <li><a href="{{ url_for('root.about') }}">Organization</a></li>
             <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
           </ul>
@@ -60,6 +61,7 @@
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('donate.index') }}">Donate</a></li>
+            <li><a href="{{ url_for('donate.received') }}">Donation history</a></li>
             <li><a href="{{ url_for('root.member') }}">Join us</a></li>
             <li class="dropdown-submenu">
               <a>Special programs</a>
@@ -73,6 +75,8 @@
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('root.contact') }}">General</a></li>
+            <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>
+            <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>
             <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
           </ul>
         </li>
diff --git a/ennstatus/templates/donate/index.html b/ennstatus/templates/donate/index.html
--- a/ennstatus/templates/donate/index.html
+++ b/ennstatus/templates/donate/index.html
@@ -31,7 +31,8 @@
     <div class="jumbotron">
       <h2>Take action for a <strong>#FreeInternet</strong>! Support us today!</h2>
       <p>As a non-profit organization we are 100% community funded. Donations from our members and supporters will be used to <strong>power Tor nodes</strong>, <strong>print flyers and posters</strong> or cover administrative charges.</p>
-      <h3><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a></h3>
+      <h3><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a>
+      <a href="{{ url_for('root.bridgeprogram') }}"><span class="label label-primary">Adopt a Tor Bridge</span></a></h3>
     </div>
   </div>
   <div class="col-md-12">
diff --git a/ennstatus/templates/root/abuse.html b/ennstatus/templates/root/abuse.html
--- a/ennstatus/templates/root/abuse.html
+++ b/ennstatus/templates/root/abuse.html
@@ -19,7 +19,7 @@
       <li>your contact information</li>
     </ul><br>
     <p>
-      For transparency reasons we publish monthly <a><strong>abuse mail statistics</strong></a>.
+      For transparency reasons we publish monthly <a href="https://wiki.enn.lu/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.
     </p>
     <h3>Abuse contact</h3>
     <address>