Merge pull request #4187 from raintank/issue4185

replace 'app' with 'plugins' where needed.

public/app/features/plugins/page_ctrl.ts

@@ -5,14 +5,13 @@ import _ from 'lodash';
 
 
 export class AppPageCtrl {
 export class AppPageCtrl {
   page: any;
   page: any;
-  appId: any;
+  pluginId: any;
   appModel: any;
   appModel: any;
 
 
   /** @ngInject */
   /** @ngInject */
   constructor(private backendSrv, private $routeParams: any, private $rootScope) {
   constructor(private backendSrv, private $routeParams: any, private $rootScope) {
-    this.appId = $routeParams.appId;
-
-    this.backendSrv.get(`/api/org/apps/${this.appId}/settings`).then(app => {
+    this.pluginId = $routeParams.pluginId;
+    this.backendSrv.get(`/api/org/plugins/${this.pluginId}/settings`).then(app => {
       this.appModel = app;
       this.appModel = app;
       this.page = _.findWhere(app.pages, {slug: this.$routeParams.slug});
       this.page = _.findWhere(app.pages, {slug: this.$routeParams.slug});
       if (!this.page) {
       if (!this.page) {

public/app/features/plugins/partials/edit.html

@@ -72,7 +72,7 @@
 						{{ds.name}}
 						{{ds.name}}
 					</li>
 					</li>
 					<li ng-repeat="page in ctrl.model.pages">
 					<li ng-repeat="page in ctrl.model.pages">
-						<a href="apps/{{ctrl.appId}}/page/{{page.slug}}" class="external-link">{{page.name}}</a>
+						<a href="plugins/{{ctrl.pluginId}}/page/{{page.slug}}" class="external-link">{{page.name}}</a>
 					</li>
 					</li>
 				</ul>
 				</ul>
 			</section>
 			</section>

public/app/features/plugins/partials/page.html

-<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.appId}}/edit">
+<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.pluginId}}/edit">
 </navbar>
 </navbar>
 
 
 <div class="page-container">
 <div class="page-container">