diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/base.j2 | 17 | ||||
| -rw-r--r-- | common/consortium.j2 | 32 | ||||
| -rw-r--r-- | common/footer-eu.j2.inc | 55 | ||||
| -rw-r--r-- | common/footer.j2.inc | 2 | ||||
| -rw-r--r-- | common/header.j2.inc | 23 | ||||
| -rw-r--r-- | common/navigation.j2.inc | 38 |
6 files changed, 146 insertions, 21 deletions
diff --git a/common/base.j2 b/common/base.j2 index 31b5f1ed..8a918c73 100644 --- a/common/base.j2 +++ b/common/base.j2 @@ -3,7 +3,22 @@ <head> <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }}</title> - <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" /> + <link rel="shortcut icon" href="/favicon.ico"> + <link rel="icon" type="image/svg+xml" href="{{ url_static('images/favicon.svg') }}" sizes="any"> + <link rel="icon" type="image/png" href="{{ url_static('images/android-chrome-192x192.png') }}" sizes="192x192"> + <link rel="icon" type="image/png" href="{{ url_static('images/android-chrome-512x512.png') }}" sizes="512x512"> + <link rel="apple-touch-icon" sizes="180x180" href="{{ url_static('images/apple-touch-icon.png') }}"> + <meta name="msapplication-TileColor" content="#ffffff"> + <meta name="msapplication-TileImage" content="{{ url_static('images/mstile-150x150.png') }}"> + <meta property="og:title" content="GNU Taler - Taxable Anonymous Libre Electronic Reserves" /> + <meta property="og:type" content="website" /> + <meta property="og:url" content="{{ url_localized('index.html') }}" /> + <meta property="og:image" content="https://taler.net/favicon.ico" /> + <meta property="og:image" content="/favicon.ico" /> + <meta property="og:image" content="{{ url_static('images/favicon.png') }}" /> + <meta name="description" content="{{ _('A payment system that makes privacy-friendly online transactions fast and easy.') }}" /> + <link rel="me" href="https://mastodon.social/@taler"> + <link rel="me" href="https://fosstodon.org/@Taler"> {% include "common/header.j2.inc" %} {% block head_content %}{% endblock %} </head> diff --git a/common/consortium.j2 b/common/consortium.j2 new file mode 100644 index 00000000..49aeebc3 --- /dev/null +++ b/common/consortium.j2 @@ -0,0 +1,32 @@ +<!DOCTYPE html> +<html lang="{{ lang }}"> + <head> + <meta charset="UTF-8"/> + <title>NGI Taler</title> + <link rel="shortcut icon" href="/NGI_favicon.ico" /> + <link rel="icon" type="image/svg+xml" href="{{ url_static('images/logo-NGI_TALER_Bold.svg') }}" sizes="any" /> + <link rel="icon" type="image/png" href="{{ url_static('images/logo-NGI_TALER_Bold.png') }}" sizes="any" /> + <link rel="icon" type="image/png" href="{{ url_static('images/NGI_android-chrome-192x192.png') }}" sizes="192x192" /> + <link rel="icon" type="image/png" href="{{ url_static('images/NGI_android-chrome-512x512.png') }}" sizes="512x512" /> + <link rel="apple-touch-icon" sizes="180x180" href="{{ url_static('images/NGI_apple-touch-icon.png') }}" /> + <meta name="msapplication-TileColor" content="#ffffff" /> + <meta name="msapplication-TileImage" content="{{ url_static('images/mstile-150x150.png') }}" /> + <meta property="og:title" content="NGI Taler project funded by Horizon Europe and SBFI." /> + <meta property="og:type" content="website" /> + <meta property="og:url" content="{{ url_localized('ngi-taler.html') }}" /> + <meta property="og:image" content="https://taler.net/NGI_favicon.ico" /> + <meta property="og:image" content="/NGI_favicon.ico" /> + <meta property="og:image" content="{{ url_static('images/NGI_favicon.png') }}" /> + <meta name="description" content="The NGI Taler project, funded by Horizon Europe and SBFI, aims to bring GNU Taler to market across Europe." /> + {# <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@_nu/html-validator" /> #} + {% include "common/header.j2.inc" %} + {% block head_content %}{% endblock %} + </head> + <body id="mybody"> + {% include "common/navigation.j2.inc" %} + <div id="body_content"> + {% block body_content %}{% endblock %} + </div> + {% include "common/footer-eu.j2.inc" %} + </body> +</html> diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc new file mode 100644 index 00000000..cff832ac --- /dev/null +++ b/common/footer-eu.j2.inc @@ -0,0 +1,55 @@ +<footer id="footer"> + <div class="container"> + <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 justify-content-top"> + <div class="col-md-4 col-sm-12"> + <h4>NGI TALER Overview</h4> + <ul class="footer-list"> + <br> + <img class="img-fluid" src="{{ url_static('images/logo-NGI_TALER_Bold.svg') }}" alt="The NGI Taler logo" width="280px"> + <li><strong>Coordinator:</strong> <br>Eindhoven University of Technology</li> + <li><strong>E-Mail: </strong><a href="mailto:questions'AT'taler.net?subject=Message to the NGI Taler project coordinator">Contact us</a></li> + <li><strong>Programme call:</strong> <br>HORIZON-CL4-2023-HUMAN-01-CNECT</li> + <li><strong>Type of action:</strong> HORIZON Innovation Actions</li> + <li><strong>Programme topic:</strong> <br><a href="https://ec.europa.eu/info/funding-tenders/opportunities/portal/screen/opportunities/topic-details/horizon-cl4-2023-human-01-12?keywords=HORIZON-CL4-2023-HUMAN-01-12&tenders=false&forthcoming=false&openForSubmission=false&closed=true" target="_blank" rel="noopener noreferrer">HORIZON-CL4-2023-HUMAN-01-12</a></li> + <li><strong>Project number:</strong> <a href="https://ec.europa.eu/info/funding-tenders/opportunities/portal/screen/how-to-participate/org-details/999999999/project/101135475/program/43108390/details" target="_blank" rel="noopener noreferrer">101135475</a></li> + <li><strong>EU contribution:</strong> € 4.508.355,40</li> + <li><strong>Duration:</strong> 36 months</li> + </ul> + <br> + </div> + + <div class="col-md-4 col-sm-12"> + <h4>Co-funded by the European Union</h4> + <div class="container container-fluid"> + <img class="img-fluid" src="{{ url_static('images/co-funded.png') }}" alt="🇪🇺 and co-funding statement" width="300px" loading="lazy"> + </div> + <div class="dark-grey-text container container-fluid"> + <p class="text-muted w-responsive mx-auto mt-4"> + <small>Co-funded by the European Union. Views and opinions expressed are however + those of the author(s) only and do not necessarily reflect those of the European Union. + Neither the European Union nor the granting authority can be held responsible for them.</small> + </p> + <br> + </div> + </div> + + <div class="col-md-4 col-sm-12"> + <h4>Project funded by</h4> + <br> + <div class="container container-fluid"> + <img class="img-fluid" src="{{ url_static('images/logo-SBFI_EU_Frameworkprogramme_E_hoch.svg') }}" alt="SBFI logo and funding statement" width="400px" loading="lazy"> + </div> + <div class="container container-fluid"> + <p class="dark-grey-text text-muted w-responsive mx-auto mt-4"> + <small>This work has received funding from the Swiss State Secretariat for Education, Research and Innovation (SERI).</small> + <p> + </div> + </div> + </div> + </div> +</footer> diff --git a/common/footer.j2.inc b/common/footer.j2.inc index 97b7f39c..777c5cd5 100644 --- a/common/footer.j2.inc +++ b/common/footer.j2.inc @@ -34,7 +34,7 @@ <div class="col-md-4 col-sm-20"> <h4>{% trans %}Legal Information{% endtrans %}</h4> <ul class="footer-list"> - <li>© 2015-2023 <a href="https://gnunet.org/en/ev.html" target="_blank" rel="noopener noreferrer">GNUnet e.V.</a> & + <li>© 2015-2024 <a href="https://gnunet.org/en/ev.html" target="_blank" rel="noopener noreferrer">GNUnet e.V.</a> & <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> diff --git a/common/header.j2.inc b/common/header.j2.inc index e096e479..f97bcc09 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, 2020, 2021, 2022 Taler Systems SA + Copyright (C) 2014, 2015, 2016, 2020, 2021, 2022, 2023, 2024 Taler Systems SA The JavaScript code in this page is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -27,36 +27,43 @@ <link rel="icon" type="image/ico" href="/favicon.ico?v=2"> <link rel="alternate" hreflang="en" href="{{ self_localized('en') }}" /> <link rel="alternate" hreflang="ar" href="{{ self_localized('ar') }}" /> - <link rel="alternate" hreflang="zh-hant" href="{{ self_localized('zh_Hant') }}" /> <link rel="alternate" hreflang="cs" href="{{ self_localized('cs') }}" /> - <link rel="alternate" hreflang="fr" href="{{ self_localized('fr') }}" /> <link rel="alternate" hreflang="de" href="{{ self_localized('de') }}" /> + <link rel="alternate" hreflang="es" href="{{ self_localized('es') }}" /> + <link rel="alternate" hreflang="fi" href="{{ self_localized('fi') }}" /> + <link rel="alternate" hreflang="fr" href="{{ self_localized('fr') }}" /> <link rel="alternate" hreflang="hi" href="{{ self_localized('hi') }}" /> <link rel="alternate" hreflang="hu" href="{{ self_localized('hu') }}" /> <link rel="alternate" hreflang="it" href="{{ self_localized('it') }}" /> <link rel="alternate" hreflang="ja" href="{{ self_localized('ja') }}" /> <link rel="alternate" hreflang="ko" href="{{ self_localized('ko') }}" /> + <link rel="alternate" hreflang="nl" href="{{ self_localized('nl') }}" /> <link rel="alternate" hreflang="pt" href="{{ self_localized('pt') }}" /> <link rel="alternate" hreflang="pt-br" href="{{ self_localized('pt_BR') }}" /> <link rel="alternate" hreflang="ru" href="{{ self_localized('ru') }}" /> - <link rel="alternate" hreflang="es" href="{{ self_localized('es') }}" /> <link rel="alternate" hreflang="sv" href="{{ self_localized('sv') }}" /> <link rel="alternate" hreflang="tr" href="{{ self_localized('tr') }}" /> + <link rel="alternate" hreflang="uk" href="{{ self_localized('uk') }}" /> + <link rel="alternate" hreflang="zh-hant" href="{{ self_localized('zh_Hant') }}" /> + <link rel="alternate" hreflang="zh-hans" href="{{ self_localized('zh_Hans') }}" /> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="author" content=""> <!-- Bootstrap core CSS --> <link href="{{ url_dist('bootstrap/bootstrap.min.css') }}" rel="stylesheet"> + <!-- One file includes all the Font Awesome Pro icons and utilities --> + <link href="{{ url_dist('fontawesome/css/all.min.css') }}" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="{{ url_static('styles.css') }}" rel="stylesheet"> - <script src="{{ url_dist('bootstrap/bootstrap.bundle.min.js') }}"></script> + <script defer src="{{ url_dist('bootstrap/bootstrap.bundle.min.js') }}"></script> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <script defer src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script defer src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> - <link rel="alternate" type="application/rss+xml" title="Taler.net rss" href="{{ url_localized('rss.xml') }}" /> + <link rel="alternate" type="application/rss+xml" title="Taler.net rss" href="{{ url_localized('rss.xml') }}"> diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index a82ea679..ad1fb9d8 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc @@ -31,10 +31,14 @@ {{ navlink('principles.html', _('Principles')) }} {{ navlink('docs.html', _('Docs')) }} {{ navlink('development.html', _('Development')) }} + {{ navlink('ngi-taler.html', _('NGI TALER')) }} + {# {{ navlink('comingsoon.html', _('Coming soon')) }} #} {{ navlink('news/index.html', _('News')) }} - <li class="nav-item mx-2"> + {# NOTE taler-systems.com deprecated in navigation bar -- Taler Systems is reachable via consortium page instead #} + {# <li class="nav-item mx-2"> <a class="nav-link" href="https://taler-systems.com/" target="_blank" rel="noopener noreferrer">{% trans %}Company{% endtrans %}</a> </li> + #} </ul> <div class="nav-item dropdown"> <button class="btn btn-dark dropdown-toggle" @@ -56,17 +60,23 @@ {% 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> + <!-- {% if lang != 'cs' %} + <li><a class="dropdown-item" href="{{ self_localized('cs') }}">Česky [cs]</a></li> + {% endif %} --> + {% if lang != 'de' %} + <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li> {% endif %} - {% if lang != 'zh_Hans' %} - <li><a class="dropdown-item" href="{{ self_localized('zh_Hans') }}">简体中文 [zh_Hans]</a></li> + {% if lang != 'es' %} + <li><a class="dropdown-item" href="{{ self_localized('es') }}">Español [es]</a></li> + {% endif %} + {% if lang != 'fi' %} + <li><a class="dropdown-item" href="{{ self_localized('fi') }}">Suomen kieli [fi]</a></li> {% endif %} {% if lang != 'fr' %} <li><a class="dropdown-item" href="{{ self_localized('fr') }}">Français [fr]</a></li> {% endif %} - {% if lang != 'de' %} - <li><a class="dropdown-item" href="{{ self_localized('de') }}">Deutsch [de]</a></li> + {% if lang != 'hu' %} + <li><a class="dropdown-item" href="{{ self_localized('hu') }}">Magyar [hu]</a></li> {% endif %} <!-- {% if lang != 'hi' %} <li><a class="dropdown-item" href="{{ self_localized('hi') }}">हिंदी [hi]</a></li> @@ -84,20 +94,26 @@ <li><a class="dropdown-item" href="{{ self_localized('pt') }}">Português [pt]</a></li> {% endif %} --> <!-- {% if lang != 'pt_BR' %} - <li><a class="dropdown-item" href="{{ self_localized('pt_BR') }}">Português (Brazil) [pt]</a></li> + <li><a class="dropdown-item" href="{{ self_localized('pt_BR') }}">Português (Brazil) [pt_BR]</a></li> {% endif %} --> {% if lang != 'ru' %} <li><a class="dropdown-item" href="{{ self_localized('ru') }}">Ру́сский язы́к [ru]</a></li> {% endif %} - {% if lang != 'es' %} - <li><a class="dropdown-item" href="{{ self_localized('es') }}">Españ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ürkçe [tr]</a></li> {% endif %} + {% if lang != 'uk' %} + <li><a class="dropdown-item" href="{{ self_localized('uk') }}">Українська [uk]</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 %} </ul> </div> </div> |