UC: Semantic clean-up -- feedback 9, 10, 12 from hk; WIP

1 files changed, 57 insertions, 80 deletions

diff --git a/template/consortium.html.j2 b/template/consortium.html.j2
index d2330d06..084acb13 100644
--- a/template/consortium.html.j2
+++ b/template/consortium.html.j2
@@ -1,41 +1,21 @@
 {% extends "common/consortium.j2" %}
 {% block body_content %}
-<main id="maincontent">
-
-  {#
-  <script>
-    window.onload = function () {
-      var span = document.createElement('span');
-
-      span.className = 'fas';
-      span.style.display = 'none';
-      document.body.insertBefore(span, document.body.firstChild);
-
-      alert(window.getComputedStyle(span, null).getPropertyValue('font-family'));
-
-      document.body.removeChild(span);
-    };
-  </script>
-  #}
-
-  <div class="container consortium dark-grey-text">
-
+<main id="maincontent" class="container consortium dark-grey-text">
 
+  <article>
     <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">
+      {# <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 TALER project is funded under Horizon Europe (Pilots for the Next Generation Internet)
           with the aim of bringing GNU Taler to market across Europe.
-          <br>
+        </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">
@@ -48,21 +28,24 @@
             </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">
+              <p class="accordion-body text-muted w-responsive">
                 {{ objective.text }}
-              </div>
+              </p>
             </div>
           </div>
           {% endfor %}
         </div>
       </div>
-      <div class="col col-md-auto"></div>
     </div>
+  </article>
+
 
 
+  <article>
     <div class="row">
       <div class="col-md-6 mb-6">
         <h4 class="font-weight-bold pb-2 mb-4">{{ _("Events")}}</h4>
+        <!-- events carousel -->
         <div class="container announce">
           <div id="AnnouncCarousel" class="carousel slide" data-bs-ride="carousel">
             <!-- Carousel indicators -->
@@ -110,12 +93,12 @@
         </div>
       </div>
 
-      <div class="col-md-1 mb-1"></div>
       {# DEPRECATED DELIVERABLES
+      <!-- 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 " >
+        <div class="list-group ">
           {% for item in conf['deliverables'] %}
           {% set ns = namespace(symbol='images/file-cancel.svg') %}
 
@@ -140,64 +123,58 @@
               {% endfor %}
         </div>
         {% endif %}
-        <div class="col cold-md-auto"></div>
       </div>
       #}
+    </div>
+  </article>
 
-      <div class="row">
-        <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4>
-      </div>
-
-      <div class="row mb-4">
-        <div class="col col-md-auto"></div>
-
-        <div class="col-md-11">
-          <p class="w-responsive mx-auto mb-3">
-            
-            The 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 (TUE) and
-            applied science universities (BFH), small for-profit (CBG, TSYS, VV) and non-profit (PS) companies,
-            cooperative banks (GLS, MAG), a foundation (NLnet) and grassroots movements (ESEN, HODI).
-            
-          </p>
+  <article>
+    <div class="row">
+      <h4 class="font-weight-bold pb-2 mb-4">{{ _("Partners")}}</h4>
+    </div>
 
-        </div>
-        <div class="col col-md-auto"></div>
+    <div class="row mb-4">
+      <!-- consortium intro -->
+      <div class="col-md-11 col-md-4 mb-4 px-md-4">
+        <p class="w-responsive mx-auto mb-3">
+          The 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 (TUE) and
+          applied science universities (BFH), small for-profit (CBG, TSYS, VV) and non-profit (PS) companies,
+          cooperative banks (GLS, MAG), a foundation (NLnet) and grassroots movements (ESEN, HODI).
+        </p>
       </div>
+    </div>
 
 
-      <div class="row row-cols-1 row-cols-md-3 g-4 text-center">
-        <!-- start -->
-
-        {% 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="180" 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">
-              <small class="text-body-secondary dark-grey-text text-muted word-wrap"><i> {{ partner.statement }}
-                </i></small>
-            </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="180" 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>
-
-        {% endfor %}
       </div>
+      {% endfor %}
+
     </div>
+  </article>
 
-  </div>
 </main>
-{% endblock body_content %}
+{% endblock body_content %}
\ No newline at end of file