From f393dc652007238c27bd5d1954a03ba97412eee5 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Mon, 23 Jun 2014 12:08:53 +0800 Subject: [PATCH] add organization dashboard page --- cmd/web.go | 3 +- public/css/gogs.css | 8 ++++ routers/org/org.go | 5 +++ templates/org/dashboard.tmpl | 73 +++++++++++++++++++++++++++++++++++ templates/user/dashboard.tmpl | 4 +- 5 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 templates/org/dashboard.tmpl diff --git a/cmd/web.go b/cmd/web.go index 9786576d7..65ea60643 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -189,8 +189,9 @@ func runWeb(*cli.Context) { reqOwner := middleware.RequireOwner() m.Group("/o", func(r martini.Router) { - r.Get("/create",org.New) + r.Get("/create", org.New) r.Get("/:org", org.Organization) + r.Get("/:org/dashboard", org.Dashboard) r.Get("/:org/members", org.Members) r.Get("/:org/teams", org.Teams) }) diff --git a/public/css/gogs.css b/public/css/gogs.css index bb341a8a3..1f465d845 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -662,6 +662,14 @@ html, body { padding: .8em 1.2em; } +#dashboard-switch-menu > li > a:hover { + text-decoration: none; +} + +#dashboard-switch-menu > li > a img, #dashboard-switch button img { + margin-right: 6px; +} + #dashboard-switch-menu > li { border-bottom: 1px solid #eaeaea; } diff --git a/routers/org/org.go b/routers/org/org.go index 4d9b831de..8073d10b8 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -24,3 +24,8 @@ func New(ctx *middleware.Context) { ctx.Data["Title"] = "Create an Organization" ctx.HTML(200, "org/new") } + +func Dashboard(ctx *middleware.Context, params martini.Params) { + ctx.Data["Title"] = "Dashboard" + ctx.HTML(200, "org/dashboard") +} diff --git a/templates/org/dashboard.tmpl b/templates/org/dashboard.tmpl new file mode 100644 index 000000000..f86de1f42 --- /dev/null +++ b/templates/org/dashboard.tmpl @@ -0,0 +1,73 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +
+
+
+ + +
+ +
+
+ +

News Feed

+
+
+
+ {{if .HasInfo}}
{{.InfoMsg}}
{{end}} +
+
    + {{range .Feeds}} +
  • + +
    {{TimeSince .Created}}
    {{ActionDesc . | str2html}}
    + +
    • + {{else}} +
  • Oh. Looks like there isn't any activity here yet. Get Busy!
    • + {{end}} +
+
+
+
+
Repositories +
+ +
+ +
+
+
+ +
+ +
+
+
+
+{{template "base/footer" .}} diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl index c44ba3627..12018ad89 100644 --- a/templates/user/dashboard.tmpl +++ b/templates/user/dashboard.tmpl @@ -12,7 +12,9 @@