removed the need for symbolic link to grafana/src

.bra.toml

@@ -1,9 +1,12 @@
 [run]
-init_cmds = [["./bin/grafana", "web"]]
+init_cmds = [
+  ["make", "build"],
+	["./bin/grafana", "web"]
+]
 watch_all = true
 watch_dirs = [
 	"$WORKDIR/pkg",
-	"$WORKDIR/views",
+	"$WORKDIR/templates",
 	"$WORKDIR/conf",
 ]
 watch_exts = [".go", ".ini"]

pkg/cmd/web.go

@@ -22,8 +22,8 @@ import (
 
 var CmdWeb = cli.Command{
 	Name:        "web",
-	Usage:       "Start Grafana Pro web server",
+	Usage:       "grafana web",
-	Description: `Start Grafana Pro server`,
+	Description: "Starts Grafana backend & web server",
 	Action:      runWeb,
 	Flags:       []cli.Flag{},
 }
@@ -33,14 +33,14 @@ func newMacaron() *macaron.Macaron {
 	m.Use(middleware.Logger())
 	m.Use(macaron.Recovery())
 
-	mapStatic(m, "public", "public")
+	mapStatic(m, "", "public")
-	mapStatic(m, "public/app", "app")
+	mapStatic(m, "app", "app")
-	mapStatic(m, "public/img", "img")
+	mapStatic(m, "img", "img")
 
 	m.Use(session.Sessioner(setting.SessionOptions))
 
 	m.Use(macaron.Renderer(macaron.RenderOptions{
-		Directory:  path.Join(setting.StaticRootPath, "views"),
+		Directory:  setting.TemplatesRootPath,
 		IndentJSON: macaron.Env != macaron.PROD,
 		Delims:     macaron.Delims{Left: "[[", Right: "]]"},
 	}))

pkg/setting/setting.go

@@ -52,6 +52,7 @@ var (
 	CertFile, KeyFile  string
 	RouterLogging      bool
 	StaticRootPath     string
+	TemplatesRootPath  string
 
 	// Session settings.
 	SessionOptions session.Options
@@ -137,7 +138,8 @@ func NewConfigContext() {
 		HttpPort = port
 	}
 
-	StaticRootPath = Cfg.MustValue("server", "static_root_path", workDir)
+	StaticRootPath = Cfg.MustValue("server", "static_root_path", path.Join(workDir, "grafana/src"))
+	TemplatesRootPath = Cfg.MustValue("server", "templates_path", path.Join(workDir, "templates"))
 	RouterLogging = Cfg.MustBool("server", "router_logging", false)
 
 	// PhantomJS rendering