[taler-www] branch master updated (c87a336 -> 74064cb)

[gnunet]

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

andreas-habegger pushed a change to branch master
in repository www.

    from c87a336  UC: Semantic clean-up -- feedback 9, 10, 12 from hk; WIP
     new f34b1f4  UC: Link event image; Fix size of event contact field
     new 74064cb  Added NGI Taler link; TEDx Geneva logo added

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 properties.d/events_eu-project.yml |  13 ++++++++--
 static/images/logo-NGITaler.png    | Bin 0 -> 30586 bytes
 static/images/logo-TEDxGeneva.png  | Bin 0 -> 3898 bytes
 static/styles.css                  |   8 +++++-
 template/consortium.html.j2        |  51 ++++++++++++++++++++++---------------
 5 files changed, 48 insertions(+), 24 deletions(-)
 create mode 100644 static/images/logo-NGITaler.png
 create mode 100644 static/images/logo-TEDxGeneva.png

diff --git a/properties.d/events_eu-project.yml 
b/properties.d/events_eu-project.yml
index d0a46b8..01b9d65 100644
--- a/properties.d/events_eu-project.yml
+++ b/properties.d/events_eu-project.yml
@@ -28,10 +28,19 @@ events:
     location: Freedom of the Internet Meetup, 網路自由小聚, Taipei City, Taiwan
     speaker: Christian Grothoff
     email: cg'AT'taler.net
+  - date: 2023-12-01
+    title: NGI TALER call
+    url_img: images/logo-NGITaler.png
+    url_ext: https://nlnet.nl/taler
+    url_html:
+    teaser: "The first call of NGI TALER will open up on December 
1<sup>st</sup> 2023, with a deadline of February 1<sup>st</sup> 2024. More 
information about the initiative, the board and guidelines on the website of 
NLnet."
+    location:
+    speaker: NLnet Foundation
+    email:
   - 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_img: images/logo-TEDxGeneva.png
+    url_ext: https://www.tedxgeneva.net
     url_html:
     teaser: TEDx Geneva talk with a contribution by Marie Walrafen
     location: IFRC, Chem. des Crêts 17, 1209 Geneva, Switzerland
diff --git a/static/images/logo-NGITaler.png b/static/images/logo-NGITaler.png
new file mode 100644
index 0000000..ea27912
Binary files /dev/null and b/static/images/logo-NGITaler.png differ
diff --git a/static/images/logo-TEDxGeneva.png 
b/static/images/logo-TEDxGeneva.png
new file mode 100644
index 0000000..0efc5fe
Binary files /dev/null and b/static/images/logo-TEDxGeneva.png differ
diff --git a/static/styles.css b/static/styles.css
index 0790dc7..076d318 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -333,12 +333,18 @@ ul.timeline>li:before {
   padding: 0 70px;
 }
 
-.announce .testimonial {
+.announce .description {
   max-height: 100px;
   min-height: 100px;
   overflow: scroll;
 }
 
+.announce .contact {
+  max-height: 90px;
+  min-height: 90px;
+  /* overflow: scroll; */
+}
+
 .announce .carousel .carousel-item {
   color: #999;
   font-size: 14px;
diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index 084acb1..7dc8380 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -63,28 +63,37 @@
               <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"> <img src="{{ url( 
item['url_img']|default('images/logo-2021.svg', true) ) }}"
-                    alt="">
+                <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="">
+                    {% if item['url_ext'] is defined and item['url_ext'] and 
item['url_ext'] != "" %}
+                  </a>
+                  {% endif %}
                 </div>
-                <p class="description testimonial">
+                <p class="description">
                   {{ item['teaser'] }}
                 </p>
-                <p class="fas fa-calendar-alt"> Date:
-                  <span class="dtstart">
-                    <abbr class="value" title="{{ item['date'] }}"> {{ 
item['date'] }}</abbr>
-                  </span>
-                </p>
-                {% if item['url_ext'] is defined and item['url_ext'] and 
item['url_ext'] != "" %}
-                <p class="fa fa-globe"> <a target="_blank" href="{{ 
item['url_ext'] }}"> About</a></p>
-                {% 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 %}
-                <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['title'] }}"><span
-                      class="dark-grey-text"> Contact</span></a></p>
-                {% endif %}
+                <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 %}
@@ -166,8 +175,8 @@
           </div>
           <div class="card-footer">
             <p><small class="text-body-secondary dark-grey-text text-muted 
word-wrap">
-              <i>{{ partner.statement }}</i>
-            </small></p>
+                <i>{{ partner.statement }}</i>
+              </small></p>
           </div>
         </div>
       </div>

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