[taler-www] branch master updated: Update of navbar and footer for taler.net

[gnunet]

This is an automated email from the git hooks/post-receive script.

skuegel pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new 7600cc1  Update of navbar and footer for taler.net
7600cc1 is described below

commit 7600cc181795eee5f45e02682fb06eb341569870
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Mon Dec 19 15:33:11 2022 +0100

    Update of navbar and footer for taler.net
    
    Signed-off-by: Stefan Kügel <skuegel@web.de>
---
 common/footer.j2.inc     |  49 +++++++------
 common/navigation.j2.inc | 182 +++++++++++++++++++++++++----------------------
 2 files changed, 123 insertions(+), 108 deletions(-)

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 564bb00..46161f1 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -1,40 +1,45 @@
 <footer id="footer">
   <div class="container">
-    <div class="row justify-content-center">
-      <div class="col-12">
+   <div class="row justify-content-center">
+      <div class="col-30">
         <hr style="border-top: 1px solid #00000069; padding-bottom: 1em" />
       </div>
     </div>
     <div class="row">
-      <div class="col-12 col-sm-4">
+      <div class="col-md-4 col-sm-12">
+      <h4>{% trans %}Quick links{% endtrans %}</h4>
         <ul class="footer-list">
-          <li><a href="{{ url_localized('contact.html') }}">{{ _("Contact") 
}}</a></li>
+          <li><a href="{{ url_localized('faq.html') }}">{{ _("FAQ") }}</a></li>
+          <li><a href="{{ url_localized('docs.html') }}">{{ _("Docs") 
}}</a></li>
+          <li><a href="{{ url_localized('bibliography.html') }}">{{ 
_("Bibliography") }}</a></li>
+          <li><a href="{{ url_localized('development.html') }}">{{ 
_("Development") }}</a></li>
+          <li><a href="https://demo.taler.net/"; target="_blank" rel="noopener 
noreferrer">{% trans %}Taler Demo Page{% endtrans %}</a></li>
+          <li><a href="{{ url_localized('contact.html') }}">{{ _("Contacts 
overview") }}</a></li>
+          <li><a href="https://lists.gnu.org/mailman/listinfo/taler"; 
target="_blank" rel="noopener noreferrer">{% trans %}Public mailing list for 
GNU Taler{% endtrans %}</a></li>
         </ul>
       </div>
-      <div class="col-12 col-sm-4">
+      <div class="col-md-4 col-sm-12">
+        <h4>{% trans %}Email contacts{% endtrans %}</h4>
         <ul class="footer-list">
-          <li><a href="{{ url_localized('docs.html') }}">{{ _("Docs") }}</a> /
-              <a href="{{ url_localized('faq.html') }}">{{ _("FAQ") }}</a></li>
+          <li><a href="mailto:contact@taler.net";>General inquiries</a></li>
+          <li><a href="mailto:sales@taler.net";>Sales</a></li>
+          <li><a href="mailto:marketing@taler.net";>Marketing</a></li>
+          <li><a href="mailto:press@taler.net";>PR &amp; media contact</a></li>
+          <li><a href="mailto:invest@taler.net";>Investors</a></li>
+          <li><a href="mailto:support@taler.net";>Support</a></li>
+          <li><a href="mailto:onboarding@taler-systems.com";>Onboarding</a></li>
         </ul>
       </div>
-      <div class="col-12 col-sm-4">
+      <div class="col-md-4 col-sm-20">
+      <h4>{% trans %}Good to know{% endtrans %}</h4>
         <ul class="footer-list">
-          <li><a href="{{ url_localized('bibliography.html') }}">{{ 
_("Bibliography") }}</a></li>
+          <li>&copy; 2015-2022 <a href="https://gnunet.org/en/ev.html"; 
target="_blank" rel="noopener noreferrer">GNUnet e.V.</a> &amp; <a 
href="https://www.taler-systems.com/"; target="_blank" rel="noopener 
noreferrer">Taler Systems SA</a>.</li>
+          <li>{% trans %}GNU Taler is developed as part of the <a 
href="https://www.gnu.org/"; target="_blank" rel="noopener noreferrer">GNU 
project</a> for the GNU operating system.{% endtrans %}</li>
+          <li>{% trans %}We are grateful for support and free hosting of this 
site by <a href="https://www.bfh.ch/"; target="_blank" rel="noopener 
noreferrer">BFH</a>.{% endtrans %} Mantis is our <a 
href="https://bugs.taler.net/"; target="_blank" rel="noopener noreferrer">{% 
trans %}bug tracker{% endtrans %}</a>.</li>
+          <li>{% trans %}This page was created using <a 
href="https://www.gnu.org/"; target="_blank" rel="noopener noreferrer">Free 
Software</a> only.{% endtrans %}</li>
+          <li><a href="https://taler.net/javascript.html"; data-jslicense="1" 
target="_blank" rel="noopener noreferrer">{% trans %}JavaScript license 
information{% endtrans %}</a></li>
         </ul>
       </div>
     </div>
   </div>
-  <div class="text-center mt-5">
-    <p>
-       {{ _("GNU Taler is developed as part of the <a 
href='https://www.gnu.org/'>GNU project</a> for the GNU operating system.") }}
-       <br>
-       &copy; 2015-2022 | <a href='https://gnunet.org/en/ev.html' 
target="_blank" rel="noopener noreferrer">GNUnet e.V.</a> {{_("and") }} <a 
href='https://www.taler-systems.com/' target="_blank" rel="noopener 
noreferrer">Taler Systems SA</a> |
-       <br>
-       {{ _("We are grateful for support and free hosting of this site by <a 
href='https://www.bfh.ch/'>BFH</a>.") }}
-       <br>
-       {{ _("This page was created using <a href='https://www.gnu.org/'>Free 
Software</a> only.") }}
-       <br>
-       <a href="/javascript.html" data-jslicense="1">{{ _("JavaScript license 
information")}} </a>
-    </p>
-  </div>
 </footer>
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index b73639b..3431e4c 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,96 +1,106 @@
 {% macro navlink(site, text) -%}
-   <a class="nav-link {{ 'active' if filename == site else '' }}"
-      href="{{ url_localized(site) }}">
+<li class="nav-item mx-2">
+  <a class="nav-link {{ 'active' if filename == site else '' }}"
+    href="{{ url_localized(site) }}">
     {{ text }}
-   </a>
+  </a>
+</li>
 {%- endmacro %}
 <div id="skip"><a href="#maincontent" class="skip">{% trans %}Skip to main 
content{% endtrans %}</a></div>
 <nav class="navbar navbar-expand-lg navbar-light">
-  <a class="navbar-brand" href="{{ url_localized('index.html') }}">
-    <img class="taler_home" alt="Home" src="{{ 
url_static('images/logo-2021.svg') }}">
-  </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('news/index.html', _('News')) }}
-      <a class="nav-link" href="https://taler-systems.com/"; target="_blank" 
rel="noopener noreferrer">{{ _('Company') }}</a>
-    </div>
-
-    <div class="nav-item dropdown">
-      <button class="btn btn-dark dropdown-toggle"
+<div class="container">
+  <nav class="navbar navbar-expand-lg border-bottom">
+    <div class="container-fluid">
+      <a class="navbar-brand d-flex" href="{{ url_localized('index.html') }}">
+        <img alt="Home" width="100.5" height="45" src="{{ 
url_static('images/logo-2021.svg') }}">
+      </a>
+      <button class="navbar-toggler"
               type="button"
-              id="dropdownMenu1"
-              data-bs-toggle="dropdown"
-              data-bs-auto-close="true"
-              aria-haspopup="true"
-              aria-expanded="true">
-              <img src="{{ url_static('images/languageicon.svg') }}"
-                    height="35"
-                    alt="[{{lang}}]" />
-                    {{ lang_full }} [{{ lang }}]
-      </button>
-      <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-      {% if lang != 'en' %}
-        <li><a class="dropdown-item" href="{{ self_localized('en') }}">English 
[en]</a></li>
-      {% endif %}
-      {% if lang != 'ar' %}
-        <li><a class="dropdown-item" href="{{ self_localized('ar') }}">عربى 
[ar]</a></li>
-      {% endif %}
-      {% if lang != 'zh_Hant' %}
-        <li><a class="dropdown-item" href="{{ self_localized('zh_Hant') 
}}">繁體中文 [zh]</a></li>
-      {% endif %}
-      {% if lang != 'zh_Hans' %}
-        <li><a class="dropdown-item" href="{{ self_localized('zh_Hans') 
}}">简体中文 [zh_Hans]</a></li>
-      {% endif %}
-      {% if lang != 'fr' %}
-        <li><a class="dropdown-item" href="{{ self_localized('fr') 
}}">Fran&ccedil;ais [fr]</a></li>
-      {% endif %}
-      {% if lang != 'de' %}
-        <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch 
[de]</a></li>
-      {% endif %}
-<!--  {% if lang != 'hi' %}
-        <li><a class="dropdown-item" href="{{ self_localized('hi') }}">हिंदी 
[hi]</a></li>
-      {% endif %} -->
-      {% if lang != 'it' %}
-        <li><a class="dropdown-item" href="{{ self_localized('it') 
}}">Italiano [it]</a></li>
-      {% endif %}
-      {% if lang != 'ja' %}
-        <li><a class="dropdown-item" href="{{ self_localized('ja') }}">日本語 
[ja]</a></li>
-      {% endif %}
-      {% if lang != 'ko' %}
-        <li><a class="dropdown-item" href="{{ self_localized('ko') }}">한국어 
[ko]</a></li>
-      {% endif %}
-<!--  {% if lang != 'pt' %}
-        <li><a class="dropdown-item" href="{{ self_localized('pt') 
}}">Portugu&ecirc;s [pt]</a></li>
-      {% endif %} -->
-<!--  {% if lang != 'pt_BR' %}
-        <li><a class="dropdown-item" href="{{ self_localized('pt_BR') 
}}">Portugu&ecirc;s (Brazil) [pt]</a></li>
-      {% endif %} -->
-      {% if lang != 'ru' %}
-        <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>
-      {% endif %}
-      {% if lang != 'es' %}
-        <li><a class="dropdown-item" href="{{ self_localized('es') 
}}">Espa&ntilde;ol [es]</a></li>
-      {% endif %}
-      {% if lang != 'sv' %}
-        <li><a class="dropdown-item" href="{{ self_localized('sv') }}">Svenska 
[sv]</a></li>
-      {% endif %}
-      {% if lang != 'tr' %}
-        <li><a class="dropdown-item" href="{{ self_localized('tr') 
}}">T&uuml;rk&ccedil;e [tr]</a></li>
-      {% endif %}
+              data-bs-toggle="collapse"
+              data-bs-target="#navbarNavAltMarkup"
+              aria-controls="navbarNavAltMarkup"
+              aria-expanded="false"
+              aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
 
