[taler-www] branch master updated: preparing for d6.1

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new 3178732c preparing for d6.1
3178732c is described below

commit 3178732cded8f5dc0544fab23ff12cc58855ca75
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Aug 26 22:22:58 2024 +0200

    preparing for d6.1
---
 locale/messages.pot                      |  4 +-
 properties.d/deliverables_eu-project.yml | 39 ++---------------
 properties.yml                           | 14 ++++++
 template/ngi-taler.html.j2               | 74 +++++++++++++++-----------------
 4 files changed, 55 insertions(+), 76 deletions(-)

diff --git a/locale/messages.pot b/locale/messages.pot
index fc790580..4fdb4b93 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-07-30 07:45+0200\n"
+"POT-Creation-Date: 2024-08-26 21:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.14.0\n"
 
 #: common/base.j2:5 common/news.j2:5
 msgid "GNU Taler"
diff --git a/properties.d/deliverables_eu-project.yml 
b/properties.d/deliverables_eu-project.yml
index 4ab41545..1dc527ed 100644
--- a/properties.d/deliverables_eu-project.yml
+++ b/properties.d/deliverables_eu-project.yml
@@ -4,38 +4,7 @@ deliverables:
   #   url_pdf:
   #   workpackage: WP ?
   #   comment:
-  - title: List group item heading
-    page:
-    url_pdf: "papers/boss2022thesis.pdf"
-    workpackage: WP 1
-    comment: Some placeholder content in a paragraph.
-  - title: List group item heading
-    page: news/2023-11.html
-    url_pdf:
-    workpackage: WP 3
-    comment: TBD
-  - title: List group item heading
-    page:
-    url_pdf:
-    workpackage: WP 5
-    comment: Placeholder
-  - title: List group item heading
-    page:
-    url_pdf:
-    workpackage: WP 5
-    comment: Placeholder
-  - title: List group item heading
-    page:
-    url_pdf:
-    workpackage: WP 5
-    comment: Placeholder
-  - title: List group item heading
-    page:
-    url_pdf:
-    workpackage: WP 5
-    comment: Placeholder
-  - title: List group item heading
-    page:
-    url_pdf:
-    workpackage: WP 5
-    comment: Placeholder
+  - title: "D6.1: Educational materials"
+    url_pdf: presentations/d6.1-ngi-lectures.pdf
+    workpackage: WP 6
+    comment: "This is only the PDF. An overview Web site, LaTeX sources and 
embedded videos can be found at <tt>https://git.taler.net/lectures.git/</tt>."
diff --git a/properties.yml b/properties.yml
index 60d06391..17199948 100644
--- a/properties.yml
+++ b/properties.yml
@@ -31,6 +31,20 @@ langs_full:
   fi: Suomen kieli
 meetingnotes:
 eventslist:
+  - date: 2024-10-22
+    title: Jensfest 2024
+    url_ext: https://2024.splashcon.org/home/jensfest-2024
+    teaser: Lifting the Fog of Trust
+    location: Pasadena, California, United States
+    speaker: Christian Grothoff, Özgür Kesim
+    email: grothoff'AT'taler.net
+  - date: 2024-08-20
+    title: Datenspuren 2024
+    url_ext: https://datenspuren.de/2024/
+    teaser: Event featuring payments in as well as tutorials and lectures on 
GNU Taler.
+    location: Dresden, Germany
+    speaker: Özgür Kesim, Leo Wittmann
+    email: oec'AT'taler.net
   - date: 2024-07-01
     title: PointZeroForum Innovation Tour Side-Event at BFH
     url_ext: 
