Work on unifying backend grafnaa and standalone grafana, and being able to build both from the same branch

2014-12-31 19:02:00 +01:00
parent 2b02c87b16
commit ad4cf373a6
6 changed files with 6 additions and 77 deletions
@@ -35,12 +35,14 @@ func newMacaron() *macaron.Macaron {

 	mapStatic(m, "", "public")
 	mapStatic(m, "app", "app")
+	mapStatic(m, "css", "css")
 	mapStatic(m, "img", "img")
+	mapStatic(m, "font", "font")

 	m.Use(session.Sessioner(setting.SessionOptions))

 	m.Use(macaron.Renderer(macaron.RenderOptions{
-		Directory:  setting.TemplatesRootPath,
+		Directory:  path.Join(setting.StaticRootPath, "views"),
 		IndentJSON: macaron.Env != macaron.PROD,
 		Delims:     macaron.Delims{Left: "[[", Right: "]]"},
 	}))