updating navigation and adding ngi-taler.html to taler.net

5 files changed, 235 insertions, 6 deletions

diff --git a/common/consortium.j2 b/common/consortium.j2
index 71918907..b9612492 100644
--- a/common/consortium.j2
+++ b/common/consortium.j2
@@ -4,7 +4,7 @@
     <meta charset="UTF-8"/>
     <title>NGI Taler</title>
     <link rel="shortcut icon" href="/favicon.ico" />
-    <link rel="icon" type="image/svg+xml" href="{{ url_static('images/favicon.svg') }}" sizes="any" />
+    <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') }}" />
@@ -12,7 +12,7 @@
     <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('consortium.html') }}" />
+    <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') }}" />
diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc
index 10c869a3..b541f032 100644
--- a/common/footer-eu.j2.inc
+++ b/common/footer-eu.j2.inc
@@ -6,7 +6,7 @@
       </div>
     </div>
     <div class="row justify-content-top">
-      <div class="col-md-4 col-sm-16">
+      <div class="col-md-4 col-sm-12">
       <h4>NGI TALER Overview</h4>
         <ul class="footer-list">
         <img class="img-fluid" src="{{ url_static('images/logo-NGI_Taler.svg') }}" alt="The NGI Taler logo" width="280px">
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index d5958edb..4df40112 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -31,10 +31,10 @@
           {{ navlink('principles.html', _('Principles')) }}
           {{ navlink('docs.html', _('Docs')) }}
           {{ navlink('development.html', _('Development')) }}
