Merge branch 'external-plugins'

This commit is contained in:
Torkel Ödegaard
2015-12-15 10:10:48 +01:00
85 changed files with 1123 additions and 143 deletions

View File

@@ -15,19 +15,13 @@ function (angular, _, $, coreModule, config) {
};
$scope.setupMainNav = function() {
$scope.mainLinks.push({
text: "Dashboards",
icon: "fa fa-fw fa-th-large",
href: $scope.getUrl("/"),
});
if (contextSrv.hasRole('Admin')) {
_.each(config.bootData.mainNavLinks, function(item) {
$scope.mainLinks.push({
text: "Data Sources",
icon: "fa fa-fw fa-database",
href: $scope.getUrl("/datasources"),
text: item.text,
icon: item.icon,
href: $scope.getUrl(item.href)
});
}
});
};
$scope.loadOrgs = function() {