Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 38 insertions, 0 deletions

diff --git a/routers/home.go b/routers/home.go
new file mode 100644
index 00000000..770aca03
--- /dev/null
+++ b/routers/home.go
@@ -0,0 +1,38 @@
+// 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 routers
+
+import (
+	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/modules/middleware"
+	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/routers/user"
+)
+
+const (
+	HOME base.TplName = "home"
+)
+
+func Home(ctx *middleware.Context) {
+	if ctx.IsSigned {
+		user.Dashboard(ctx)
+		return
+	}
+
+	// Check auto-login.
+	uname := ctx.GetCookie(setting.CookieUserName)
+	if len(uname) != 0 {
+		ctx.Redirect("/user/login")
+		return
+	}
+
+	ctx.Data["PageIsHome"] = true
+	ctx.HTML(200, HOME)
+}
+
+func NotFound(ctx *middleware.Context) {
+	ctx.Data["Title"] = "Page Not Found"
+	ctx.Handle(404, "home.NotFound", nil)
+}