From 35f7a71f9a2a70f873db475044330b0e75af0376 Mon Sep 17 00:00:00 2001
From: Anthony Woods <awoods@raintank.io>
Date: Mon, 29 Feb 2016 19:54:36 +0800
Subject: [PATCH] fix app->plugin renamin in more places

---
 pkg/api/api.go                                 | 5 +++--
 public/app/features/plugins/partials/page.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 90d613e46e0..ed029a5171a 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -43,8 +43,9 @@ func Register(r *macaron.Macaron) {
 	r.Get("/admin/orgs/edit/:id", reqGrafanaAdmin, Index)
 	r.Get("/admin/stats", reqGrafanaAdmin, Index)
 
-	r.Get("/apps", reqSignedIn, Index)
-	r.Get("/apps/edit/*", reqSignedIn, Index)
+	r.Get("/plugins", reqSignedIn, Index)
+	r.Get("/plugins/:id/edit", reqSignedIn, Index)
+	r.Get("/plugins/:id/page/:page", reqSignedIn, Index)
 
 	r.Get("/dashboard/*", reqSignedIn, Index)
 	r.Get("/dashboard-solo/*", reqSignedIn, Index)
diff --git a/public/app/features/plugins/partials/page.html b/public/app/features/plugins/partials/page.html
index db6d64457bf..949175419ac 100644
--- a/public/app/features/plugins/partials/page.html
+++ b/public/app/features/plugins/partials/page.html
@@ -1,4 +1,4 @@
-<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.pluginId}}/edit">
+<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="plugins/{{ctrl.pluginId}}/edit">
 </navbar>
 
 <div class="page-container">