aboutsummaryrefslogtreecommitdiff
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)
downloadwww-fef3c19afc194071a139d8fb836516ceba36057f.tar.gz
www-fef3c19afc194071a139d8fb836516ceba36057f.zip
common
Diffstat
-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 @@
2<html lang="{{ lang }}"> 2<html lang="{{ lang }}">
3 <head> 3 <head>
4 <meta charset="UTF-8"/> 4 <meta charset="UTF-8"/>
5 <title>{{ _("GNU Taler") }}</title> 5 <title>{{ _("GNUnet") }}</title>
6 <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" /> 6 <meta name="description" content="{{ _('GNU\'s Framework for Secure Peer-to-Peer Networking') }}" />
7 {% include "common/header.j2.inc" %} 7 {% include "common/header.j2.inc" %}
8 {% block head_content %}{% endblock %} 8 {% block head_content %}{% endblock %}
9 </head> 9 </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 @@
6 <ul class="footer-list"> 6 <ul class="footer-list">
7 <li><p><a href="about.html">{{ _("About") }}</a></p></li> 7 <li><p><a href="about.html">{{ _("About") }}</a></p></li>
8 <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li> 8 <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
9 <li><p><a href="investors.html">{{ _("For Investors") }}</a></p></li> 9 <li><p><a href="ev.html">{{ _("GNUnet e.V.") }}</a></p></li>
10 </ul> 10 </ul>
11 </div> 11 </div>
12 <div class="col-xs-12 col-sm-4"> 12 <div class="col-xs-12 col-sm-4">
13 <ul class="footer-list"> 13 <ul class="footer-list">
14 <li><p><a href="citizens.html">{{ _("Citizens")}} </a></p></li> 14 <li><p><a href="https://bugs.gnunet.org/">{{ _("Bug Tracker") }}</a></p></li>
15 <li><p><a href="merchants.html">{{ _("Merchants") }}</a></p></li> 15 <li><p><a href="discussion.html">{{ _("Discussion") }}</a></p></li>
16 <li><p><a href="governments.html">{{ _("Governments") }} </a></p></li> 16 <li><p><a href="https://logs.gnunet.org/gnunet">{{ _("IRC logs") }}</a></p></li>
17 </ul> 17 </ul>
18 </div> 18 </div>
19 <div class="col-xs-12 col-sm-4"> 19 <div class="col-xs-12 col-sm-4">
20 <ul class="footer-list"> 20 <ul class="footer-list">
21 <li><p><a href="developers.html">{{ _("Developer Resources") }}</a></p></li> 21 <li><p><a href="copyright.html">{{ _("Copyright Assignment") }}</a></p></li>
22 <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li> 22 <li><p><a href="https://ci.gnunet.org/">{{ _("Continuous Integration") }}</a></p></li>
23 <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li> 23 <li><p><a href="https://bibliography.gnunet.org/">{{ _("Bibliography") }}</a></p></li>
24 </ul> 24 </ul>
25 </div> 25 </div>
26 </div> 26 </div>
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="container text-center"> 29 <div class="container text-center">
30 <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> {{_("and") }} 30 <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a></p> 2015, 2016, 2017, 2018</p>
31 <a href="http://inria.fr/">Inria</a> 2015, 2016, 2017</p>
32 <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p> 31 <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
33 </div> 32 </div>
34</footer> 33</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 @@
3 @licstart The following is the entire license notice for the 3 @licstart The following is the entire license notice for the
4 JavaScript code in this page. 4 JavaScript code in this page.
5 5
6 Copyright (C) 2014, 2015, 2016 GNUnet e.V. 6 Copyright (C) 2014-2017 GNUnet e.V.
7 7
8 The JavaScript code in this page is free software: you can 8 The JavaScript code in this page is free software: you can
9 redistribute it and/or modify it under the terms of the GNU 9 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 @@
1<nav class="navbar navbar-inverse"> 1<nav class="navbar navbar-inverse">
2 <div class="container-fluid"> 2 <div class="container-fluid">
3 <ul class="nav navbar-nav"> 3 <ul class="nav navbar-nav">
4 <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">Taler</a></li> 4 <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="gnunet_home" href="index.html">GNUnet</a></li>
5 <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }} </a></li>
6 <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }} </a></li>
7 <li class="{{ 'active' if filename == 'governments.html' else '' }}"><a href="governments.html">{{ _("Governments") }}</a></li>
8 <li class="dropdown"> 5 <li class="dropdown">
9 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }} <span class="caret"></span></a> 6 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }} <span class="caret"></span></a>
10 <ul class="dropdown-menu"> 7 <ul class="dropdown-menu">
11 <li><a href="architecture.html">{{ _("System Architecture") }}</a></li> 8 <li><a href="architecture.html">{{ _("System Architecture") }}</a></li>
12 <li><a href="faq.html">{{ _("FAQ") }}</a></li> 9 <li><a href="faq.html">{{ _("FAQ") }}</a></li>
13 <li><a href="glossary.html">{{ _("Glossary") }}</a></li> 10 <li><a href="glossary.html">{{ _("Glossary") }}</a></li>
14 <li><a href="developers.html">{{ _("Developer Introduction") }} </a></li>
15 <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li> 11 <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li>
16 <li><a href="bibliography.html">{{ _("Bibliography") }}</a></li> 12 <li><a href="https://bibliography.gnunet.org/">{{ _("Bibliography") }}</a></li>
17 </ul> 13 </ul>
18 </li> 14 </li>
19 </ul> 15 </ul>
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-14 11:26:59 +0000