diff --git a/public/app/core/components/PageHeader/PageHeader.tsx b/public/app/core/components/PageHeader/PageHeader.tsx index 3ab6cac8143..5e736332ec2 100644 --- a/public/app/core/components/PageHeader/PageHeader.tsx +++ b/public/app/core/components/PageHeader/PageHeader.tsx @@ -76,8 +76,8 @@ export default class PageHeader extends React.Component { const breadcrumbsResult = []; for (let i = 0; i < breadcrumbs.length; i++) { const bc = breadcrumbs[i]; - if (bc.uri) { - breadcrumbsResult.push({bc.title}); + if (bc.url) { + breadcrumbsResult.push({bc.title}); } else { breadcrumbsResult.push( / {bc.title}); } diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index aed803efb9a..afb7155bb55 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -14,10 +14,7 @@ export class DashNavCtrl { private $rootScope, private dashboardSrv, private $location, - public playlistSrv, - navModelSrv) { - this.navModel = navModelSrv.getDashboardNav(this.dashboard, this); - + public playlistSrv) { appEvents.on('save-dashboard', this.saveDashboard.bind(this), $scope); if (this.dashboard.meta.isSnapshot) { diff --git a/public/app/features/dashboard/folder_page_loader.ts b/public/app/features/dashboard/folder_page_loader.ts index 570265d8bff..23917aac085 100644 --- a/public/app/features/dashboard/folder_page_loader.ts +++ b/public/app/features/dashboard/folder_page_loader.ts @@ -12,7 +12,7 @@ export class FolderPageLoader { url: '/fsdfds', text: '', breadcrumbs: [ - { title: 'Dashboards', uri: '/dashboards' }, + { title: 'Dashboards', url: '/dashboards' }, { title: ' ' }, ], children: [ diff --git a/public/app/features/plugins/partials/plugin_edit.html b/public/app/features/plugins/partials/plugin_edit.html index 9df2775cbb8..4b4628a3bf7 100644 --- a/public/app/features/plugins/partials/plugin_edit.html +++ b/public/app/features/plugins/partials/plugin_edit.html @@ -1,73 +1,68 @@ - +
+ -
-
- -
- -
- -
-
-
-
- -
-
- - -
- - - +
+
+
+
-
-
- -
+
+
+ - +
+ +
+ +
+ + +
diff --git a/public/app/features/plugins/partials/plugin_list.html b/public/app/features/plugins/partials/plugin_list.html index efe036ec14f..eac4216d818 100644 --- a/public/app/features/plugins/partials/plugin_list.html +++ b/public/app/features/plugins/partials/plugin_list.html @@ -1,42 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/public/app/features/plugins/partials/plugin_page.html b/public/app/features/plugins/partials/plugin_page.html index 9c4c72121f0..44ffeec5cd6 100644 --- a/public/app/features/plugins/partials/plugin_page.html +++ b/public/app/features/plugins/partials/plugin_page.html @@ -1,8 +1,10 @@ - +
+ -
-
- - -
+
+
+ + +
+
diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index 9daefdcbcf4..0169dc7772e 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -11,8 +11,7 @@ export class PluginEditCtrl { includes: any; readmeHtml: any; includedDatasources: any; - tabIndex: number; - tabs: any; + tab: string; navModel: any; hasDashboards: any; preUpdateHook: () => any; @@ -24,24 +23,76 @@ export class PluginEditCtrl { private $rootScope, private backendSrv, private $sce, - $routeParams, + private $routeParams, navModelSrv, ) { - this.navModel = navModelSrv.getNav('cfg', 'plugins', 0); - this.model = {}; - this.pluginId = $routeParams.pluginId; - this.tabIndex = 0; - this.tabs = ['Readme']; + this.pluginId = $routeParams.pluginId; this.preUpdateHook = () => Promise.resolve(); this.postUpdateHook = () => Promise.resolve(); + + this.init(); + } + + setNavModel(model) { + let defaultTab = 'readme'; + + this.navModel = { + main: { + img: model.info.logos.large, + subTitle: model.info.description, + url: '', + text: '', + breadcrumbs: [ + { title: 'Plugins', url: '/plugins' }, + { title: model.name }, + ], + children: [ + { + icon: 'fa fa-fw fa-file-text-o', + id: 'readme', + text: 'Readme', + url: `plugins/${this.model.id}/edit?tab=readme` + } + ] + } + }; + + if (model.type === 'app') { + this.navModel.main.children.push({ + icon: 'fa fa-fw fa-th-large', + id: 'config', + text: 'Config', + url: `plugins/${this.model.id}/edit?tab=config` + }); + + let hasDashboards = _.find(model.includes, {type: 'dashboard'}); + + if (hasDashboards) { + this.navModel.main.children.push({ + icon: 'gicon gicon-dashboard', + id: 'dashboards', + text: 'Dashboards', + url: `plugins/${this.model.id}/edit?tab=dashboards` + }); + } + + defaultTab = 'config'; + } + + this.tab = this.$routeParams.tab || defaultTab; + + for (let tab of this.navModel.main.children) { + if (tab.id === this.tab) { + tab.active = true; + } + } } init() { return this.backendSrv.get(`/api/plugins/${this.pluginId}/settings`).then(result => { this.model = result; this.pluginIcon = this.getPluginIcon(this.model.type); - this.navModel.breadcrumbs.push({text: this.model.name}); this.model.dependencies.plugins.forEach(plug => { plug.icon = this.getPluginIcon(plug.type); @@ -52,16 +103,7 @@ export class PluginEditCtrl { return plug; }); - if (this.model.type === 'app') { - this.hasDashboards = _.find(result.includes, {type: 'dashboard'}); - if (this.hasDashboards) { - this.tabs.unshift('Dashboards'); - } - - this.tabs.unshift('Config'); - this.tabIndex = 0; - } - + this.setNavModel(this.model); return this.initReadme(); }); } diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index e3c01892a2b..d583355564c 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; @@ -35,8 +33,20 @@ export class AppPageCtrl { return; } - this.navModel = this.navModelSrv.getNav('plugin-page-' + app.id); - this.navModel.breadcrumbs.push({text: this.page.name}); + let pluginNav = this.navModelSrv.getNav('plugin-page-' + app.id); + + this.navModel = { + main: { + img: app.info.logos.large, + subTitle: app.name, + url: '', + text: '', + breadcrumbs: [ + { title: app.name, url: pluginNav.main.url }, + { title: this.page.name }, + ], + } + }; } loadPluginInfo() {