From 6775ac7334c7a5a451a309a6e3dc1c85dbf04f6b Mon Sep 17 00:00:00 2001 From: Alec S Date: Wed, 9 Mar 2016 20:46:36 -0600 Subject: [PATCH 1/3] change page titles for user and org dashes --- routers/user/home.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index fa8c1364ba..0e633a9e59 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -83,11 +83,11 @@ func retrieveFeeds(ctx *middleware.Context, ctxUserID, userID, offset int64, isP } func Dashboard(ctx *middleware.Context) { - ctx.Data["Title"] = ctx.Tr("dashboard") + ctxUser := getDashboardContextUser(ctx) + ctx.Data["Title"] = ctxUser.DisplayName() + " " + ctx.Tr("dashboard") ctx.Data["PageIsDashboard"] = true ctx.Data["PageIsNews"] = true - ctxUser := getDashboardContextUser(ctx) if ctx.Written() { return } From affa3c2dbfee9f5e04c7c29c54a4afe9887bb01a Mon Sep 17 00:00:00 2001 From: Alec S Date: Wed, 9 Mar 2016 21:01:43 -0600 Subject: [PATCH 2/3] Remove dashboard keyword from title --- routers/user/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/user/home.go b/routers/user/home.go index 0e633a9e59..0af94698df 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -84,7 +84,7 @@ func retrieveFeeds(ctx *middleware.Context, ctxUserID, userID, offset int64, isP func Dashboard(ctx *middleware.Context) { ctxUser := getDashboardContextUser(ctx) - ctx.Data["Title"] = ctxUser.DisplayName() + " " + ctx.Tr("dashboard") + ctx.Data["Title"] = ctxUser.DisplayName() ctx.Data["PageIsDashboard"] = true ctx.Data["PageIsNews"] = true From bfed3ea7d3e0ea07fefa90e60514994beae0cb75 Mon Sep 17 00:00:00 2001 From: Alec S Date: Wed, 9 Mar 2016 22:56:03 -0600 Subject: [PATCH 3/3] fix indentation --- routers/user/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/user/home.go b/routers/user/home.go index 0af94698df..3b83529d05 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -83,7 +83,7 @@ func retrieveFeeds(ctx *middleware.Context, ctxUserID, userID, offset int64, isP } func Dashboard(ctx *middleware.Context) { - ctxUser := getDashboardContextUser(ctx) + ctxUser := getDashboardContextUser(ctx) ctx.Data["Title"] = ctxUser.DisplayName() ctx.Data["PageIsDashboard"] = true ctx.Data["PageIsNews"] = true