[taler-www] branch master updated: Deprecated link in navbar to consortium page, deprecated deliverables box, moved event box downwards

[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 c41e865  Deprecated link in navbar to consortium page, deprecated 
deliverables box, moved event box downwards
c41e865 is described below

commit c41e8650f1e1a41082390365e1c4b1184cbebc95
Author: Stefan Kügel <skuegel@web.de>
AuthorDate: Thu Nov 30 10:10:38 2023 +0100

    Deprecated link in navbar to consortium page, deprecated deliverables box, 
moved event box downwards
---
 common/navigation.j2.inc    |   4 +-
 properties.d/partners.yml   |   2 +-
 template/consortium.html.j2 | 100 ++++++++++++++++++++++----------------------
 3 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 99ea2a6..cf94010 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -31,8 +31,8 @@
           {{ navlink('principles.html', _('Principles')) }}
           {{ navlink('docs.html', _('Docs')) }}
           {{ navlink('development.html', _('Development')) }}
-          {{ navlink('consortium.html', _('Consortium')) }}
-          <!-- {{ navlink('comingsoon.html', _('Coming soon')) }} -->
+          {# {{ navlink('consortium.html', _('Consortium')) }}
+          {{ 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 #}
           {# <li class="nav-item mx-2">
diff --git a/properties.d/partners.yml b/properties.d/partners.yml
index 1d2f0ba..74be907 100644
--- a/properties.d/partners.yml
+++ b/properties.d/partners.yml
@@ -28,7 +28,7 @@ partners:
     self-determination."
   - id: GLS
     name: "GLS Bank"
-    contact: "-- TBD --"
+    contact: "Leo Wittmann"
     logo: images/logo-GlsBank.svg
     url: https://www.gls.de
     role: "-- TBD --"
diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index 97c691a..5fb1600 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -61,56 +61,8 @@
 
 
     <div class="row">
-      <div class="col-md-6 mb-6">
-        <h4 class="font-weight-bold pb-2 mb-4">{{ _("Events")}}</h4>
-        <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"> <img src="{{ url( 
item['url_img']|default('images/logo-2021.svg', true) ) }}"
-                    alt="">
-                </div>
-                <p class="description testimonial">
-                  {{ 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>
-              {% endfor %}
-            </div>
-          </div>
-        </div>
-      </div>
-
       <div class="col-md-1 mb-1"></div>
+      {# DEPRECATED 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>
@@ -141,6 +93,7 @@
         {% endif %}
         <div class="col cold-md-auto"></div>
       </div>
+      #}
 
       <div class="row">
         <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4>
@@ -193,6 +146,55 @@
         </div>
 
         {% endfor %}
+      </div>
+      
+            <div class="col-md-6 mb-6">
+        <h4 class="font-weight-bold pb-2 mb-4">{{ _("Events")}}</h4>
+        <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"> <img src="{{ url( 
item['url_img']|default('images/logo-2021.svg', true) ) }}"
+                    alt="">
+                </div>
+                <p class="description testimonial">
+                  {{ 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>
+              {% endfor %}
+            </div>
+          </div>
+        </div>
       </div>
     </div>
 

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