Made navigation more prominent and added dedupping of current url to the kiban implementation.

This commit is contained in:
Boaz Leskes 2014-01-22 16:25:06 +01:00
parent d5cf9a6f8e
commit 71588d55c6
3 changed files with 12 additions and 6 deletions

View file

@ -9,8 +9,8 @@
<form name="input" style="margin:3px 0 0 0">
<ul class="nav nav-pills marvel-navigation-dropdown">
<li class="dropdown">
<a class="dropdown-toggle marvel-navigation-dropdown" data-toggle="dropdown" href="" bs-tooltip="'Goto'" data-placement="bottom" ng-click="dismiss();">
<i ng-class="panel.icon"></i>
<a class="dropdown-toggle marvel-navigation-dropdown" data-toggle="dropdown" href="" data-placement="bottom" ng-click="dismiss();">
Marvel Dashboards <i ng-class="panel.icon"></i>
</a>
<ul class="dropdown-menu">

View file

@ -15,8 +15,9 @@ define([
'angular',
'app',
'underscore',
'jquery'
],
function (angular, app, _) {
function (angular, app, _, $) {
'use strict';
var module = angular.module('kibana.panels.marvel.navigation', []);
@ -58,7 +59,7 @@ function (angular, app, _) {
/** @scratch /panels/marvel.navigation/5
* icon:: A font-awesome icon to use for this list of links
*/
icon: "icon-globe",
icon: "icon-caret-down",
};
_.defaults($scope.panel,_d);
@ -71,7 +72,12 @@ function (angular, app, _) {
if($scope.panel.source === 'url') {
$http.get($scope.panel.url).then(function(response) {
console.log(response);
$scope.links = response.data.links;
var a = $('<a />');
$scope.links = _.filter(response.data.links, function (link) {
a.attr("href", link.url);
return a[0].href != window.location.href;
});
});
}
};

View file

@ -22,7 +22,7 @@
<ul class="nav pull-right">
<li id="nav_btn" class="dropdown">
<a href="#" title="Goto" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-globe"></i>
Marvel Dashboards <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
</ul>