include settings in kibana, fix url tracking

This commit is contained in:
Spencer Alger 2015-06-25 10:40:47 -07:00
parent 2181f32a3b
commit b1e0344099
4 changed files with 6 additions and 4 deletions

View file

@ -11,7 +11,6 @@ define(function (require) {
require('components/typeahead/typeahead');
require('components/clipboard/clipboard');
require('plugins/kibana/dashboard/directives/grid');
require('plugins/kibana/dashboard/components/panel/panel');
require('plugins/kibana/dashboard/services/saved_dashboards');

View file

@ -2,6 +2,7 @@ define(function (require) {
require('plugins/kibana/discover/index');
require('plugins/kibana/visualize/index');
require('plugins/kibana/dashboard/index');
require('plugins/kibana/settings/index');
require('plugins/kibana/doc/index');
require('chrome')

View file

@ -2,7 +2,7 @@
<div class="kbn-settings-about container" ng-controller="settingsAbout">
<div class="col-md-4 col-md-offset-4 jumbotron">
<center>
<img src='plugins/kibana/settings/sections/about/barcode.svg' alt="Kibana Barcode Logo" width="128" height="128"><br>
<img src='/plugins/kibana/settings/sections/about/barcode.svg' alt="Kibana Barcode Logo" width="128" height="128"><br>
<h1>Kibana</h1>
<p>
<table class="table table-condensed kbn-settings-about-versions">
@ -27,4 +27,4 @@
</center>
</div>
</div>
</kbn-settings-app>
</kbn-settings-app>

View file

@ -96,9 +96,11 @@ define(function (require) {
chrome.embedded = Boolean($location.search().embed);
// listen for route changes, propogate to tabs
var onRouteChange = _.bindKey(tabs, 'trackPathUpdate');
$rootScope.$on('$routeChangeSuccess', onRouteChange);
$rootScope.$on('$routeUpdate', onRouteChange);
function onRouteChange() {
tabs.trackPathUpdate($location.path(), chrome.embedded);
}
// chrome is responsible for timepicker ui and state transfer...
$scope.timefilter = timefilter;