diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-06-22 13:17:47 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-06-22 13:17:47 -0400 |
| commit | 9c820730918443ca2b498dfa71b3131d73cec526 (patch) | |
| tree | 2d66846119856cb5d2505107bc35010b23b9213b /routers | |
| parent | 9924e65ca11770f247723b10fcbdb81dc9534b32 (diff) | |
| parent | adda10f4a44005880f881bcb9238b74d561f8a1b (diff) | |
| download | gitea-9c820730918443ca2b498dfa71b3131d73cec526.tar.gz gitea-9c820730918443ca2b498dfa71b3131d73cec526.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/dashboard.go | 2 | ||||
| -rw-r--r-- | routers/org/org.go | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/routers/dashboard.go b/routers/dashboard.go index d65c403c5f..4ef4e54f49 100644 --- a/routers/dashboard.go +++ b/routers/dashboard.go @@ -31,7 +31,7 @@ func Home(ctx *middleware.Context) { ctx.Data["PageIsHome"] = true - // Show recent updated repositoires for new visiters. + // Show recent updated repositories for new visitors. repos, err := models.GetRecentUpdatedRepositories() if err != nil { ctx.Handle(500, "dashboard.Home(GetRecentUpdatedRepositories)", err) diff --git a/routers/org/org.go b/routers/org/org.go index 1c02e77332..21f2a189cf 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -6,6 +6,17 @@ import ( ) func Organization(ctx *middleware.Context, params martini.Params) { - ctx.Data["Title"] = "Organization Name" + params["org"] + ctx.Data["Title"] = "Organization " + params["org"] ctx.HTML(200, "org/org") } + +func Members(ctx *middleware.Context,params martini.Params){ + ctx.Data["Title"] = "Organization " + params["org"]+" Members" + ctx.HTML(200,"org/members") +} + +func Teams(ctx *middleware.Context,params martini.Params){ + ctx.Data["Title"] = "Organization " + params["org"]+" Teams" + ctx.HTML(200,"org/teams") +} + |