Added partial templates

mailbox/list now renders

web/template.go

@@ -3,31 +3,81 @@ package web
 import (
 	"github.com/jhillyerd/inbucket"
 	"html/template"
+	"net/http"
+	"path"
 	"path/filepath"
+	"strings"
 	"sync"
 )
 
-var cachedTemplates = map[string]*template.Template{}
 var cachedMutex sync.Mutex
+var cachedTemplates = map[string]*template.Template{}
+var cachedPartials = map[string]*template.Template{}
 
-func T(name string) *template.Template {
+// RenderTemplate fetches the named template and renders it to the provided
+// ResponseWriter.
+func RenderTemplate(name string, w http.ResponseWriter, data interface{}) error {
+	t, err := ParseTemplate(name, false)
+	if err != nil {
+		inbucket.Error("Error in template '%v': %v", name, err)
+		return err
+	}
+	w.Header().Set("Expires", "-1")
+	return t.Execute(w, data)
+}
+
+// RenderPartial fetches the named template and renders it to the provided
+// ResponseWriter.
+func RenderPartial(name string, w http.ResponseWriter, data interface{}) error {
+	t, err := ParseTemplate(name, true)
+	if err != nil {
+		inbucket.Error("Error in template '%v': %v", name, err)
+		return err
+	}
+	w.Header().Set("Expires", "-1")
+	return t.Execute(w, data)
+}
+
+// ParseTemplate loads the requested template along with _base.html, caching
+// the result (if configured to do so)
+func ParseTemplate(name string, partial bool) (*template.Template, error) {
 	cachedMutex.Lock()
 	defer cachedMutex.Unlock()
 
 	if t, ok := cachedTemplates[name]; ok {
-		return t
+		return t, nil
 	}
 
-	templateDir := inbucket.GetWebConfig().TemplateDir
-	templateFile := filepath.Join(templateDir, name)
-	inbucket.Trace("Parsing template %v", templateFile)
+	cfg := inbucket.GetWebConfig()
+	tempPath := strings.Replace(name, "/", string(filepath.Separator), -1)
+	tempFile := filepath.Join(cfg.TemplateDir, tempPath)
+	inbucket.Trace("Parsing template %v", tempFile)
 
-	t := template.New("_base.html").Funcs(TemplateFuncs)
-	t = template.Must(t.ParseFiles(
-		filepath.Join(templateDir, "_base.html"),
-		templateFile,
-	))
-	cachedTemplates[name] = t
+	var err error
+	var t *template.Template
+	if partial {
+		// Need to get basename of file to make it root template w/ funcs
+		base := path.Base(name)
+		t = template.New(base).Funcs(TemplateFuncs)
+		t, err = t.ParseFiles(tempFile)
+	} else {
+		t = template.New("_base.html").Funcs(TemplateFuncs)
+		t, err = t.ParseFiles(filepath.Join(cfg.TemplateDir, "_base.html"), tempFile)
+	}
+	if err != nil {
+		return nil, err
+	}
 
-	return t
+	// Allows us to disable caching for theme development
+	if cfg.TemplateCache {
+		if partial {
+			inbucket.Trace("Caching partial %v", name)
+			cachedTemplates[name] = t
+		} else {
+			inbucket.Trace("Caching template %v", name)
+			cachedTemplates[name] = t
+		}
+	}
+
+	return t, nil
 }