-          {# {{ navlink('consortium.html', _('Consortium')) }} #}
+          {{ navlink('ngi-taler.html', _('NGI Taler')) }}
           {# {{ navlink('comingsoon.html', _('Coming soon')) }} #}
           {{ navlink('news/index.html', _('News')) }}
-          {# NOTE Removed from navigation and linked consortium page instead -- Taler Systems is reachable via consortium partners #}
+          {# NOTE taler-systems.com deprecated in navigation bar -- Taler Systems is reachable via consortium page instead #}
           {# <li class="nav-item mx-2">
             <a class="nav-link" href="https://taler-systems.com/" target="_blank" rel="noopener noreferrer">{% trans %}Company{% endtrans %}</a>
           </li>
diff --git a/locale/messages.pot b/locale/messages.pot
index e5245b75..9f60754a 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2023-12-18 13:19+0100\n"
+"POT-Creation-Date: 2023-12-20 07:47+0100\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"
@@ -135,6 +135,10 @@ msgstr ""
 msgid "Principles"
 msgstr ""
 
+#: common/navigation.j2.inc:34
+msgid "NGI Taler"
+msgstr ""
+
 #: common/navigation.j2.inc:36 template/index.html.j2:54
 #: template/news/index.html.j2:9
 msgid "News"
diff --git a/template/ngi-taler.html.j2 b/template/ngi-taler.html.j2
new file mode 100644
index 00000000..f25297b1
--- /dev/null
+++ b/template/ngi-taler.html.j2
@@ -0,0 +1,225 @@
+{% extends "common/consortium.j2" %}
+{% block body_content %}
+<main id="maincontent">
+<div class="container consortium dark-grey-text">
+  <article>
+    <div class="row">
+      <div class="col-lg-6">
+        <img class="img-fluid" src="{{ url_static('images/logo-NGI_Taler.svg') }}" alt="NGI Taler logo" width="500px">
+      </div>
+      <h4 class="font-weight-bold pb-2 mb-4">NGI TALER</h4>
+      {# <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">
+          The NGI TALER project is funded under Horizon Europe (Pilots for the Next Generation Internet)
+          with the aim of bringing GNU Taler to market across Europe.
+        </p>
+        <p class="w-responsive mx-auto mb-3">
+          To make GNU Taler accessible to European citizens, we need a commercially viable use of
+          the GNU Taler technology. We will achieve this through the four key project objectives.
+        </p>
+        <div class="accordion" id="accordionObjectives">
+          {% for objective in conf['objectives'] %}
+          <div class="accordion-item">
+            <h2 class="accordion-header" id="heading_{{ loop.index }}">
+              <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                data-bs-target="#collapse_{{ loop.index }}" aria-expanded="false"
+                aria-controls="collapse_{{ loop.index }}">
+                Objective {{ loop.index }}: {{ objective.title }}
+              </button>
+            </h2>
+            <div id="collapse_{{ loop.index }}" class="accordion-collapse collapse"
+              aria-labelledby="heading_{{ loop.index }}" data-bs-parent="#accordionObjectives">
+              <p class="accordion-body text-muted w-responsive">
+                {{ objective.text }}
+              </p>
+            </div>
+          </div>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+  </article>
+
+{# DEPRECATED EVENTS AND DELIVERABLES
+  <article>
+    <div class="row">
+      <h4 class="font-weight-bold pb-2 mb-4">Events</h4>
+      <div class="col-md-6 mb-6">
+        <!-- events carousel -->
+        <div class="container announce">
+          <div id="AnnouncCarousel" class="carousel slide" data-bs-ride="carousel">
+            <!-- Carousel indicators -->
+            <div class="carousel-indicators">
+              {% for number in range(0, conf['events']|count) %}
+              <button data-bs-target="#AnnouncCarousel" data-bs-slide-to="{{ number }}" {% if number==0 %}
+                class="active" {% endif %} aria-current="true" aria-label="Slide {{ number + 1 }}"></button>
+              {% endfor %}
+            </div>
+
+            <!-- Wrapper for carousel items -->
+            <div class="carousel-inner vevent">
+              {% for item in conf['events'] %}
+
+              <div {% if loop.first %} class="carousel-item active" {% else %} class="carousel-item" {% endif %}
+                data-bs-interval="5000">
+                <h5 class="summary">{{ item['title'] }}</h5>
+                <div class="img-box">
+                  {% if item['url_ext'] is defined and item['url_ext'] and item['url_ext'] != "" %}
+                  <a href="{{ item['url_ext'] }}" target="_blank" rel="noopener noreferrer">
+                    {% endif %}
+                    <img src="{{ url( item['url_img']|default('images/logo-2021.svg', true) ) }}" alt="" width="300px">
+                    {% if item['url_ext'] is defined and item['url_ext'] and item['url_ext'] != "" %}
+                  </a>
+                  {% endif %}
+                </div>
+                <p class="description">
+                  {{ item['teaser'] }}
+                </p>
+                <div class="contact">
+                  <div class="fas fa-calendar-alt"> Date:
+                    <span class="dtstart">
+                      <abbr class="value" title="{{ item['date'] }}"> {{ item['date'] }}</abbr>
+                    </span>
+                  </div>
+                  {% if item['url_ext'] is defined and item['url_ext'] and item['url_ext'] != "" %}
+                  <div class="fa fa-globe"> <a target="_blank" href="{{ item['url_ext'] }}"> About</a></div>
+                  {% endif %}
+                  {% if item['location'] is defined and item['location'] and item['location'] != "" %}
+                  <p class="fas fa-map-marker-alt"> Location: <span class="location">{{ item['location'] }}</span>
+                  </p>
+                  {% endif %}
+                  <div class="fa fa-user"> <b>{{ item['speaker'] }}</b></div>
+                  {% if item['email'] is defined and item['email'] and item['email'] != "" %}
+                  <div class="fas fa-envelope"> <a href="mailto:{{ item['email'] }}?subject={{ item['title'] }}"><span
+                        class="dark-grey-text"> Contact</span></a></div>
+                  {% endif %}
+                </div>
+              </div>
+              {% endfor %}
+            </div>
+          </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'] != "" %}
+          <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>
+        {% endif %}
+      </div>
+    </div>
+  </article>
+#}
+
+  <article>
+    <div class="row">
+      <h4 class="font-weight-bold pb-2 mb-4">Partners</h4>
+    </div>
+
+    <div class="row mb-4">
+      <!-- intro -->
+      <div class="col-md-11 col-md-4 mb-4 px-md-4">
+        <p class="w-responsive mx-auto mb-3">
+          The NGI TALER consortium consists of 11 partners from 8 European countries (the Netherlands, Belgium, France,
+          Germany, Greece, Hungary, Luxembourg and Switzerland).
+        </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).
+        </p>
+      </div>
+    </div>
+
+    <div class="row row-cols-1 row-cols-md-3 g-4 text-center">
+      <!-- consortium board -->
+
+      {% for partner in conf['partners'] %}
+      <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"
+              alt="{{ partner.id + ' avatar'}}">
+          </a>
+          {# <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> -->
+          </div>
+          <!-- <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>
+      {% endfor %}
+    </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 demo
+        </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">
+          with a contribution by Marie Walrafen
+        </p>
+        </ul>
+      </div>
+    </div>
+    </article>
+    
+ </div>
+</main>
+{% endblock body_content %}