https://www.bfh.ch/ti/en/news/events/gnu-taler-innovation-tour-point-zero-forum/
diff --git a/template/ngi-taler.html.j2 b/template/ngi-taler.html.j2
index 3e7320b6..18206261 100644
--- a/template/ngi-taler.html.j2
+++ b/template/ngi-taler.html.j2
@@ -11,14 +11,14 @@
       <!-- {# <div class="col col-md-auto"></div> #} project intro -->
       <div class="col-md-11 col-md-4 mb-4 px-md-4">
         <p class="w-responsive mx-auto mb-3">
-          GNU Taler (<em>Taxable Anonymous Libre Electronic Resources</em>) is 
a new secure 
+          GNU Taler (<em>Taxable Anonymous Libre Electronic Resources</em>) is 
a new secure
           electronic payment system based on open standards, free software, 
and advanced cryptography.
-          GNU Taler provides privacy guarantees to the buyer while offering 
the possibility 
-          to audit merchants, making sale incomes transparent and fraud 
difficult. 
-          To online merchants and retailers, GNU Taler offers instant 
transaction clearance 
-          without risks of fake payment methods. Computations needed to clear 
the payments 
-          are efficient and scalable so that banks can pass on lower 
transaction costs to 
-          consumers and merchants. Consumers can withdraw money from their 
existing bank account 
+          GNU Taler provides privacy guarantees to the buyer while offering 
the possibility
+          to audit merchants, making sale incomes transparent and fraud 
difficult.
+          To online merchants and retailers, GNU Taler offers instant 
transaction clearance
+          without risks of fake payment methods. Computations needed to clear 
the payments
+          are efficient and scalable so that banks can pass on lower 
transaction costs to
+          consumers and merchants. Consumers can withdraw money from their 
existing bank account
           into their GNU Taler wallet, detaching their spending habits from 
scrutiny, in the way cash does.
         </p>
         <p class="w-responsive mx-auto mb-3">
@@ -181,40 +181,36 @@
           </div>
         </div>
       </div>
+#}
 
-      <!-- deliverables -->
-      <div class="col-md-4 mb-4">
-        {% if conf['deliverables'] is defined and conf['deliverables'] and 
conf['deliverables'] != "" %}
-        <h4 class="font-weight-bold pb-2 mb-4">Deliverables</h4>
-        <div class="list-group ">
-          {% for item in conf['deliverables'] %}
-          {% set ns = namespace(symbol='images/file-cancel.svg') %}
-
-          {% if item['url_pdf'] is defined and item['url_pdf'] and 
item['url_pdf'] != "" %}
+  <article>
+    <div class="row">
+      <h4 class="font-weight-bold pb-2 mb-4">Deliverables</h4>
+    </div>
+    <div class="list-group ">
+      {% for item in conf['deliverables'] %}
+        {% set ns = namespace(symbol='images/file-cancel.svg') %}
+        {% if item['url_pdf'] is defined and item['url_pdf'] and 
item['url_pdf'] != "" %}
           <a href="{{ url(item['url_pdf']) }}" class="list-group-item 
list-group-item-action">
-            {% set ns.symbol = 'images/pdf.svg' %}
-            {% elif item['page'] is defined and item['page'] and item['page'] 
!= "" %}
-            <a href="{{ url(item['page']) }}" class="list-group-item 
list-group-item-action">
-              {% set ns.symbol = 'images/html.svg' %}
-              {% else %}
-              <a href="#" class="list-group-item list-group-item-action">
-                {% endif %}
-                <div class="d-flex w-100 justify-content-between">
-                  <h5 class="mb-1"><img border=0 alt="" width=24 height=24 
src="{{ url_static(ns.symbol) }}"> {{
-                    item['title'] }}</h5>
-                  <small>{{ item['workpackage'] }}</small>
-                </div>
-                {% if item['comment'] is defined and item['comment'] and 
item['comment'] != "" %}
-                <p class="mb-1">{{ item['comment'] }}</p>
-                {% endif %}
-              </a>
-              {% endfor %}
-        </div>
+          {% set ns.symbol = 'images/pdf.svg' %}
+        {% elif item['page'] is defined and item['page'] and item['page'] != 
"" %}
+          <a href="{{ url(item['page']) }}" class="list-group-item 
list-group-item-action">
+          {% set ns.symbol = 'images/html.svg' %}
+        {% else %}
+          <a href="#" class="list-group-item list-group-item-action">
         {% endif %}
-      </div>
+            <div class="d-flex w-100 justify-content-between">
+              <h5 class="mb-1"><img border=0 alt="" width=24 height=24 src="{{ 
url_static(ns.symbol) }}"> {{
+                  item['title'] }}</h5>
+              <small>{{ item['workpackage'] }}</small>
+            </div>
+            {% if item['comment'] is defined and item['comment'] and 
item['comment'] != "" %}
+              <p class="mb-1">{{ item['comment'] }}</p>
+            {% endif %}
+          </a>
+     {% endfor %}
     </div>
   </article>
-#}
 
   <article>
     <div class="row">
@@ -230,8 +226,8 @@
         </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 companies (Code Blau GmbH, Taler Systems S.A., VisualVest), 
-          a structure (petites singularités), cooperative banks (GLS Bank, 
MagNet Bank), a foundation (Stichting NLnet) 
+          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>
@@ -262,7 +258,7 @@
       {% endfor %}
     </div>
   </article>
-  
+
  </div>
 </main>
 {% endblock body_content %}

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.