taler-www

Main taler.net website
Log | Files | Refs | Submodules | README | LICENSE
commit ec3c8e9ea22b75ed5c24ce74af6249e6eaf8a650
parent 044859f3dec10758d668a11e3d6df9ef7c9f084e
Author: Stefan Kügel <skuegel@web.de>
Date:   Thu, 11 Jan 2024 14:45:13 +0100

update partner section, sorting of events in decresing timeline

Diffstat:

Mproperties.d/events_eu-project.yml | 6+++---


Mproperties.d/partners.yml | 72++++++++++++++++++++++++++++++++++++------------------------------------


Mproperties.yml | 26+++++++++++++-------------


Mtemplate/ngi-taler.html.j2 | 18+++++++++---------


4 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/properties.d/events_eu-project.yml b/properties.d/events_eu-project.yml
@@ -16,7 +16,7 @@ events:
     url_ext: https://moztw.kktix.cc/events/gnu-taler
     url_html:
     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
+    location: Mozilla Community Space, Taipei City, Taiwan
     speaker: Christian Grothoff
     email: cg'AT'taler.net
   - date: 2023-12-09
@@ -25,7 +25,7 @@ events:
     url_ext: https://beta.hackfoldr.org/g0v-hackath59n
     url_html:
     teaser: GNU Taler demo at the g0v-hackath59n in Taiwan
-    location: 地址 Address：新竹縣竹北市嘉豐南路一段 11 號, Taiwan
+    location: 新竹縣竹北市嘉豐南路一段 11 號, Taiwan
     speaker: Christian Grothoff
     email: cg'AT'taler.net
   - date: 2023-12-21
@@ -34,7 +34,7 @@ events:
     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
+    location: Freedom of the Internet Meetup, Taipei City, Taiwan
     speaker: Christian Grothoff
     email: cg'AT'taler.net
   - date: 2024-06-01
diff --git a/properties.d/partners.yml b/properties.d/partners.yml
@@ -7,25 +7,6 @@ partners:
     role: "The team of Eindhoven University of Technology consists of Kathrin H&ouml;velmanns, Andreas H&uuml;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"
-    logo: images/logo-bfh.svg
-    url: https://ti.bfh.ch
-    role: "Bern University of Applied Sciences has extensive experience in the operation,
-    development and enhancement of software and hardware for the GNU Taler payment system
-    and can therefore also manufacture needed hardware."
-    statement: "BFH is excited to educate the next generation of developers about the future of digital payments."
-  - id: TSYS
-    name: "Taler Systems S.A."
-    contact: "Dr. Florian Dold"
-    logo: images/logo-TalerSystems.svg
-    url: https://taler-systems.com
-    role: "Taler Systems SA will sustain the development of the core GNU Taler technology
-    and assist all partners with their respective integration efforts."
-    statement: "This consortium offers the perfect opportunity to widely deploy GNU Taler
-    in Europe and seed the global adoption of a payment system respecting informational
-    self-determination."
   - id: GLS
     name: "GLS Bank"
     contact: "Leo Wittmann"
@@ -33,13 +14,6 @@ partners:
     url: https://www.gls.de
     role: "-- TBD --"
     statement: "-- TBD --"
-  - id: MAG
-    name: "MagNet Bank"
-    contact: "-- TBD --"
-    logo: images/logo-MagNetBank.svg
-    url: https://www.magnetbank.hu
-    role: "-- TBD --"
-    statement: "-- TBD --"
   - id: CBG
     name: "Code Blau GmbH"
     contact: "Özgür Kesim"
@@ -58,16 +32,16 @@ partners:
     url: https://www.visualvest.de
     role: "-- TBD --"
     statement: "-- TBD --"
-  - id: HODI
-    name: "Homo Digitalis"
-    contact: "Eleftherios Chelioudakis"
-    logo: images/logo-HomoDigitalis.svg
-    url: https://www.homodigitalis.gr
-    role: "Homo Digitalis is a Greek Civil Society Organization that focuses on the protection and promotion of human rights in the digital age, member of the EDRi network."
-    statement: "Homo Digitalis, as a digital rights CSO, is extremely excited to participate
-    in this project, working shoulder to shoulder with an amazing group of stakeholders
-    to promote a new electronic privacy-preserving payment system that benefits European
-    citizens, merchants, and banks."
+  - id: TSYS
+    name: "Taler Systems S.A."
+    contact: "Dr. Florian Dold"
+    logo: images/logo-TalerSystems.svg
+    url: https://taler-systems.com
+    role: "Taler Systems SA will sustain the development of the core GNU Taler technology
+    and assist all partners with their respective integration efforts."
+    statement: "This consortium offers the perfect opportunity to widely deploy GNU Taler
+    in Europe and seed the global adoption of a payment system respecting informational
+    self-determination."
   - id: PS
     name: "petites singularités"
     contact: "Jean-Michel Massibot"
