diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b45464fa64cb9d84700322e6909f66353a883cf..da277cc734f8c49a4a936522af08c09fa7131944 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ - Changelog +#Changelog All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [2.4.0] - 24-04-2019 + +- Added support for 3rd+ level menu +- Fixed issue with dual titles in page view +- Removed JS code related to Accordion component + ## [2.3.1] - 20-03-2019 - Fixed hovering menu when scrolling diff --git a/cernbase.info.yml b/cernbase.info.yml index f5f93be77b2da05d2405fecae682fcca1cdef82c..7bc6f749cc2d4eae9c8c965b25d1a08251d912ea 100755 --- a/cernbase.info.yml +++ b/cernbase.info.yml @@ -2,7 +2,7 @@ name: CERN BASE type: theme description: "CERN BASE theme" core: 8.x -version: 2.3.1 +version: 2.4.0 base theme: bootstrap hidden: true diff --git a/cernbase.theme b/cernbase.theme index b0758de156a88a628056dd386ccc28c12e181eb4..463e71450c410bcdb07cb0c63171c913ca73c5f8 100755 --- a/cernbase.theme +++ b/cernbase.theme @@ -44,7 +44,7 @@ function cernbase_preprocess_html(&$variables) { */ function cernbase_preprocess_page(&$variables) { // Check if a node exists - if ($object = \Drupal::routeMatch()->getParameter('node')) { + if ($object = \Drupal::routeMatch()->getParameter('node')) { // if $node is object (for nodes) if ($object instanceof \Drupal\node\NodeInterface) { $variables['cern_node_type'] = \Drupal::routeMatch()->getParameter('node')->getType(); @@ -52,7 +52,19 @@ function cernbase_preprocess_page(&$variables) { } else if (is_string($object)) { $variables['cern_node_type'] = node_load($object)->getType(); } - } + } + + $view_id = \Drupal::routeMatch()->getParameter('view_id'); + //if the page is a view and renders the page title + if ( $view_id && $variables['page']['content']['cernclean_page_title']){ + $view = \Drupal\views\Views::getView($view_id); + if( !empty($view->getTitle())){ + unset($variables['page']['content']['cernclean_page_title']); + } + + } + + } /** diff --git a/js/cernbase.js b/js/cernbase.js index 0e23f0f94363a5c21666f78aeca31dc1fdf0cb3f..a8ca37bcc4af5d8a3da97ce5a009f3216e1e13ca 100755 --- a/js/cernbase.js +++ b/js/cernbase.js @@ -229,27 +229,6 @@ jQuery(this).parent().addClass('loading-cds-error'); }); - - // accordion open trail - if (jQuery('.accordion-cern').length > 0) { - jQuery('.accordion-cern').each(function () { - jQuery(this).find('.panel-collapse.collapse.in').parent('.panel').find('.panel-heading a').toggleClass('is-open'); - - jQuery(this).find('.panel-heading a').click(function () { - jQuery('.accordion-cern').find('.panel-heading a').removeClass('is-open'); - jQuery(this).addClass('is-open'); - }) - }); - jQuery('.accordion-cern .panel-heading a').click(function () { - - if (jQuery(this).closest('.panel').find('.panel-collapse').hasClass('in')) { - jQuery(this).removeClass('is-open'); - } - - }); - - } - // ckeditor cern icon if (jQuery('.cern_full_html').length > 0) { jQuery('.cern_full_html span').each(function () { diff --git a/templates/menu/menu--main.html.twig b/templates/menu/menu--main.html.twig index 64e96d466cd8813f03ae3e8c51fe320e626b13ff..fe5adba86cf1bcc529541609a48bf0d9be52d6e1 100644 --- a/templates/menu/menu--main.html.twig +++ b/templates/menu/menu--main.html.twig @@ -61,6 +61,11 @@ {% endset %} {{ link(title, item.url, item.attributes.addClass('dropdown-toggle').removeClass('dropdown')) }} + {% if menu_level != 0 %} + <font face="CERNIcons, CernIcons, cern-icons"> + b + </font> + {% endif %} {% else %} <li{{ item.attributes }}> {{ link(item.title, item.url) }}