4 files changed, 36 insertions, 15 deletions
diff --git a/modules/base/base.go b/modules/base/base.go
index 0d305ab4..967a78bf 100644
--- a/modules/base/base.go
+++ b/modules/base/base.go
@@ -4,17 +4,9 @@
 
 package base
 
-import (
-	"github.com/codegangsta/martini"
-)
+import ()
 
 type (
 	// Type TmplData represents data in the templates.
 	TmplData map[string]interface{}
 )
-
-func InitContext() martini.Handler {
-	return func(context martini.Context) {
-		context.Map(TmplData{})
-	}
-}
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 809b2b8c..f1508d7a 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -15,7 +15,11 @@ import (
 	"github.com/Unknwon/goconfig"
 )
 
-var Cfg *goconfig.ConfigFile
+var (
+	AppVer  string
+	AppName string
+	Cfg     *goconfig.ConfigFile
+)
 
 func exeDir() (string, error) {
 	file, err := exec.LookPath(os.Args[0])
@@ -52,4 +56,6 @@ func init() {
 		}
 	}
 	Cfg.BlockMode = false
+
+	AppName = Cfg.MustValue("", "APP_NAME")
 }
diff --git a/modules/base/template.go b/modules/base/template.go
new file mode 100644
index 00000000..620bf4a1
--- /dev/null
+++ b/modules/base/template.go
@@ -0,0 +1,28 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package base
+
+import (
+	"html/template"
+)
+
+func Str2html(raw string) template.HTML {
+	return template.HTML(raw)
+}
+
+var TemplateFuncs template.FuncMap = map[string]interface{}{
+	"AppName": func() string {
+		return AppName
+	},
+	"AppVer": func() string {
+		return AppVer
+	},
+	"str2html":   Str2html,
+	"TimeSince":  TimeSince,
+	"Subtract":   Subtract,
+	"ActionIcon": ActionIcon,
+	"ActionDesc": ActionDesc,
+	"DateFormat": DateFormat,
+}
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 4b84ac0b..4802c413 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -8,7 +8,6 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"html/template"
 	"strings"
 	"time"
 )
@@ -30,10 +29,6 @@ const (
 	Year   = 12 * Month
 )
 
-func Str2html(raw string) template.HTML {
-	return template.HTML(raw)
-}
-
 // TimeSince calculates the time interval and generate user-friendly string.
 func TimeSince(then time.Time) string {
 	now := time.Now()