summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kügel <skuegel@web.de>2023-12-20 20:41:54 +0100
committerStefan Kügel <skuegel@web.de>2023-12-20 20:41:54 +0100
commit899f68854bf67eac896428a90af8b6d259a08763 (patch)
tree375e64196487ebad8519b65a7fa24ffe2a0af025
parent6ea2481bc85e200c47921d8a8b19f70be0e01744 (diff)
downloadwww-899f68854bf67eac896428a90af8b6d259a08763.tar.gz
www-899f68854bf67eac896428a90af8b6d259a08763.tar.bz2
www-899f68854bf67eac896428a90af8b6d259a08763.zip
integrating favicons and nicer footer for the NGI Taler web site
Diffstat
-rw-r--r--NGI_favicon.icobin0 -> 15406 bytes
-rw-r--r--common/consortium.j215
-rw-r--r--common/footer-eu.j2.inc10
-rw-r--r--static/images/NGI_android-chrome-192x192.pngbin0 -> 16161 bytes
-rw-r--r--static/images/NGI_android-chrome-512x512.pngbin0 -> 51253 bytes
-rw-r--r--static/images/NGI_apple-touch-icon.pngbin0 -> 15449 bytes
-rw-r--r--static/images/NGI_favicon.pngbin0 -> 1946 bytes
-rw-r--r--template/ngi-taler.html.j28
8 files changed, 17 insertions, 16 deletions
diff --git a/NGI_favicon.ico b/NGI_favicon.ico
new file mode 100644
index 00000000..34d2df97
--- /dev/null
+++ b/NGI_favicon.ico
Binary files differ
diff --git a/common/consortium.j2 b/common/consortium.j2
index b9612492..726e4219 100644
--- a/common/consortium.j2
+++ b/common/consortium.j2
@@ -3,22 +3,21 @@
<head>
<meta charset="UTF-8"/>
<title>NGI Taler</title>
- <link rel="shortcut icon" href="/favicon.ico" />
+ <link rel="shortcut icon" href="/NGI_favicon.ico" />
<link rel="icon" type="image/svg+xml" href="{{ url_static('images/logo-NGI_Taler.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') }}" />
+ <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/favicon.ico" />
- <meta property="og:image" content="/favicon.ico" />
- <meta property="og:image" content="{{ url_static('images/favicon.png') }}" />
+ <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" /> #}
- {# TODO Other header may be needed #}
{% include "common/header.j2.inc" %}
{% block head_content %}{% endblock %}
</head>
diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc
index b541f032..170cbd07 100644
--- a/common/footer-eu.j2.inc
+++ b/common/footer-eu.j2.inc
@@ -9,6 +9,7 @@
<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.svg') }}" alt="The NGI Taler logo" width="280px">
<li><strong>Coordinator:</strong> Eindhoven University of Technology</li>
<li><strong>E-Mail: </strong><a href="mailto:questions'AT'taler.net?subject=Mail from EU project Website">Contact us</a></li>
@@ -18,6 +19,7 @@
<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">
@@ -27,17 +29,17 @@
</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
+ <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>
+ 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>
diff --git a/static/images/NGI_android-chrome-192x192.png b/static/images/NGI_android-chrome-192x192.png
new file mode 100644
index 00000000..07841c89
--- /dev/null
+++ b/static/images/NGI_android-chrome-192x192.png
Binary files differ
diff --git a/static/images/NGI_android-chrome-512x512.png b/static/images/NGI_android-chrome-512x512.png
new file mode 100644
index 00000000..a8dcd990
--- /dev/null
+++ b/static/images/NGI_android-chrome-512x512.png
Binary files differ
diff --git a/static/images/NGI_apple-touch-icon.png b/static/images/NGI_apple-touch-icon.png
new file mode 100644
index 00000000..7406497c
--- /dev/null
+++ b/static/images/NGI_apple-touch-icon.png
Binary files differ
diff --git a/static/images/NGI_favicon.png b/static/images/NGI_favicon.png
new file mode 100644
index 00000000..c57daa06
--- /dev/null
+++ b/static/images/NGI_favicon.png
Binary files differ
diff --git a/template/ngi-taler.html.j2 b/template/ngi-taler.html.j2
index f25297b1..8211424e 100644
--- a/template/ngi-taler.html.j2
+++ b/template/ngi-taler.html.j2
@@ -192,10 +192,10 @@
<div class="row mb-4">
<p>
The consortium will organize or participate in different types of events across Europe.
- <!-- Events will include talks presenting GNU Taler and related technologies, expert panels discussing
+ {# Events will include talks presenting GNU Taler and related technologies, expert panels discussing
financial problems and possible solutions, workshops to jointly work on GNU Taler integrations,
usability studies with interested volunteers, and public consultations to gather ideas and requirements
- from the general public. -->
+ from the general public. #}
</p>
<div class="col-md-11 col-md-4 mb-4 px-md-4">
<ul>
@@ -205,7 +205,7 @@
</p>
<li><strong>2023-12-09</strong><br>Live demo of the GNU Taler payment system at the <a href="https://beta.hackfoldr.org/g0v-hackath59n" target="_blank" rel="noopener noreferrer">g0v-hackath59n in Taiwan</a></li>
<p class="w-responsive mx-auto mb-3">
- GNU Taler demo
+ GNU Taler demonstration by Christian Grothoff
</p>
<li><strong>2023-12-21</strong><br>Lecture: Privacy in e-commerce at the <a href="https://ocf.tw/en/p/issues/coffeeandcircumventionen" target="_blank" rel="noopener noreferrer">Freedom of the Internet Meetup, Taipei City, Taiwan</a></li>
<p class="w-responsive mx-auto mb-3">
@@ -213,7 +213,7 @@
</p>
<li><strong>2024-06-01</strong><br>Speech: Carving a way out of surveillance capitalism at the <a href="https://www.tedxgeneva.net" target="_blank" rel="noopener noreferrer">TEDx talk, IFRC, Geneva, Switzerland</a></li>
<p class="w-responsive mx-auto mb-3">
- with a contribution by Marie Walrafen
+ TEDx talk with a contribution by Marie Walrafen
</p>
</ul>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-09 11:10:43 +0000