summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2018-01-01 19:09:42 +0000
committerng0 <ng0@n0.is>2018-01-01 19:09:42 +0000
commitfef3c19afc194071a139d8fb836516ceba36057f (patch)
tree3582328610369e51c5f891e15def1d59ba169044
parent417282851998f292b2c17e3a18ba0525efd077b2 (diff)
common
-rw-r--r--common/base.j24
-rw-r--r--common/footer.j2.inc17
-rw-r--r--common/header.j2.inc2
-rw-r--r--common/navigation.j2.inc8
4 files changed, 13 insertions, 18 deletions
diff --git a/common/base.j2 b/common/base.j2
index 31b5f1ed..67836b85 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -2,8 +2,8 @@
<html lang="{{ lang }}">
<head>
<meta charset="UTF-8"/>
- <title>{{ _("GNU Taler") }}</title>
- <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" />
+ <title>{{ _("GNUnet") }}</title>
+ <meta name="description" content="{{ _('GNU\'s Framework for Secure Peer-to-Peer Networking') }}" />
{% include "common/header.j2.inc" %}
{% block head_content %}{% endblock %}
</head>
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index b35cf373..aedd1e0c 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -6,29 +6,28 @@
<ul class="footer-list">
<li><p><a href="about.html">{{ _("About") }}</a></p></li>
<li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
- <li><p><a href="investors.html">{{ _("For Investors") }}</a></p></li>
+ <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li>
</ul>
</div>
<div class="col-xs-12 col-sm-4">
<ul class="footer-list">
- <li><p><a href="citizens.html">{{ _("Citizens")}} </a></p></li>
- <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li>
- <li><p><a href="governments.html">{{ _("Governments") }} </a></p></li>
+ <li><p><a href="https://bugs.gnunet.org/">{{ _("Bug Tracker") }}</a></p></li>
+ <li><p><a href="discussion.html">{{ _("Discussion") }}</a></p></li>
+ <li><p><a href="https://logs.gnunet.org/gnunet">{{ _("IRC logs") }}</a></p></li>
</ul>
</div>
<div class="col-xs-12 col-sm-4">
<ul class="footer-list">
- <li><p><a href="developers.html">{{ _("Developer Resources") }}</a></p></li>
- <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
- <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
+ <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li>
+ <li><p><a href="https://ci.gnunet.org/">{{ _("Continuous Integration") }}</a></p></li>
+ <li><p><a href="https://bibliography.gnunet.org/">{{ _("Bibliography") }}</a></p></li>
</ul>
</div>
</div>
</div>
</div>
<div class="container text-center">
- <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> {{_("and") }}
- <a href="http://inria.fr/">Inria</a> 2015, 2016, 2017</p>
+ <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a></p> 2015, 2016, 2017, 2018</p>
<p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
</div>
</footer>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index ed462651..1acd36b8 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -3,7 +3,7 @@
@licstart The following is the entire license notice for the
JavaScript code in this page.
- Copyright (C) 2014, 2015, 2016 GNUnet e.V.
+ Copyright (C) 2014-2017 GNUnet e.V.
The JavaScript code in this page is free software: you can
redistribute it and/or modify it under the terms of the GNU
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 8678b25a..3bc62238 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,19 +1,15 @@
<nav class="navbar navbar-inverse">
<div class="container-fluid">
<ul class="nav navbar-nav">
- <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">Taler</a></li>
- <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }} </a></li>
- <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }} </a></li>
- <li class="{{ 'active' if filename == 'governments.html' else '' }}"><a href="governments.html">{{ _("Governments") }}</a></li>
+ <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="gnunet_home" href="index.html">GNUnet</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }} <span class="caret"></span></a>
<ul class="dropdown-menu">
<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="developers.html">{{ _("Developer Introduction") }} </a></li>
<li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
- <li><a href="bibliography.html">{{ _("Bibliography") }}</a></li>
+ <li><a href="https://bibliography.gnunet.org/">{{ _("Bibliography") }}</a></li>
</ul>
</li>
</ul>