[taler-www] branch master updated: adjust layout and replace events carousel with static list at the bottom of the consortium web page

[gnunet]

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 adf4d21  adjust layout and replace events carousel with static list at 
the bottom of the consortium web page
adf4d21 is described below

commit adf4d21a168b27817db8e61a7dfbc915dc669155
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Tue Dec 19 11:52:35 2023 +0100

    adjust layout and replace events carousel with static list at the bottom of 
the consortium web page
---
 common/footer-eu.j2.inc     |  2 +-
 template/consortium.html.j2 | 52 +++++++++++++++++++++++++++++++++++++--------
 template/features.html.j2   |  2 +-
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/common/footer-eu.j2.inc b/common/footer-eu.j2.inc
index b541f03..10c869a 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-12">
+      <div class="col-md-4 col-sm-16">
       <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/template/consortium.html.j2 b/template/consortium.html.j2
index a5802c8..86e9abc 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -4,7 +4,9 @@
 <div class="container consortium dark-grey-text">
   <article>
     <div class="row">
-    <img class="img-fluid" src="{{ url_static('images/logo-NGI_Taler.svg') }}" 
alt="NGI Taler logo" width="200px">
+      <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 -->
@@ -40,8 +42,7 @@
     </div>
   </article>
 
-
-
+{# DEPRECATED EVENTS AND DELIVERABLES
   <article>
     <div class="row">
       <h4 class="font-weight-bold pb-2 mb-4">Events</h4>
@@ -95,7 +96,6 @@
                         class="dark-grey-text"> Contact</span></a></div>
                   {% endif %}
                 </div>
-
               </div>
               {% endfor %}
             </div>
@@ -103,7 +103,6 @@
         </div>
       </div>
 
-      {# DEPRECATED DELIVERABLES
       <!-- deliverables -->
       <div class="col-md-4 mb-4">
         {% if conf['deliverables'] is defined and conf['deliverables'] and 
conf['deliverables'] != "" %}
@@ -134,9 +133,9 @@
         </div>
         {% endif %}
       </div>
-      #}
     </div>
   </article>
+#}
 
   <article>
     <div class="row">
@@ -144,7 +143,7 @@
     </div>
 
     <div class="row mb-4">
-      <!-- consortium intro -->
+      <!-- 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,
@@ -159,7 +158,6 @@
       </div>
     </div>
 
-
     <div class="row row-cols-1 row-cols-md-3 g-4 text-center">
       <!-- consortium board -->
 
@@ -183,9 +181,45 @@
         </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 around money 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 %}
diff --git a/template/features.html.j2 b/template/features.html.j2
index 694664e..edd9ac3 100644
--- a/template/features.html.j2
+++ b/template/features.html.j2
@@ -57,7 +57,7 @@
     </p>
     </div>
     <div class="col-lg-6">
-      <img class="img-fluid" src="{{ url_static('images/TalerDiagram.svg') }}">
+      <img class="img-fluid" src="{{ url_static('images/TalerDiagram.svg') }}" 
width="600px">
     </div>
   </div>
 </div>

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