@openeuropa/bcl-theme-default 0.21.0 → 0.22.0

package/templates/bcl-project/project.html.twig

@@ -5,96 +5,79 @@
 {% endblock %}
 
 {% block content %}
-
-  {% if project_status.main_title is not empty %}
-    <h3
-      class="fw-bold mb-4"
-      {% if project_status.main_title_id is not empty %}
-      id="{{ project_status.main_title_id }}"
-      {% endif %}
-    >{{- project_status.main_title -}}</h3>
+  {% if project_status_title is not empty %}
+    {% set _project_title_attributes = create_attribute().addClass(['fw-bold', 'mb-4']) %}
+    {% if project_status_id is not empty %}
+      {% set _project_title_attributes = _project_title_attributes.setAttribute('id', project_status_id) %}
+    {% endif %}
+    {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+      title: project_status_title,
+      title_tag: 'h3',
+      attributes: _project_title_attributes,
+    } only %}
   {% endif %}
-  {% include '@oe-bcl/bcl-project-status/project-status.html.twig' with project_status %}
-
-  {% if status_lists.main_title is not empty %}
-    <h3
-      class="fw-bold my-4"
-      {% if status_lists.main_title_id is not empty %}
-      id="{{ status_lists.main_title_id }}"
-      {% endif %}
-    >{{- status_lists.main_title -}}</h3>
+  {% if project_status is not empty %}
+    {% include '@oe-bcl/bcl-project-status/project-status.html.twig' with project_status %}
   {% endif %}
-  {% if status_lists.listing is defined and status_lists.listing is not empty %}
-    {% for lists in status_lists.listing %}
-      {% if lists.title is not empty %}
-      <h4 class="fw-bold mb-3">{{ lists.title }}</h4>
-      {% endif %}
-      {% for list in lists.content %}
-        {% include '@oe-bcl/bcl-description-list/description-list.html.twig' with list only %}
-      {% endfor %}
-    {% endfor %}
+  {% if project_contributions is not empty %}
+    {% include '@oe-bcl/bcl-project-status/project-contributions.html.twig' with project_contributions %}
   {% endif %}
 
-  {% if first_paragraphs is defined and first_paragraphs is not empty %}
-    {% for paragraph in first_paragraphs %}
-        <h3
-          class="fw-bold mb-4 pt-3"
-          id="{{ paragraph.title_id }}"
-        >
-          {{- paragraph.title -}}
-        </h3>
+  {% if status_lists is not empty %}
+    {% include '@oe-bcl/bcl-project/project-lists.html.twig' with status_lists only %}
+  {% endif %}
 
-      {{- paragraph.content -}}
+  {% if first_paragraphs is defined and first_paragraphs is not empty %}
+    {% for _paragraph in first_paragraphs %}
+      {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+        title: _paragraph.title,
+        title_tag: 'h3',
+        attributes: create_attribute().addClass(['fw-bold', 'mb-4', 'pt-3'])
+                                      .setAttribute('id', _paragraph.title_id),
+      } only %}
+      {{- _paragraph.content -}}
     {% endfor %}
   {% endif %}
 
-  {% if content_lists.main_title is not empty %}
-    <h3
-      class="fw-bold my-4"
-      {% if content_lists.main_title_id is not empty %}
-      id="{{ content_lists.main_title_id }}"
-      {% endif %}
-    >{{- content_lists.main_title -}}</h3>
+  {% if featured_lists is not empty %}
+    {% include '@oe-bcl/bcl-project/project-lists.html.twig' with featured_lists only %}
   {% endif %}
-  {% if content_lists.listing is defined and content_lists.listing is not empty %}
-    {% for lists in content_lists.listing %}
-      {% if lists.title is not empty %}
-      <h4 class="fw-bold mb-3">{{ lists.title }}</h4>
-      {% endif %}
-      {% for list in lists.content %}
-        {% include '@oe-bcl/bcl-description-list/description-list.html.twig' with list only %}
-      {% endfor %}
-    {% endfor %}
+
+  {% if content_lists is not empty %}
+    {% include '@oe-bcl/bcl-project/project-lists.html.twig' with content_lists only %}
   {% endif %}
 
   {% if second_paragraphs is defined and second_paragraphs is not empty %}
