Merge pull request #4189 from raintank/issue4185

correct path for app page links.

pkg/api/index.go

@@ -85,13 +85,13 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		if plugin.Pinned {
 		if plugin.Pinned {
 			pageLink := &dtos.NavLink{
 			pageLink := &dtos.NavLink{
 				Text: plugin.Name,
 				Text: plugin.Name,
-				Url:  setting.AppSubUrl + "/apps/" + plugin.Id + "/edit",
+				Url:  setting.AppSubUrl + "/plugins/" + plugin.Id + "/edit",
 				Img:  plugin.Info.Logos.Small,
 				Img:  plugin.Info.Logos.Small,
 			}
 			}
 
 
 			for _, page := range plugin.Pages {
 			for _, page := range plugin.Pages {
 				pageLink.Children = append(pageLink.Children, &dtos.NavLink{
 				pageLink.Children = append(pageLink.Children, &dtos.NavLink{
-					Url:  setting.AppSubUrl + "/apps/" + plugin.Id + "/page/" + page.Slug,
+					Url:  setting.AppSubUrl + "/plugins/" + plugin.Id + "/page/" + page.Slug,
 					Text: page.Name,
 					Text: page.Name,
 				})
 				})
 			}
 			}