diff --git a/pkg/api/dtos/plugins.go b/pkg/api/dtos/plugins.go
index 88683155006..d03a55861fc 100644
--- a/pkg/api/dtos/plugins.go
+++ b/pkg/api/dtos/plugins.go
@@ -11,7 +11,6 @@ type PluginSetting struct {
Module string `json:"module"`
BaseUrl string `json:"baseUrl"`
Info *plugins.PluginInfo `json:"info"`
- Pages []*plugins.AppPluginPage `json:"pages"`
Includes []*plugins.PluginInclude `json:"includes"`
Dependencies *plugins.PluginDependencies `json:"dependencies"`
JsonData map[string]interface{} `json:"jsonData"`
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 691c50f04f4..b26fb22ea52 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -56,8 +56,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Divider: true})
- dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "New", Url: setting.AppSubUrl + "/dashboard/new"})
- dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Url: setting.AppSubUrl + "/import/dashboard"})
+ dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "New", Icon: "fa fa-plus", Url: setting.AppSubUrl + "/dashboard/new"})
+ dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{Text: "Import", Icon: "fa fa-download", Url: setting.AppSubUrl + "/import/dashboard"})
}
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
@@ -88,22 +88,41 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
for _, plugin := range enabledPlugins.Apps {
if plugin.Pinned {
- pageLink := &dtos.NavLink{
+ appLink := &dtos.NavLink{
Text: plugin.Name,
Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit",
Img: plugin.Info.Logos.Small,
}
- for _, page := range plugin.Pages {
- if !page.SuppressNav {
- pageLink.Children = append(pageLink.Children, &dtos.NavLink{
- Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + page.Slug,
- Text: page.Name,
- })
+ for _, include := range plugin.Includes {
+ if include.Type == "page" && include.AddToNav {
+ link := &dtos.NavLink{
+ Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + include.Slug,
+ Text: include.Name,
+ }
+ if include.DefaultNav {
+ appLink.Url = link.Url
+ }
+ appLink.Children = append(appLink.Children, link)
+ }
+ if include.Type == "dashboard" && include.AddToNav {
+ link := &dtos.NavLink{
+ Url: setting.AppSubUrl + "/dashboard/db/" + include.Slug,
+ Text: include.Name,
+ }
+ if include.DefaultNav {
+ appLink.Url = link.Url
+ }
+ appLink.Children = append(appLink.Children, link)
}
}
- data.MainNavLinks = append(data.MainNavLinks, pageLink)
+ if c.OrgRole == m.ROLE_ADMIN {
+ appLink.Children = append(appLink.Children, &dtos.NavLink{Divider: true})
+ appLink.Children = append(appLink.Children, &dtos.NavLink{Text: "Config", Icon: "fa fa-cog", Url: setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit"})
+ }
+
+ data.MainNavLinks = append(data.MainNavLinks, appLink)
}
}
diff --git a/pkg/api/plugins.go b/pkg/api/plugins.go
index 56d0d99296c..793cf33e3c6 100644
--- a/pkg/api/plugins.go
+++ b/pkg/api/plugins.go
@@ -82,10 +82,6 @@ func GetPluginSettingById(c *middleware.Context) Response {
Module: def.Module,
}
- if app, exists := plugins.Apps[pluginId]; exists {
- dto.Pages = app.Pages
- }
-
query := m.GetPluginSettingByIdQuery{PluginId: pluginId, OrgId: c.OrgId}
if err := bus.Dispatch(&query); err != nil {
if err != m.ErrPluginSettingNotFound {
diff --git a/pkg/plugins/app_plugin.go b/pkg/plugins/app_plugin.go
index 7fc170784f3..ecf59a15e15 100644
--- a/pkg/plugins/app_plugin.go
+++ b/pkg/plugins/app_plugin.go
@@ -8,14 +8,6 @@ import (
"github.com/grafana/grafana/pkg/models"
)
-type AppPluginPage struct {
- Name string `json:"name"`
- Slug string `json:"slug"`
- Component string `json:"component"`
- Role models.RoleType `json:"role"`
- SuppressNav bool `json:"suppressNav"`
-}
-
type AppPluginCss struct {
Light string `json:"light"`
Dark string `json:"dark"`
@@ -23,7 +15,6 @@ type AppPluginCss struct {
type AppPlugin struct {
FrontendPluginBase
- Pages []*AppPluginPage `json:"pages"`
Routes []*AppPluginRoute `json:"routes"`
FoundChildPlugins []*PluginInclude `json:"-"`
@@ -85,7 +76,7 @@ func (app *AppPlugin) initApp() {
}
// slugify pages
- for _, page := range app.Pages {
+ for _, page := range app.Includes {
if page.Slug == "" {
page.Slug = slug.Make(page.Name)
}
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index 8443e91931d..28e092dcd4a 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/grafana/grafana/pkg/log"
+ "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
)
@@ -74,10 +75,16 @@ type PluginDependencies struct {
}
type PluginInclude struct {
- Name string `json:"name"`
- Path string `json:"path"`
- Type string `json:"type"`
- Id string `json:"id"`
+ Name string `json:"name"`
+ Path string `json:"path"`
+ Type string `json:"type"`
+ Component string `json:"component"`
+ Role models.RoleType `json:"role"`
+ AddToNav bool `json:"AddToNav"`
+ DefaultNav bool `json:"defaultNav"`
+ Slug string `json:"slug"`
+
+ Id string `json:"-"`
}
type PluginDependencyItem struct {
diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index cbc0472c373..8c050174201 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -8,9 +8,9 @@
-
-
- {{::ctrl.title}}
+
+
+ {{ctrl.title}}
diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index 7fa5cc56647..4ff30c92f47 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -40,7 +40,10 @@
diff --git a/public/app/features/panel/panel_menu.js b/public/app/features/panel/panel_menu.js
index bdd4a9ce754..f75aacb32f1 100644
--- a/public/app/features/panel/panel_menu.js
+++ b/public/app/features/panel/panel_menu.js
@@ -56,6 +56,7 @@ function (angular, $, _, Tether) {
template += '