-    {% for paragraph in second_paragraphs %}
-      <h3
-        class="fw-bold mb-4 pt-2"
-        id="{{ paragraph.title_id }}"
-      >
-        {{- paragraph.title -}}
-      </h3>
-      {{- paragraph.content -}}
+    {% for _paragraph in second_paragraphs %}
+      {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+        title: _paragraph.title,
+        title_tag: 'h3',
+        attributes: create_attribute().addClass(['fw-bold', 'mb-4', 'pt-3'])
+                                      .setAttribute('id', _paragraph.title_id),
+      } only %}
+      {{- _paragraph.content -}}
     {% endfor %}
   {% endif %}
 
   {% if gallery.main_title is not empty %}
-    <h3
-      class="fw-bold my-4"
-      {% if gallery.main_title_id is not empty %}
-      id="{{ gallery.main_title_id }}"
-      {% endif %}
-    >{{- gallery.main_title -}}</h3>
+    {% set _gallery_title_attributes = create_attribute().addClass(['fw-bold', 'my-4']) %}
+    {% if gallery.main_title_id is not empty %}
+      {% set _gallery_title_attributes = _gallery_title_attributes.setAttribute('id', gallery.main_title_id) %}
+    {% endif %}
+    {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+      title: gallery.main_title,
+      title_tag: 'h3',
+      attributes: _gallery_title_attributes,
+    } only %}
   {% endif %}
-  {% if gallery.listing is defined and gallery.listing is not empty %}
+  {% if gallery.items is defined and gallery.items is not empty %}
   <div class="mt-3">
-    {% for showcase in gallery.listing %}
+    {% for _showcase in gallery.items %}
       <div class="mb-2-5 pb-4">
-      {% if showcase.carousel %}
-        {% include '@oe-bcl/bcl-carousel/carousel.html.twig' with showcase only %}
+      {% if _showcase.carousel %}
+        {% include '@oe-bcl/bcl-carousel/carousel.html.twig' with _showcase only %}
       {% else %}
-        {% include '@oe-bcl/bcl-featured-media/featured-media.html.twig' with showcase only %}
+        {% include '@oe-bcl/bcl-featured-media/featured-media.html.twig' with _showcase only %}
       {% endif %}
       </div>
     {% endfor %}

package/templates/bcl-project-status/project-contributions.html.twig

