Skip to content

Commit

Permalink
Merge pull request #6200 from rashidkpc/fix/status_page_buttons
Browse files Browse the repository at this point in the history
Fix status page icons
  • Loading branch information
panda01 committed Feb 11, 2016
2 parents 0a5a7f0 + 981ac4e commit e3530ad
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/ui/public/chrome/api/angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = function (chrome, internals) {
.value('buildNum', internals.buildNum)
.value('buildSha', internals.buildSha)
.value('sessionId', Date.now())
.value('chrome', chrome)
.value('esUrl', (function () {
var a = document.createElement('a');
a.href = chrome.addBasePath('/elasticsearch');
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/chrome/chrome.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import $ from 'jquery';
import 'ui/timefilter';
import 'ui/private';
import 'ui/promises';
import 'ui/directives/kbnSrc';

var chrome = {};
var internals = _.defaults(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ng-href="{{ link.active ? link.url : (link.lastSubUrl || link.url) }}"
data-test-subj="appLink">

<div ng-if="link.icon" class="app-icon"><img ng-src="{{'../' + link.icon}}"></div>
<div ng-if="link.icon" class="app-icon"><img kbn-src="{{'/' + link.icon}}"></div>
<div ng-if="!link.icon" class="app-icon-missing">{{ link.title[0] }}</div>

<div class="app-title">{{ link.title }}</div>
Expand Down
3 changes: 1 addition & 2 deletions src/ui/public/directives/kbnHref.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import UiModules from 'ui/modules';
import chrome from 'ui/chrome';
import { words, camelCase, kebabCase } from 'lodash';

export function kbnUrlDirective(name) {
Expand All @@ -8,7 +7,7 @@ export function kbnUrlDirective(name) {

UiModules
.get('kibana')
.directive(name, function (Private) {
.directive(name, function (Private, chrome) {
return {
restrict: 'A',
link: function ($scope, $el, $attr) {
Expand Down

0 comments on commit e3530ad

Please sign in to comment.