diff options
-rw-r--r-- | common/footer-eu.j2.inc | 32 | ||||
-rw-r--r-- | properties.d/events_eu-project.yml | 30 | ||||
-rw-r--r-- | properties.d/partners.yml | 7 | ||||
-rw-r--r-- | template/consortium.html.j2 | 10 |
4 files changed, 38 insertions, 41 deletions
diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc index dd3ec7c4..54e336c8 100644 --- a/common/footer-eu.j2.inc +++ b/common/footer-eu.j2.inc @@ -7,20 +7,6 @@ </div> <div class="row justify-content-top"> <div class="col-md-4 col-sm-12"> - {# <h4>{% trans %}Legal Information{% endtrans %}</h4> #} - <div class="container container-fluid"> - <img src={{ url_static('images/logo-europeanUnion_FundedBy.svg') }} class="img-fluid" width="60%" alt="" loading="lazy"> - </div> - <div class="dark-grey-text container container-fluid"> - <p class="text-muted w-responsive mx-auto mt-4"> - <small> - 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 or - [name of the granting authority]. Neither the European Union nor the granting authority can be held responsible for them. - </small> - </p> - </div> - </div> - <div class="col-md-4 col-sm-12"> <h4>{% trans %}TALER Project{% endtrans %}</h4> <ul class="footer-list"> <li><strong>Coordinator:</strong> Eindhoven University of Technology (TUE)</li> @@ -33,8 +19,24 @@ <li><strong>{% trans %}Duration{% endtrans %}:</strong> 36 months</li> </ul> </div> + + <div class="col-md-4 col-sm-12"> + <h4>{% trans %}EU Funding{% endtrans %}</h4> + <div class="container container-fluid"> + <img src={{ url_static('images/logo-europeanUnion_FundedBy.svg') }} class="img-fluid" width="60%" alt="" loading="lazy"> + </div> + <div class="dark-grey-text container container-fluid"> + <p class="text-muted w-responsive mx-auto mt-4"> + <small> + 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> + </div> + </div> + <div class="col-md-4 col-sm-12"> - <h4>{% trans %}Project funded by{% endtrans %}</h4> + <h4>{% trans %}CH Funding{% endtrans %}</h4> <div class="container container-fluid"> <img src={{ url_static('images/logo-SBFI_EU_Frameworkprogramme_E_hoch.svg') }} class="img-fluid" width="70%" alt="" loading="lazy"> </div> diff --git a/properties.d/events_eu-project.yml b/properties.d/events_eu-project.yml index 42844791..0ec7954b 100644 --- a/properties.d/events_eu-project.yml +++ b/properties.d/events_eu-project.yml @@ -1,6 +1,6 @@ ### template item # - date: - # titel: + # title: # url_img: # url_ext: # url_html: @@ -10,36 +10,30 @@ # email: events: - - date: 2023-12-01 - titel: Carving a way out of surveillance capitalism + - date: 2024-06-01 + title: Carving a way out of surveillance capitalism url_img: images/9-competition.svg url_ext: https://www.tedxgeneva.net/ url_html: - teaser: "" - location: | - Chem. des Crêts 17, - 1209 Geneva, Switzerland + teaser: TEDx Geneva talk with a contribution by Marie Walrafen + location: IFRC, Chem. des Crêts 17, 1209 Geneva, Switzerland speaker: Marie Walrafen email: mw'AT'taler.net - date: 2023-12-08 - titel: "Introduction to GNU Taler" + title: Introduction to GNU Taler (lecture) url_img: images/diagram-simple.png url_ext: https://moztw.kktix.cc/events/gnu-taler url_html: - teaser: In this lecture, we will introduce the political goals, architecture and technology behind GNU Taler, demonstrate the current state of development and outline likely future developments. - location: | - Mozilla Community Space, Taipei, - 台北市中正區八德路一段 94 號 3F + teaser: We will introduce the political goals, architecture and technology behind GNU Taler, demonstrate the current state of development and outline likely future developments. + location: Mozilla Community Space, 台北市中正區八德路一段 94 號 3F, Taipei City, Taiwan speaker: Christian Grothoff email: cg'AT'taler.net - date: 2023-12-21 - titel: Privacy in e-commerce + title: Privacy in e-commerce url_img: - url_ext: + url_ext: https://ocf.tw/en/p/issues/coffeeandcircumventionen url_html: - teaser: GNU Taler is a privacy-preserving payment system. Customers can stay anonymous, but merchants can not hide their income through payments with GNU Taler. This helps to avoid tax evasion and money laundering. - location: | - Freedom of the Internet Meetup, - Taipei + 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 diff --git a/properties.d/partners.yml b/properties.d/partners.yml index 1ea0073f..55208cd8 100644 --- a/properties.d/partners.yml +++ b/properties.d/partners.yml @@ -4,8 +4,9 @@ partners: contact: "Prof. Dr. Tanja Lange" logo: images/logo-tue.svg url: "https://www.tue.nl/" - role: "-- TBD --" - statement: "-- TBD --" + role: "The team of Eindhoven University of Technology consists of Kathrin Hövelmanns, Andreas Hülsing, Tanja Lange, and Heloise Vieira. + They coordinate the consortium and their work focuses on research and applications of cryptology." + statement: "" - id: BFH name: "Bern University of Applied Sciences" contact: "Prof. Dr. Christian Grothoff" @@ -48,7 +49,7 @@ partners: Germany, established in 1999. We help GNU Taler to be safe and secure when used by citizens, merchants and payment service providers." statement: "We are excited to be part of this consortium and are looking - forward to help deploy GNU Taler in the eurozone and our role as auditor of + forward to help deploy GNU Taler in the Eurozone and our role as auditor of the first large-scale instantiation of GNU Taler." - id: VV name: "Visual Vest" diff --git a/template/consortium.html.j2 b/template/consortium.html.j2 index edd68b6b..81bd9fa0 100644 --- a/template/consortium.html.j2 +++ b/template/consortium.html.j2 @@ -28,7 +28,7 @@ <div class="col-md-11 col-md-4 mb-4"> <p class="w-responsive mx-auto mb-3"> {% trans %} - The TALER project is an initiative of Horizon Europe (Pilots for the Next Generation Internet) + The TALER project is funded under Horizon Europe (Pilots for the Next Generation Internet) with the aim of bringing GNU Taler to market across Europe. <br> To make GNU Taler accessible to European citizens, we need a commercially viable use of @@ -79,14 +79,14 @@ <div {% if loop.first %} class="carousel-item active" {% else %} class="carousel-item" {% endif %} data-bs-interval="5000"> - <h5 class="summary">{{ item['titel'] }}</h5> + <h5 class="summary">{{ item['title'] }}</h5> <div class="img-box"> <img src="{{ url( item['url_img']|default('images/logo-2021.svg', true) ) }}" alt=""> </div> <p class="description testimonial"> {{ item['teaser'] }} </p> - <p class="fas fa-calendar-alt"> To be held on + <p class="fas fa-calendar-alt"> Date: <span class="dtstart"> <abbr class="value" title="{{ item['date'] }}"> {{ item['date'] }}</abbr> </span> @@ -99,7 +99,7 @@ {% endif %} <p class="fa fa-user"> <b>{{ item['speaker'] }}</b></p> {% if item['email'] is defined and item['email'] and item['email'] != "" %} - <p class="fas fa-envelope"> <a href="mailto:{{ item['email'] }}?subject={{ item['titel'] }}"><span + <p class="fas fa-envelope"> <a href="mailto:{{ item['email'] }}?subject={{ item['title'] }}"><span class="dark-grey-text"> Contact</span></a></p> {% endif %} @@ -198,4 +198,4 @@ </div> </main> -{% endblock body_content %}
\ No newline at end of file +{% endblock body_content %} |