Merge branch 'master' of github.com:grafana/grafana

examples/nginx-app/plugin.json

@@ -34,13 +34,11 @@
     "updated": "2015-02-10"
   },
 
-  "includes": {
-    "dashboards": [],
-    "plugins": [
-      {"type": "panel", "name": "Nginx Panel"},
-      {"type": "datasource", "name": "Nginx Datasource"}
-    ]
-  },
+  "includes": [
+    {"type": "dashboard", "name": "Nginx Connection stats", "path": "dashboards/nginx_connection_stats.json"},
+    {"type": "panel", "name": "Nginx Panel"},
+    {"type": "datasource", "name": "Nginx Datasource"}
+  ],
 
   "dependencies": {
     "grafanaVersion": "3.x.x",

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

 <navbar title="Plugins" title-url="plugins" icon="icon-gf icon-gf-apps">
-<a href="plugins" class="navbar-page-btn">
+<a href="plugins/{{ctrl.model.pluginId}}/edit" class="navbar-page-btn">
   {{ctrl.model.name}}
 </a>
 </navbar>