[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch master updated: Insert again link to NGI Taler websit
From: |
gnunet |
Subject: |
[taler-www] branch master updated: Insert again link to NGI Taler website into navigation, stressing eventslist, events grouped by year |
Date: |
Wed, 10 Jan 2024 20:46:21 +0100 |
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 cf7e4fd Insert again link to NGI Taler website into navigation,
stressing eventslist, events grouped by year
cf7e4fd is described below
commit cf7e4fde38b5d80e4fe35e7aaeb65d6dd5689a8f
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Wed Jan 10 20:45:09 2024 +0100
Insert again link to NGI Taler website into navigation, stressing
eventslist, events grouped by year
Signed-off-by: Stefan Kügel <skuegel@web.de>
---
common/navigation.j2.inc | 2 +-
properties.yml | 37 +++++++++++++++++++++
template/ngi-taler.html.j2 | 83 +++++++++++++++++++++++++---------------------
3 files changed, 83 insertions(+), 39 deletions(-)
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 6384496..4df4011 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -31,7 +31,7 @@
{{ navlink('principles.html', _('Principles')) }}
{{ navlink('docs.html', _('Docs')) }}
{{ navlink('development.html', _('Development')) }}
- {# {{ navlink('ngi-taler.html', _('NGI Taler')) }} #}
+ {{ navlink('ngi-taler.html', _('NGI Taler')) }}
{# {{ navlink('comingsoon.html', _('Coming soon')) }} #}
{{ navlink('news/index.html', _('News')) }}
{# NOTE taler-systems.com deprecated in navigation bar -- Taler
Systems is reachable via consortium page instead #}
diff --git a/properties.yml b/properties.yml
index 6cef7f7..86e69ba 100644
--- a/properties.yml
+++ b/properties.yml
@@ -28,6 +28,43 @@ langs_full:
tr: Türkçe
nl: Nederlands
meetingnotes:
+eventslist:
+ - date: 2023-12-08
+ title: Introduction to GNU Taler (lecture)
+ url_img: images/TalerDiagram.svg
+ url_ext: https://moztw.kktix.cc/events/gnu-taler
+ url_html:
+ teaser: Political goals, architecture and technology behind GNU Taler,
current state of development and likely future developments.
+ location: Mozilla Community Space, 台北市中正區八德路一段 94 號 3F, Taipei City, Taiwan
+ speaker: Christian Grothoff
+ email: cg'AT'taler.net
+ - date: 2023-12-09
+ title: Live demo of the GNU Taler payment system
+ url_img: images/g0v-hackath59n.png
+ url_ext: https://beta.hackfoldr.org/g0v-hackath59n
+ url_html:
+ teaser: GNU Taler demo at the g0v-hackath59n in Taiwan
+ location: 地址 Address:新竹縣竹北市嘉豐南路一段 11 號, Taiwan
+ speaker: Christian Grothoff
+ email: cg'AT'taler.net
+ - date: 2023-12-21
+ title: Privacy in e-commerce (lecture)
+ url_img:
+ url_ext: https://ocf.tw/en/p/issues/coffeeandcircumventionen
+ url_html:
+ teaser: Taler is a privacy-preserving payment system. Customers can stay
anonymous, but merchants cannot hide their income through payments with GNU
Taler.
+ location: Freedom of the Internet Meetup, 網路自由小聚, Taipei City, Taiwan
+ speaker: Christian Grothoff
+ email: cg'AT'taler.net
+ - date: 2024-06-01
+ title: Carving a way out of surveillance capitalism (speech)
+ url_img: images/logo-TEDxGeneva.png
+ url_ext: https://www.tedxgeneva.net
+ url_html:
+ teaser: TEDx talk, IFRC, Geneva, Switzerland
+ location: IFRC, Chem. des Crêts 17, 1209 Geneva, Switzerland
+ speaker: Marie Walrafen
+ email: mw'AT'taler.net
newsposts:
- page: 2023-12.html
date: 2023-12-09
diff --git a/template/ngi-taler.html.j2 b/template/ngi-taler.html.j2
index 8211424..79ac69b 100644
--- a/template/ngi-taler.html.j2
+++ b/template/ngi-taler.html.j2
@@ -42,7 +42,50 @@
</div>
</article>
-{# DEPRECATED EVENTS AND DELIVERABLES
+ <article>
+ <div class="row">
+ <h4 class="font-weight-bold pb-2 mb-4">Events</h4>
+ </div>
+
+ <div class="row mb-4">
+ <p>
+ The consortium will organize or participate in different types of
events across Europe. <strong>Upcoming events:</strong>
+ </p>
+ {# 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. #}
+
+ <div>
+ {% for year, yitem in eventsdata|groupby('date.year')|reverse %}
+ <p><b>{{ year }}</b></p>
+ <ul class="timeline">
+ {% for item in yitem %}
+ <li>
+ <section class="item-preview">
+ <header>
+ <h3> {{ item['date']}}: {{ item['title']|e }}</h3>
+ <p class="item-date">
+ {{ item['teaser'] }}
+ </p>
+ </header>
+ <p class="item-abstract">
+ {{ item['location']}}, speaker: {{ item['speaker']}}
+ </p>
+ <p class="item-date">
+ <a href="{{ item['url_ext']}}" target="_blank"
rel="noopener noreferrer">External link: {{ item['url_ext']}}</a>
+ </p>
+
+ </section>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endfor %}
+ </div>
+ </div>
+ </article>
+
+{# DEPRECATED EVENTS AND DELIVERABLES IN CAROUSEL JS
<article>
<div class="row">
<h4 class="font-weight-bold pb-2 mb-4">Events</h4>
@@ -165,7 +208,7 @@
<div class="col">
<div class="card border-0 h-100">
<a href="{{ partner.url }}" target="_blank" rel="noopener
noreferrer">
- <img src="{{ url(partner.logo) }}" height="150" class="card-header
rounded-circle z-depth-3"
+ <img src="{{ url(partner.logo) }}" height="100" class="card-header
rounded-circle z-depth-3"
alt="{{ partner.id + ' avatar'}}">
</a>
{# <div class="card-note grey-text text-muted mt-3">{{
partner.contact }}</div> #}
@@ -184,42 +227,6 @@
</div>
</article>
- <article>
- <div class="row">
- <h4 class="font-weight-bold pb-2 mb-4">Events</h4>
- </div>
-
- <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
- 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. #}
- </p>
- <div class="col-md-11 col-md-4 mb-4 px-md-4">
- <ul>
- <li><strong>2023-12-08</strong><br>Lecture: Introduction to GNU
Taler at the <a href="https://moztw.kktix.cc/events/gnu-taler" target="_blank"
rel="noopener noreferrer">Mozilla Community Space, Taipei City, Taiwan</a></li>
- <p class="w-responsive mx-auto mb-3">
- We will introduce the political goals, architecture and technology
behind GNU Taler, demonstrate the current state of development and outline
likely future developments.
- </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 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">
- Taler is a privacy-preserving payment system. Customers can stay
anonymous, but merchants cannot hide their income through payments with GNU
Taler.
- </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">
- TEDx talk with a contribution by Marie Walrafen
- </p>
- </ul>
- </div>
- </div>
- </article>
-
</div>
</main>
{% endblock body_content %}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch master updated: Insert again link to NGI Taler website into navigation, stressing eventslist, events grouped by year,
gnunet <=