Merge branch 'dev' into 'master'

Dev

See merge request web-team/drupal/public/d8/modules/cern-toolbar!14

CHANGELOG.md

@@ -4,12 +4,11 @@ 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.1.1] - 22-02-2019
+## [2.1.2] - 10-05-2019
+- Fixed issue with deprecated link l() function
 
-### Fixed 
-- Issue of toolbar admin menu crashing
+## [2.1.1] - 22-02-2019
+- Fixed issue of toolbar admin menu crashing
 
 ## [2.1.0] - 07-12-2018
-
-### Changed
-- File structure
\ No newline at end of file
+- Changed file structure

assets/css/screen.css

@@ -7,7 +7,7 @@
 	font-size: 14px;
 	line-height: 1;
 	padding: 0 5%;
-	height: 40px;
+	height: 43px;
 	/**/
 	position: fixed;
 	top: 0;

cern_toolbar.info.yml

@@ -3,6 +3,6 @@ type: module
 description: "Provides CERN Toolbar. The CERN Toolbar is obligatory for all CERN Drupal websites so make sure that the checkbox on the left is ticked."
 core: 8.x
 package: CERN Basic Elements
-version: 2.1.1
+version: 2.1.2
 dependencies:
-  - locale
\ No newline at end of file
+  - locale

cern_toolbar.module

@@ -6,6 +6,8 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_help().
@@ -17,7 +19,7 @@ function cern_toolbar_help($route_name, RouteMatchInterface $route_match) {
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('This module enables the CERN toolbar on the top of the site.') . '</p>';
-      $output .= '<p>' . t('This module is not configurable: find more information about the CERN Toolbar at') . ' ' . l('http://ux.web.cern.ch/assets/cern-toolbar', 'http://ux.web.cern.ch/assets/cern-toolbar') . '</p>';
+      //$output .= '<p>' . t('This module is not configurable: find more information about the CERN Toolbar at') . ' ' . Link::fromTextAndUrl('http://ux.web.cern.ch/assets/cern-toolbar', Url::fromUri('http://ux.web.cern.ch/assets/cern-toolbar'))->toString() . '</p>';
       return $output;
 
     default:
@@ -33,8 +35,8 @@ function cern_toolbar_theme() {
       'render element' => 'element',
       'variables' => [
         'toolbar_links' => NULL,
-        'directory_link' => NULL, 
-        'logged_in' => NULL, 
+        'directory_link' => NULL,
+        'logged_in' => NULL,
         'attributes' => []
       ],
     ],