Merge branch 'master' of gnunet.org:www

4 files changed, 19 insertions, 4 deletions

diff --git a/README b/README
index f682012d..1a614209 100644
--- a/README
+++ b/README
@@ -1 +1,5 @@
-Sourcecode for https://gnunet.org created from the https://taler.net code base.
\ No newline at end of file
+Sourcecode for https://gnunet.org created from the https://taler.net code base.
+
+Requires python3-jinja2 and python3-babel.
+
+Run "make" to build the HTML.
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index c82302ac..46c25562 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-inverse">
+view_all_bug_page.php?refresh=true<nav class="navbar navbar-inverse">
   <div class="container-fluid">
     <ul class="nav navbar-nav">
       <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="gnunet_home" href="index.html">GNUnet</a></li>
@@ -8,8 +8,12 @@
           <li><a href="architecture.html">{{ _("System Architecture") }}</a></li>
           <li><a href="faq.html">{{ _("FAQ") }}</a></li>
           <li><a href="glossary.html">{{ _("Glossary") }}</a></li>
+          <li><a href="https://old.gnunet.org/handbooks">{{ _("Documentation") }}</a></li>
           <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
           <li><a href="https://old.gnunet.org/bibliography">{{ _("Bibliography") }}</a></li>
+          <li><a href="ev.html">{{ _("GNUnet e.V.") }}</a></li>
+          <li><a href="https://old.gnunet.org/bot/log/gnunet">{{ _("IRC") }}</a></li>
+          <li><a href="https://old.gnunet.org/bugs">{{ _("Bugtracker") }}</a></li>
         </ul>
       </li>
     </ul>
diff --git a/index.html.j2 b/index.html.j2
index 23f1f01b..cf196e8a 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -3,7 +3,9 @@
 <!-- Jumbotron -->
 <div class="jumbotron">
   <div class="container text-center">
-    <h1>{{ _("_project_title") }}</h1>
+    <div class="logo">
+      <img src="images/gnunet-small-logo.png" />
+    </div>
 
     <p>
       {% trans %}
@@ -154,7 +156,7 @@ If you want to participate join <a href="ev.html">us</a>.
 
       <p>
         {% trans %}
-        <a href="http://secushare.org/">secushare</a>
+        <a href="https://secushare.org/">secushare</a>
         is creating a decentralized social networking
         application on top of GNUnet.  Using overlay
         multicast and the extensible PSYC protocol, notifications are
diff --git a/styles.css b/styles.css
index 3fdc31a5..a614b985 100644
--- a/styles.css
+++ b/styles.css
@@ -81,6 +81,11 @@ footer {
   color: white;
 }
 
+.logo {
+  background-color: #000;
+  width: 100%;
+  margin: 2em;
+}
 
 #body_content .container {
   margin-bottom: 2em;