summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/navigation.j2.inc93
-rw-r--r--locale/de/LC_MESSAGES/messages.po10
-rw-r--r--locale/en/LC_MESSAGES/messages.po10
-rw-r--r--locale/es/LC_MESSAGES/messages.po10
-rw-r--r--locale/fr/LC_MESSAGES/messages.po10
-rw-r--r--locale/it/LC_MESSAGES/messages.po10
-rw-r--r--locale/pt/LC_MESSAGES/messages.po10
-rw-r--r--locale/ru/LC_MESSAGES/messages.po10
8 files changed, 85 insertions, 78 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 4d870dc..f275233 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,45 +1,52 @@
-<nav class="navbar navbar-toggleable navbar-toggleable-md navbar-expand-md navbar-light" style="border-radius: 0px;">
- <div class="container-fluid">
- <button class="navbar-toggler navbar-toggler-right"
- type="button"
- data-toggle="collapse"
- data-target="#navbarMain"
- aria-controls="navbarMain"
- aria-expanded="false"
- aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
- <div class="collapse navbar-collapse" id="navbarMain">
- <ul class="navbar-nav mr-auto">
- <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="navbar-brand taler_home" href="https://taler.net/{{ lang }}/index.html">Taler</a></li>
- <li class="nav-item {{ 'active' if filename == 'features.html' else '' }}"><a class="nav-link" href="https://taler.net/{{ lang }}/features.html">{{ _("Features") }} </a></li>
- <li class="nav-item {{ 'active' if filename == 'principles.html' else '' }}"><a class="nav-link" href="https://taler.net/{{ lang }}/principles.html">{{ _("Principles") }} </a></li>
- <li class="nav-item {{ 'active' if filename == 'docs.html' else '' }}"><a class="nav-link" href="https://taler.net/{{ lang }}/docs.html">{{ _("Docs") }} </a></li>
- <li class="nav-item {{ 'active' if filename == 'team.html' else '' }}"><a class="nav-link" href="team.html">{{ _("Team") }}</a></li>
- </ul>
- <ul class="navbar-nav navbar-right">
- <li class="nav-item dropdown">
- <button class="btn btn-dark dropdown-toggle"
- type="button"
- id="dropdownMenu1"
- data-toggle="dropdown"
- aria-haspopup="true"
- aria-expanded="true">
- <img src="{{ url('images/languageicon.svg') }}"
- height="35"
- alt="[{{lang}}]" />
- {{ lang_full }} [{{ lang }}]
- </button>
- <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
- <li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li>
- <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li>
- <li><a class="dropdown-item" href="{{ self_localized('fr') }}">Fran&ccedil;ais [fr]</a></li>
- <li><a class="dropdown-item" href="{{ self_localized('it') }}">Italiano [it]</a></li>
- <li><a class="dropdown-item" href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a></li>
- <li><a class="dropdown-item" href="{{ self_localized('pt') }}">Portugu&ecirc;s [pt]</a></li>
- <li><a class="dropdown-item" href="{{ self_localized('ru') }}">&#x420;&#x443;&#x301;&#x441;&#x441;&#x43A;&#x438;&#x439;&#x20;&#x44F;&#x437;&#x44B;&#x301;&#x43A; [ru]</a></li>
- </ul>
- </li>
- </ul>
+{% macro navlink(site, text) -%}
+ <a class="nav-link {{ 'active' if filename == site else '' }}"
+ href="https://taler.net/{{ lang }}/{{ site }}">
+ {{ text }}
+ </a>
+{%- endmacro %}
+
+<nav class="navbar navbar-expand-lg navbar-light">
+ <a class="navbar-brand taler_home" href="https://taler.net/{{ lang }}/index.html">Taler</a>
+ <button class="navbar-toggler"
+ type="button"
+ data-toggle="collapse"
+ data-target="#navbarNavAltMarkup"
+ aria-controls="navbarNavAltMarkup"
+ aria-expanded="false"
+ aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+ <div class="navbar-nav mr-auto">
+ {{ navlink('features.html', _('Features')) }}
+ {{ navlink('principles.html', _('Principles')) }}
+ {{ navlink('docs.html', _('Docs')) }}
+ {{ navlink('team.html', _('Team')) }}
+ </div>
+
+ <div class="nav-item dropdown">
+ <button class="btn btn-dark dropdown-toggle"
+ type="button"
+ id="dropdownMenu1"
+ data-toggle="dropdown"
+ aria-haspopup="true"
+ aria-expanded="true">
+ <img src="{{ url('images/languageicon.svg') }}"
+ height="35"
+ alt="[{{lang}}]" />
+ {{ lang_full }} [{{ lang }}]
+ </button>
+ <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
+ <li><a class="dropdown-item" href="{{ self_localized('en') }}">English [en]</a></li>
+ <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li>
+ <li><a class="dropdown-item" href="{{ self_localized('fr') }}">Fran&ccedil;ais [fr]</a></li>
+ <li><a class="dropdown-item" href="{{ self_localized('it') }}">Italiano [it]</a></li>
+ <li><a class="dropdown-item" href="{{ self_localized('es') }}">Espa&ntilde;ol [es]</a></li>
+ <li><a class="dropdown-item" href="{{ self_localized('pt') }}">Portugu&ecirc;s [pt]</a></li>
+ <li><a class="dropdown-item" href="{{ self_localized('ru') }}">&#x420;&#x443;&#x301;&#x441;&#x441;&#x43A;&#x438;&#x439;&#x20;&#x44F;&#x437;&#x44B;&#x301;&#x43A; [ru]</a></li>
+ </ul>
+ </div>
+
+
</div>
</nav>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 547b22a..66d0da8 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: 2017-06-02 09:46+0100\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: de <LL@li.org, de@taler.net>\n"
@@ -2823,7 +2823,7 @@ msgstr "Das Taler-Bezahlsystem"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Taxierbare Anonyme Liberale Elektronische Reserven"
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
#, fuzzy
#| msgid "The Team"
msgid "Team"
@@ -2855,15 +2855,15 @@ msgid ""
"only."
msgstr ""
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 37c55bb..0b252cd 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@@ -1924,7 +1924,7 @@ msgstr ""
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
msgid "Team"
msgstr ""
@@ -1952,14 +1952,14 @@ msgid ""
"only."
msgstr ""
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 6cb665b..dcd2ca4 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: 2017-08-10 06:24+0200\n"
"Last-Translator: \n"
"Language-Team: es <LL@li.org>\n"
@@ -2411,7 +2411,7 @@ msgstr "GNU Taler"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Reservas Electrónicas Gravales, Anónimas y Libres"
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
#, fuzzy
#| msgid "The Team"
msgid "Team"
@@ -2443,15 +2443,15 @@ msgstr ""
"Está página fue creada usando únicamente <a href='https://www.gnu.org/home."
"es.html'>software libre</a>"
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 7a71f16..3f96de2 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <LL@li.org>\n"
@@ -1960,7 +1960,7 @@ msgstr ""
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
msgid "Team"
msgstr ""
@@ -1988,15 +1988,15 @@ msgid ""
"only."
msgstr ""
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index c5c064f..2f95135 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: it <LL@li.org>\n"
@@ -2416,7 +2416,7 @@ msgstr "GNU Taler"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Tassabili Anonime Libere Elettroniche Riserve"
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
#, fuzzy
#| msgid "The Team"
msgid "Team"
@@ -2450,15 +2450,15 @@ msgstr ""
"Questa pagina è stata creata utilizzando solo <a href='https://www.gnu."
"org/'>Software Libero</a>. "
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""
diff --git a/locale/pt/LC_MESSAGES/messages.po b/locale/pt/LC_MESSAGES/messages.po
index 59df9a6..323028c 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU taler master\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: 2018-01-28 15:27-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -2375,7 +2375,7 @@ msgstr "GNU Taler"
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr "Reservas eletrônicas livres, anônimas, tributáveis"
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
#, fuzzy
#| msgid "The Team"
msgid "Team"
@@ -2407,15 +2407,15 @@ msgstr ""
"Essa página foi criada usando apenas <a href='https://www.gnu.org/'>software "
"livre</a>."
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index aca8ea9..d4b81e2 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-08-29 15:18+0200\n"
+"POT-Creation-Date: 2019-09-01 18:07+0200\n"
"PO-Revision-Date: 2017-12-29 11:14+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ru <LL@li.org>\n"
@@ -1930,7 +1930,7 @@ msgstr ""
msgid "Taxable Anonymous Libre Electronic Reserves"
msgstr ""
-#: common/footer.j2.inc:11 common/navigation.j2.inc:18
+#: common/footer.j2.inc:11 common/navigation.j2.inc:24
msgid "Team"
msgstr ""
@@ -1958,14 +1958,14 @@ msgid ""
"only."
msgstr ""
-#: common/navigation.j2.inc:15
+#: common/navigation.j2.inc:21
msgid "Features"
msgstr ""
-#: common/navigation.j2.inc:16
+#: common/navigation.j2.inc:22
msgid "Principles"
msgstr ""
-#: common/navigation.j2.inc:17
+#: common/navigation.j2.inc:23
msgid "Docs"
msgstr ""