@@ -0,0 +1,56 @@
+{% spaceless %}
+
+{# Parameters:
+  - corporate_contributions (string) (default: '') // value every 5 percent
+  - legend (boolean or object (default: false)
+  - chart (boolean) (default: false)
+
+  Blocks - 
+    project_status_contrib_chart
+    project_status_contrib_legend
+#}
+
+{% set _corporate_contributions = corporate_contributions|default('') %}
+{% set _legend = legend|default(false) %}
+{% set _chart = chart|default(false) %}
+
+{% if attributes is empty %}
+  {% set attributes = create_attribute() %}
+{% endif %}
+
+{% set attributes = attributes.addClass([
+  'bcl-project-contributions',
+  'border-bottom',
+  'pb-4',
+  'mb-4'
+]) %}
+
+<div {{ attributes }}>
+  <div class="row">
+
+  {% if _chart is not empty %}
+    <div class="bcl-project-contributions-chart col-5 col-md-3">
+    {% block project_status_contrib_chart %}
+      <div class="circular-progress" data-percentage="{{ _corporate_contributions }}">
+        <span class="circular-progress-left">
+          <span class="circular-progress-bar"></span>
+        </span>
+        <span class="circular-progress-right">
+          <span class="circular-progress-bar"></span>
+        </span>
+      </div>
+    {% endblock %}
+    </div>
+  {% endif %}
+
+  {% if _legend is not empty %}
+    <div class="bcl-project-contributions-legend col-7 col-md-9 align-self-center">
+    {% block project_status_contrib_legend %}
+      {% include '@oe-bcl/bcl-description-list/description-list.html.twig' with _legend only %}
+    {% endblock %}
+    </div>
+  {% endif %}
+  </div> 
+</div>
+
+{% endspaceless %}

package/templates/bcl-project-status/project-status.html.twig

@@ -1,9 +1,6 @@
 {% spaceless %}
 
 {# Parameters:
-  - title_id (string) (default: "")
-  - title (string) (default: "")
-  - title_tag (string) (default: "h3")
   - status (string) (default: 'planned')
   - start_date (string) (default: '')
   - start_label (string) (default: '')
@@ -12,16 +9,9 @@
   - label (string) (default: '')
   - badge (string) (default: ''),
   - progress (string) (default: '')
-  - corporate_contribution (string) (default: '') // value every 5 percent
-  - chart_legend (object) (default: {})
-
-    Blocks - chart
 #}
 
-{% set _title_id = title_id|default('') %}
-{% set _title = title|default('') %}
 {% set _label = label|default('') %}
-{% set _title_tag = title_tag|default('h3') %}
 {% set _status = status|default('planned') %}
 {% set _charts = charts|default('') %}
 {% set _badge = badge|default('') %}
@@ -30,8 +20,17 @@
 {% set _start_label = start_label|default('') %}
 {% set _end_label = end_label|default('') %}
 {% set _progress = progress|default('') %}
-{% set _corporate_contribution = corporate_contribution|default('') %}
-{% set _chart_legend = chart_legend|default({}) %}
+
+{% if attributes is empty %}
+  {% set attributes = create_attribute() %}
+{% endif %}
+
+{% set attributes = attributes.addClass([
+  'bcl-project-status',
+  'border-bottom',
+  'pb-4',
+  'mb-4'
+]) %}
 
 {% set _bgs = {
     ongoing: 'info',
@@ -40,17 +39,7 @@
   } %}
 {% set _bg = _bgs[_status]|default('secondary') %}
 
-
-<{{ _title_tag }}
-  class="fw-bold mb-4"
-  {% if title_id is not empty %}
-    id="{{ title_id }}"
-  {% endif %}
->
-  {{- title -}}
-</{{ _title_tag }}>
-
-<div class="border-bottom pb-4 mb-4">
+<div {{ attributes }}>
   <div class="row">
     <div class="col-12 col-md-3">
     {% if _label is not empty %}
@@ -103,26 +92,7 @@
     </div>
   </div>
 </div>
-{% if _corporate_contribution is not empty and _chart_legend is not empty %}
-<div class="border-bottom pb-4 mb-4">
-  {% block chart %}
-  <div class="row">
-    <div class="col-5 col-md-3">
-      <div class="circular-progress" data-percentage="{{ _corporate_contribution }}">
-        <span class="circular-progress-left">
-          <span class="circular-progress-bar"></span>
-        </span>
-        <span class="circular-progress-right">
-          <span class="circular-progress-bar"></span>
-        </span>
-      </div>
-    </div>
-    <div class="col-7 col-md-9 align-self-center">
-      {% include '@oe-bcl/bcl-description-list/description-list.html.twig' with _chart_legend only %}
-    </div>
-  </div>
-  {% endblock %} 
-</div>
-{% endif %} 
+
+
 
 {% endspaceless %}

package/templates/bcl-timeline/timeline.html.twig

@@ -10,6 +10,7 @@ Parameters:
     - "to": (integer) (default: items.length) Item index after which to resume displaying timeline items
   - title: (string) (default: "")
   - title_tag: (string) (default: "h2")
+  - title_attributes (drupal attrs)
   - "items" (array) (default: []):
     - "id": (string) (default: '')
     - "label": (string) (default: '')
@@ -23,6 +24,7 @@ Parameters:
 {% set _id = id|default(random(1000)) %}
 {% set _title = title|default('') %}
 {% set _title_tag = title_tag|default('h2') %}
+{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _items = items|default([]) %}
 {% set _icon_path = icon_path|default('') %}
 {% set _toggle_collapsed = toggle_collapsed|default('') %}
@@ -57,10 +59,11 @@ Parameters:
 {% endif %}
 
 {% if _title is not empty %}
-  {% set _title_classes = 'fw-bold mb-4' %}
-  <{{ _title_tag }} class="{{ _title_classes }}">
-    {{- _title -}}
-  </{{ _title_tag }}>
+  {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+    title: _title,
+    title_tag: _title_tag,
+    attributes: _title_attributes,
+  } only %}
 {% endif %}
 
 {# Print the result #}