summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-06 03:50:07 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-06 03:50:07 +0100
commit14af51dacedf00bbd460cdc1584cd9f81cb0d1f5 (patch)
treeead860a63fd22466d020ddceeaafe45d38076611 /common
parenta28f7615c32a9bde7cc70fd00290a8f68917f916 (diff)
downloadwww-14af51dacedf00bbd460cdc1584cd9f81cb0d1f5.tar.gz
www-14af51dacedf00bbd460cdc1584cd9f81cb0d1f5.tar.bz2
www-14af51dacedf00bbd460cdc1584cd9f81cb0d1f5.zip
conversion/text
Diffstat (limited to 'common')
-rw-r--r--common/base.j22
-rw-r--r--common/footer.j2.inc11
-rw-r--r--common/header.j2.inc1
-rw-r--r--common/navigation.j2.inc107
4 files changed, 49 insertions, 72 deletions
diff --git a/common/base.j2 b/common/base.j2
index 58114b5d..d515ea1d 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -6,7 +6,7 @@
<meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" />
{% include "common/header.j2.inc" %}
</head>
- <body>
+ <body id="mybody">
{% include "common/navigation.j2.inc" %}
{% block body_content %}{% endblock %}
<div class="container-fluid">
diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index cc96baad..f5395b34 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,7 +1,4 @@
- <div class="footer">
- <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016, 2017</p>
- <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
- </div>
- <script type="text/javascript">//<![CDATA[
- activate_menu();
- //]]></script>
+<div class="footer">
+ <p>&copy; <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016, 2017</p>
+ <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
+</div>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 3087d23e..ab0f6ba4 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -32,7 +32,6 @@
<!-- Bootstrap core CSS -->
<link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet">
<!-- Custom styles for this template -->
- <link href="{{ url('justified-nav.css') }}" rel="stylesheet">
<link href="{{ url('styles.css') }}" rel="stylesheet">
<script src="{{ url('menu.js') }}"></script>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index d4c63c8f..ee2d74e4 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,63 +1,44 @@
- <div class="navbar navbar-fixed-top navbar-taler" role="navigation">
- <div class="navbar-header">
- <button class="navbar-toggle btn btn-default dropdown-toggle mobile-lang" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
- <img src="{{ url('images/'+lang+'.png') }}"/></img>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
- <li>
- <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
- </li>
- <li>
- <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
- </li>
- <li>
- <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
- </li>
- <li>
- <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
- </li>
- <li>
- <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
- </li>
- </ul>
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- </div>
- <div class="collapse navbar-collapse" id="main-navbar">
- <ul class="nav nav-justified">
- <li class="m_index"><a href="{{ url_localized('index.html') }}">{{ _("Home") }}</a></li>
- <li class="m_investors"><a href="{{ url_localized('investors.html') }}">{{ _("Investors") }}</a></li>
- <li class="m_about"><a href="{{ url_localized('about.html') }}">{{ _("About&nbsp;us") }}</a></li>
- <li>
- <div class="dropdown nav-lang">
- <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
- <img src="{{ url('images/'+lang+'.png') }}"/></img>
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
- <li>
- <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
- </li>
- <li>
- <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
- </li>
- <li>
- <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
- </li>
- <li>
- <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
- </li>
- <li>
- <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
- </li>
- </ul>
- </div>
- </li>
- </ul>
- </div>
- </div>
+<nav class="navbar navbar-default">
+ <div class="container-fluid">
+ <ul class="nav navbar-nav">
+ <li class="{{ 'active' if filename == 'index.html' else '' }}"><a href="index.html">Home</a></li>
+ <li class="{{ 'active' if filename == 'investors.html' else '' }}"><a href="investors.html">Investors</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="governments.html">Taler for Governments</a></li>
+ <li><a href="developers.html">Taler for Developers</a></li>
+ <li><a href="merchants.html">Taler for Merchants</a></li>
+ </ul>
+ </li>
+ <li class="{{ 'active' if filename == 'about.html' else '' }}"><a href="about.html">Team</a></li>
+ </ul>
+ <ul class="nav navbar-right navbar-form">
+ <li>
+ <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ <img src="{{ url('images/'+lang+'.png') }}"/></img>
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+ <li>
+ <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
+ </li>
+ <li>
+ <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+</nav>