@@ -89,6 +63,16 @@ partners:
     url: https://www.eseniors.eu
     role: "ESEN fights e-exclusion by offering ICT training to seniors (people aged 55 and over) to bridge the digital gap between generations and foster seniors’ social participation."
     statement: "ESEN’s main focus is on representing end-users and ensuring that technical solutions meet the needs of end-users, especially senior citizens."
+  - id: HODI
+    name: "Homo Digitalis"
+    contact: "Eleftherios Chelioudakis"
+    logo: images/logo-HomoDigitalis.svg
+    url: https://www.homodigitalis.gr
+    role: "Homo Digitalis is a Greek Civil Society Organization that focuses on the protection and promotion of human rights in the digital age, member of the EDRi network."
+    statement: "Homo Digitalis, as a digital rights CSO, is extremely excited to participate
+    in this project, working shoulder to shoulder with an amazing group of stakeholders
+    to promote a new electronic privacy-preserving payment system that benefits European
+    citizens, merchants, and banks."
   - id: NLnet
     name: "Stichting NLnet"
     contact: "-- TBD --"
@@ -96,3 +80,19 @@ partners:
     url: https://nlnet.nl
     role: "-- TBD --"
     statement: "-- TBD --"
+  - id: MAG
+    name: "MagNet Bank"
+    contact: "-- TBD --"
+    logo: images/logo-MagNetBank.svg
+    url: https://www.magnetbank.hu
+    role: "-- TBD --"
+    statement: "-- TBD --"
+  - id: BFH
+    name: "Bern University of Applied Sciences"
+    contact: "Prof. Dr. Christian Grothoff"
+    logo: images/logo-bfh.svg
+    url: https://ti.bfh.ch
+    role: "Bern University of Applied Sciences has extensive experience in the operation,
+    development and enhancement of software and hardware for the GNU Taler payment system
+    and can therefore also manufacture needed hardware."
+    statement: "BFH is excited to educate the next generation of developers about the future of digital payments."
diff --git a/properties.yml b/properties.yml
@@ -29,13 +29,22 @@ langs_full:
   nl: Nederlands
 meetingnotes:
 eventslist:
+  - 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
   - 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
+    location: Mozilla Community Space, Taipei City, Taiwan
     speaker: Christian Grothoff
     email: cg'AT'taler.net
   - date: 2023-12-09
@@ -43,8 +52,8 @@ eventslist:
     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
+    teaser: GNU Taler demo at the g0v-hackath59n
+    location: 新竹縣竹北市嘉豐南路一段 11 號, Taiwan
     speaker: Christian Grothoff
     email: cg'AT'taler.net
   - date: 2023-12-21
@@ -53,18 +62,9 @@ eventslist:
     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
+    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
@@ -59,8 +59,9 @@
       <div>
           {% for year, yitem in eventsdata|groupby('date.year')|reverse %}
           <p><b>{{ year }}</b></p>
+
           <ul class="timeline">
-          {% for item in yitem %}
+          {% for item in yitem|reverse %}
           <li>
               <section class="item-preview">
                <header>
@@ -75,7 +76,6 @@
                   <p class="item-date">
                     <a href="{{ item['url_ext']}}" target="_blank" rel="noopener noreferrer">External link: {{ item['url_ext']}}</a>
                   </p>
-
               </section>
             </li>
           {% endfor %}
@@ -194,9 +194,9 @@
         </p>
         <p class="w-responsive mx-auto mb-3">
           The consortium is diverse in terms of types of institutions, including research (Eindhoven University of Technology) and
-          applied science universities (Berner Fachhochschule BFH), 
-          small for-profit (Code Blau GmbH, Taler Systems S.A., VisualVest) and non-profit (petites singularités) companies,
-          cooperative banks (GLS Bank, MagNet Bank), a foundation (Stichting NLnet) and grassroots movements (E-Seniors Association, Homo Digitalis).
+          applied science universities (Berner Fachhochschule BFH), small for-profit companies (Code Blau GmbH, Taler Systems S.A., VisualVest), 
+          a structure (petites singularités), cooperative banks (GLS Bank, MagNet Bank), a foundation (Stichting NLnet) 
+          and grassroots movements (E-Seniors Association, Homo Digitalis).
         </p>
       </div>
     </div>
@@ -211,16 +211,16 @@
             <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> #}
+          {# <!-- <div class="card-note grey-text text-muted mt-3">{{ partner.contact }}</div> --> #}
           <div class="card-body h-100">
             <h5 class="card-title font-weight-bold grey-text">{{ partner.name }} </h5>
-            <!-- <p class="card-text grey-text text-muted word-wrap"> {{ partner.role }} </p> -->
+            {# <!-- <p class="card-text grey-text text-muted word-wrap"> {{ partner.role }} </p> --> #}
           </div>
-          <!-- <div class="card-footer">
+          {# <!-- <div class="card-footer">
             <p><small class="text-body-secondary dark-grey-text text-muted word-wrap">
                 <i>{{ partner.statement }}</i>
               </small></p>
-          </div> -->
+          </div> --> #}
         </div>
       </div>
       {% endfor %}