@openeuropa/bcl-base-templates 0.22.0 → 0.23.0

package/content-type.html.twig

@@ -116,6 +116,9 @@
       {% block related %}
         {{ related }}
       {% endblock %}
+      {% block share %}
+        {{ share }}
+      {% endblock %}
     </div>
   </div>
 </main>
@@ -123,9 +126,6 @@
 {% block feedback %}
   {{ feedback }}
 {% endblock %}
-{% block share %}
-  {{ share }}
-{% endblock %}
 
 {% if _with_footer %}
   {% include '@oe-bcl/bcl-footer/footer.html.twig' with footer only %}

package/data/content-page.js

@@ -1,6 +1,7 @@
 import banner from "@openeuropa/bcl-content-banner/data/data";
 import pageBanner from "@openeuropa/bcl-banner/data/data--image";
 import simpleBanner from "@openeuropa/bcl-content-banner/data/data--simple";
+import pageTitleBanner from "@openeuropa/bcl-content-banner/data/data--page-title";
 import fileThumbnail from "@openeuropa/bcl-file/data/data--card";
 import file from "@openeuropa/bcl-file/data/data";
 import blockquote from "@openeuropa/bcl-data-blockquote/data";
@@ -8,6 +9,7 @@ import featuredItem from "@openeuropa/bcl-featured-media/data/data--featured-ite
 import accordion from "@openeuropa/bcl-data-accordion/data";
 import timeline from "@openeuropa/bcl-timeline/data";
 import sidebar from "@openeuropa/bcl-inpage-navigation/data/data--simple";
+import share from "@openeuropa/bcl-links-block/data/data--share";
 
 export {
   banner,
@@ -20,4 +22,6 @@ export {
   pageBanner,
   simpleBanner,
   sidebar,
+  pageTitleBanner,
+  share,
 };

package/data/layout.js

@@ -1,5 +1,19 @@
 import headerSimple from "@openeuropa/bcl-data-header/data--simple";
 import headerNoForm from "@openeuropa/bcl-data-header/data--no-form";
-import footer from "@openeuropa/bcl-data-footer/data";
+import footerData from "@openeuropa/bcl-data-footer/data";
+import header_ucpkn from "@openeuropa/bcl-data-header/data--ucpkn";
+import header_joinup from "@openeuropa/bcl-data-header/data--neutral";
+import drupalAttribute from "drupal-attribute";
 
-export { headerSimple, headerNoForm, footer };
+const footer = {
+  ...footerData,
+  attributes: new drupalAttribute().addClass(["mt-md-4-75", "mt-4"]),
+};
+
+export default {
+  headerSimple,
+  headerNoForm,
+  footer,
+  header_ucpkn,
+  header_joinup,
+};

package/listing-page.html.twig

@@ -1,29 +1,39 @@
 {#
   Parameters:
+  - title: (string) (default: '')
+  - title_tag: (string) (default: 'h2')
+  - title_link: (link object) (default: {})
+  - title_attributes (drupal attrs)
   - listing (object) (default: {})
   - pagination (object) (default: {})
   - sidebar (object) (default: '')
-  - page_title (string) (default: '')
 #}
 
 {% extends "@oe-bcl/bcl-base-templates/content-type.html.twig" %}
 
+{% set _title = title|default('') %}
+{% set _title_tag = title_tag|default('h2') %}
+{% set _title_link = title_link|default({}) %}
+{% set _title_attributes = title_attributes ?: create_attribute() %}
 {% set _listing = listing|default({}) %}
 {% set _pagination = pagination|default({}) %}
 {% set _search = search|default({}) %}
 {% set _sidebar = sidebar|default({}) %}
-{% set _page_title = page_title|default({}) %}
+
+{% set _title_attributes = _title_attributes ?: create_attribute() %}
 
 {% block content_top %}
   {% include '@oe-bcl/bcl-button/button.html.twig' with filter_button only %}
   <div class="row">
     <div class="col-md-6 col-lg-8 align-self-center">
-      <h4 class="mb-0">
-        <span class="text-capitalize">
-          {{- _page_title -}}
-        </span>
-        ({{ listing.items.length }})
-      </h4>
+      {% if _title is not empty %}
+        {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+          title: _title ~ ' (' ~ listing.items.length ~ ')',
+          title_tag: _title_tag,
+          title_link: _title_link,
+          attributes: _title_attributes.addClass(['mb-0', 'text-capitalize']),
+        } only %}
+      {% endif %}
     </div>
     {% if badges is not empty and badges is iterable %}
       <div class="col-md-12 order-md-2 mt-3">
@@ -47,7 +57,7 @@
 
 {% block content %}
   {% if _listing is not empty %}
-    {% include '@oe-bcl/bcl-listing/listing.html.twig' with  _listing %}
+    {% include '@oe-bcl/bcl-listing/listing.html.twig' with  _listing only %}
   {% endif %}
 {% endblock %}
 

package/package.json

@@ -2,21 +2,21 @@
   "name": "@openeuropa/bcl-base-templates",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "OE - BCL base templates",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@openeuropa/bcl-badge": "^0.22.0",
-    "@openeuropa/bcl-button": "^0.22.0",
-    "@openeuropa/bcl-content-banner": "^0.22.0",
-    "@openeuropa/bcl-footer": "^0.22.0",
-    "@openeuropa/bcl-header": "^0.22.0",
-    "@openeuropa/bcl-listing": "^0.22.0",
-    "@openeuropa/bcl-offcanvas": "^0.22.0",
-    "@openeuropa/bcl-pagination": "^0.22.0",
-    "@openeuropa/bcl-select": "^0.22.0"
+    "@openeuropa/bcl-badge": "^0.23.0",
+    "@openeuropa/bcl-button": "^0.23.0",
+    "@openeuropa/bcl-content-banner": "^0.23.0",
+    "@openeuropa/bcl-footer": "^0.23.0",
+    "@openeuropa/bcl-header": "^0.23.0",
+    "@openeuropa/bcl-listing": "^0.23.0",
+    "@openeuropa/bcl-offcanvas": "^0.23.0",
+    "@openeuropa/bcl-pagination": "^0.23.0",
+    "@openeuropa/bcl-select": "^0.23.0"
   },
   "repository": {
     "type": "git",
@@ -32,5 +32,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "57304ad94ae3c234f2f2b904208ce540a7a53f23"
+  "gitHead": "fa2097e14024989cddf6f9cd7a9115bed5886aeb"
 }