diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-06 11:12:37 -0500 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-06 11:12:37 -0500 |
| commit | d8b92b4bc99d642c7fd9a6080bdfa8d782e8c325 (patch) | |
| tree | ba54f16bd242d619bb4ffdc051ea07a6c2311117 /routers | |
| parent | 1249392c8390d9e348c388c0ad6e80fce208cd95 (diff) | |
| parent | 4c1858c07b972e64d47218646f89b2fb5340a993 (diff) | |
| download | gitea-d8b92b4bc99d642c7fd9a6080bdfa8d782e8c325.tar.gz gitea-d8b92b4bc99d642c7fd9a6080bdfa8d782e8c325.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
templates/user/signup.tmpl
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/dashboard.go | 3 | ||||
| -rw-r--r-- | routers/user/user.go | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/routers/dashboard.go b/routers/dashboard.go index c154623820..8eda9cf248 100644 --- a/routers/dashboard.go +++ b/routers/dashboard.go @@ -16,5 +16,6 @@ func Home(r render.Render, data base.TmplData, session sessions.Session) { user.Dashboard(r, data, session) return } - r.HTML(200, "home", nil) + data["PageIsHome"] = true + r.HTML(200, "home", data) } diff --git a/routers/user/user.go b/routers/user/user.go index c6a2752ca0..0a85011a8b 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -27,6 +27,7 @@ func Dashboard(r render.Render, data base.TmplData, session sessions.Session) { data["IsSigned"] = true data["SignedUserId"] = SignedInId(session) data["SignedUserName"] = SignedInName(session) + data["PageIsUserDashboard"] = true data["Title"] = "Dashboard" r.HTML(200, "user/dashboard", data) @@ -112,6 +113,7 @@ func SignIn(req *http.Request, r render.Render, session sessions.Session) { func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r render.Render) { data["Title"] = "Sign Up" + data["PageIsSignUp"] = true if req.Method == "GET" { r.HTML(200, "user/signup", data) |