HF: Feedback HK 2

1 files changed, 68 insertions, 65 deletions

diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index bdbe7bc1..edd68b6b 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -17,9 +17,49 @@
     };
   </script>
   #}
- 
+
   <div class="container consortium dark-grey-text">
 
+
+    <div class="row">
+      <h4 class="font-weight-bold pb-2 mb-4">{{ _("Project")}}</h4>
+      <div class="col col-md-auto"></div>
+
+      <div class="col-md-11 col-md-4 mb-4">
+        <p class="w-responsive mx-auto mb-3">
+          {% trans %}
+          The TALER project is an initiative of Horizon Europe (Pilots for the Next Generation Internet)
+          with the aim of bringing GNU Taler to market across Europe.
+          <br>
+          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.
+          {% endtrans %}
+        </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">
+              <div class="accordion-body text-muted w-responsive">
+                {{ objective.text }}
+              </div>
+            </div>
+          </div>
+          {% endfor %}
+        </div>
+      </div>
+      <div class="col col-md-auto"></div>
+    </div>
+
+
     <div class="row">
       <div class="col-md-6 mb-6">
         <h4 class="font-weight-bold pb-2 mb-4">{{ _("Events")}}</h4>
@@ -39,27 +79,28 @@
 
               <div {% if loop.first %} class="carousel-item active" {% else %} class="carousel-item" {% endif %}
                 data-bs-interval="5000">
-                 <h5 class="summary">{{ item['titel'] }}</h5>
+                <h5 class="summary">{{ item['titel'] }}</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"> To be held on 
+                <p class="fas fa-calendar-alt"> To be held on
                   <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>
+                <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>
+                <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['titel'] }}"><span class="dark-grey-text"> Contact</span></a></p>
+                <p class="fas fa-envelope"> <a href="mailto:{{ item['email'] }}?subject={{ item['titel'] }}"><span
+                      class="dark-grey-text"> Contact</span></a></p>
                 {% endif %}
 
               </div>
@@ -73,72 +114,34 @@
       <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">
+        <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 %}
+            {% 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 class="col cold-md-auto"></div>
       </div>
 
-
-      <div class="row">
-        <h4 class="font-weight-bold pb-2 mb-4">{{ _("Project")}}</h4>
-        <div class="col col-md-auto"></div>
-
-        <div class="col-md-11">
-          <p class="text-muted w-responsive mx-auto mb-3">
-            {% trans %}
-            The TALER project is an initiative of Horizon Europe (Pilots for the Next Generation Internet)
-            with the aim of bringing GNU Taler to market across Europe.
-            <br>
-            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.
-            {% endtrans %}
-          </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">
-                <div class="accordion-body text-muted w-responsive">
-                  {{ objective.text }}
-                </div>
-              </div>
-            </div>
-            {% endfor %}
-          </div>
-        </div>
-        <div class="col col-md-auto"></div>
-      </div>
-
       <div class="row">
         <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4>
       </div>
@@ -147,13 +150,13 @@
         <div class="col col-md-auto"></div>
 
         <div class="col-md-11">
-          <p class="text-muted w-responsive mx-auto mb-3">
+          <p class="w-responsive mx-auto mb-3">
             {% trans %}
             The TALER consortium consists of 11 partners from 8 European countries (the Netherlands,
             Belgium, France, Germany, Greece, Hungary, Luxembourg and Switzerland).
             {% endtrans %}
           </p>
-          <p class="text-muted w-responsive mx-auto mb-3">
+          <p class="w-responsive mx-auto mb-3">
             {% trans %}
             The consortium is diverse in terms of types of institutions, including research (TUE) and
             applied science universities (BFH), small for-profit (CBG, TSYS, VV) and non-profit (PS) companies,
@@ -195,4 +198,4 @@
 
   </div>
 </main>
-{% endblock body_content %}
+{% endblock body_content %}
\ No newline at end of file