-      </ul>
+      </button>
+<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
+        <ul class="navbar-nav me-lg-auto">
+          {{ navlink('features.html', _('Features')) }}
+          {{ navlink('principles.html', _('Principles')) }}
+          {{ navlink('docs.html', _('Docs')) }}
+          {{ navlink('development.html', _('Development')) }}
+          {{ navlink('news/index.html', _('News')) }}
+          <li class="nav-item mx-2">
+            <a class="nav-link" href="https://taler-systems.com/"; 
target="_blank" rel="noopener noreferrer">{{ _('Company') }}</a>
+          </li>
+        </ul>
+        <div class="nav-item dropdown">
+          <button class="btn btn-dark dropdown-toggle"
+                  type="button"
+                  id="dropdownMenu1"
+                  data-bs-toggle="dropdown"
+                  data-bs-auto-close="true"
+                  aria-haspopup="true"
+                  aria-expanded="true">
+                  <img src="{{ url_static('images/languageicon.svg') }}"
+                        height="35"
+                        alt="[{{lang}}]" />
+                        {{ lang_full }} [{{ lang }}]
+          </button>
+          <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+          {% if lang != 'en' %}
+            <li><a class="dropdown-item" href="{{ self_localized('en') 
}}">English [en]</a></li>
+          {% endif %}
+          {% if lang != 'ar' %}
+            <li><a class="dropdown-item" href="{{ self_localized('ar') 
}}">عربى [ar]</a></li>
+          {% endif %}
+          {% if lang != 'zh_Hant' %}
+            <li><a class="dropdown-item" href="{{ self_localized('zh_Hant') 
}}">繁體中文 [zh]</a></li>
+          {% endif %}
+          {% if lang != 'zh_Hans' %}
+            <li><a class="dropdown-item" href="{{ self_localized('zh_Hans') 
}}">简体中文 [zh_Hans]</a></li>
+          {% endif %}
+          {% if lang != 'fr' %}
+            <li><a class="dropdown-item" href="{{ self_localized('fr') 
}}">Fran&ccedil;ais [fr]</a></li>
+          {% endif %}
+          {% if lang != 'de' %}
+            <li><a class="dropdown-item" href="{{ self_localized('de') 
}}">Deutsch [de]</a></li>
+          {% endif %}
+    <!--  {% if lang != 'hi' %}
+            <li><a class="dropdown-item" href="{{ self_localized('hi') 
}}">हिंदी [hi]</a></li>
+          {% endif %} -->
+          {% if lang != 'it' %}
+            <li><a class="dropdown-item" href="{{ self_localized('it') 
}}">Italiano [it]</a></li>
+          {% endif %}
+          {% if lang != 'ja' %}
+            <li><a class="dropdown-item" href="{{ self_localized('ja') }}">日本語 
[ja]</a></li>
+          {% endif %}
+          {% if lang != 'ko' %}
+            <li><a class="dropdown-item" href="{{ self_localized('ko') }}">한국어 
[ko]</a></li>
+          {% endif %}
+    <!--  {% if lang != 'pt' %}
+            <li><a class="dropdown-item" href="{{ self_localized('pt') 
}}">Portugu&ecirc;s [pt]</a></li>
+          {% endif %} -->
+    <!--  {% if lang != 'pt_BR' %}
+            <li><a class="dropdown-item" href="{{ self_localized('pt_BR') 
}}">Portugu&ecirc;s (Brazil) [pt]</a></li>
+          {% endif %} -->
+          {% if lang != 'ru' %}
+            <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>
+          {% endif %}
+          {% if lang != 'es' %}
+            <li><a class="dropdown-item" href="{{ self_localized('es') 
}}">Espa&ntilde;ol [es]</a></li>
+          {% endif %}
+          {% if lang != 'sv' %}
+            <li><a class="dropdown-item" href="{{ self_localized('sv') 
}}">Svenska [sv]</a></li>
+          {% endif %}
+          {% if lang != 'tr' %}
+            <li><a class="dropdown-item" href="{{ self_localized('tr') 
}}">T&uuml;rk&ccedil;e [tr]</a></li>
+          {% endif %}
+          </ul>
+        </div>
+      </div>
     </div>
   </div>
 </nav>
+</div>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.