Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins

This commit is contained in:
Torkel Ödegaard
2015-11-19 11:05:27 +01:00
10 changed files with 213 additions and 6 deletions

View File

@@ -13,6 +13,9 @@
[[else]]
<link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.dark.min.css">
[[end]]
[[ range $css := .ExternalPluginCss ]]
<link rel="stylesheet" href="[[$.AppSubUrl]]/plugins[[ $css ]]">
[[ end ]]
<link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png">
<base href="[[.AppSubUrl]]/" />
@@ -52,11 +55,17 @@
settings: [[.Settings]],
};
window.externalPlugins = {
MainLinks: [[.ExternalPluginMenu]]
};
require(['app/app'], function (app) {
app.boot();
app.boot();
})
</script>
[[ range $js := .ExternalPluginJs]]
<script src="[[$.AppSubUrl]]/plugins[[ $js ]]"></script>
[[ end ]]
[[if .GoogleAnalyticsId]]
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){