From ebf4abec218408c6ffb4cbc9a8e06805769a2033 Mon Sep 17 00:00:00 2001 From: FredericEspiau Date: Tue, 11 Dec 2018 14:22:34 +0100 Subject: [PATCH] feat(oui-navbar): allow HTML in menu items --- packages/oui-navbar/README.md | 10 +++++----- packages/oui-navbar/src/dropdown/navbar-dropdown.html | 2 +- packages/oui-navbar/src/index.spec.data.json | 8 +++++--- packages/oui-navbar/src/link/navbar-link.html | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/oui-navbar/README.md b/packages/oui-navbar/README.md index 844cb56c..fb60fd6b 100644 --- a/packages/oui-navbar/README.md +++ b/packages/oui-navbar/README.md @@ -53,7 +53,7 @@ links="asideLink.subLinks" limit-to="asideLink.limitTo" header-template="asideLink.headerTemplate" - header-title="{{asideLink.title}}" + header-title="{{asideLink.headerTitle}}" footer-template="asideLink.footerTemplate" footer-title="{{asideLink.footerTitle}}" footer-href="{{asideLink.footerUrl}}" @@ -69,7 +69,7 @@ diff --git a/packages/oui-navbar/src/dropdown/navbar-dropdown.html b/packages/oui-navbar/src/dropdown/navbar-dropdown.html index 8d8279a3..66224be5 100644 --- a/packages/oui-navbar/src/dropdown/navbar-dropdown.html +++ b/packages/oui-navbar/src/dropdown/navbar-dropdown.html @@ -15,6 +15,6 @@ ng-bind="$ctrl.iconBadge"> - +
diff --git a/packages/oui-navbar/src/index.spec.data.json b/packages/oui-navbar/src/index.spec.data.json index 3ab25b49..c55c2ac4 100644 --- a/packages/oui-navbar/src/index.spec.data.json +++ b/packages/oui-navbar/src/index.spec.data.json @@ -41,7 +41,8 @@ { "name": "notifications", "class": "navbar-notification__list", - "title": "Notifications", + "title": "
Your
notifications", + "headerTitle": "Your notifications", "iconClass": "oui-icon oui-icon-info_circle", "iconAnimated": true, "subLinks": [ @@ -84,7 +85,8 @@ }, { "name": "libero", - "title": "Libero", + "title": "
Need
help", + "headerTitle": "Need help", "iconClass": "oui-icon oui-icon-help_circle", "subLinks": [ { @@ -125,7 +127,7 @@ }, { "name": "user", - "title": "User", + "title": "
Hello Username
your account", "iconClass": "oui-icon oui-icon-info_circle", "subLinks": [ { diff --git a/packages/oui-navbar/src/link/navbar-link.html b/packages/oui-navbar/src/link/navbar-link.html index 0d928cb8..684eeb73 100644 --- a/packages/oui-navbar/src/link/navbar-link.html +++ b/packages/oui-navbar/src/link/navbar-link.html @@ -9,7 +9,7 @@ 'oui-navbar-link_tertiary': $ctrl.variant === 'tertiary' }" ng-href="{{::$ctrl.href}}" - ng-bind="::$ctrl.text" + ng-bind-html="::$ctrl.text" ng-click="$ctrl.onClick()">