Received: from mail.cmpwn.com (mail.cmpwn.com [45.56.77.53]) by mail-b.sr.ht (Postfix) with ESMTPS id AFD1FFF0AD for <~emersion/alps-dev@lists.sr.ht>; Wed, 20 May 2020 17:47:56 +0000 (UTC) Authentication-Results: mail-b.sr.ht; dkim=pass (1024-bit key) header.d=cmpwn.com header.i=@cmpwn.com header.b=0jslraQ6 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cmpwn.com; s=cmpwn; t=1589996876; bh=zsyRob+seh0RQA13RWK/8FVa2j8rkqsMGtHQCHcKawg=; h=From:To:Cc:Subject:Date; b=0jslraQ6NKuHdPKOfti4sGm7325+edly2CX7yXSHYk2O0sULc8/XX9YtKm1FyXpPp 5z8AEYClV7V1vurUV1LBRMbsJZNKCwsGS4p9da/In4dYdQ3/Qxwf1g/SfH8YB3IHxm wMmboGSSGFpJbn8zpJfSCnoOFpzVFES3LqT5ETD8= From: Drew DeVault To: ~emersion/alps-dev@lists.sr.ht Cc: Drew DeVault Subject: [PATCH] caldav: add page titles to all routes Date: Wed, 20 May 2020 13:47:54 -0400 Message-Id: <20200520174754.113745-1-sir@cmpwn.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable --- plugins/caldav/routes.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/caldav/routes.go b/plugins/caldav/routes.go index fd3b219..e9ba789 100644 --- a/plugins/caldav/routes.go +++ b/plugins/caldav/routes.go @@ -139,7 +139,8 @@ func registerRoutes(p *alps.GoPlugin, u *url.URL) { } =20 return ctx.Render(http.StatusOK, "calendar.html", &CalendarRenderData{ - BaseRenderData: *alps.NewBaseRenderData(ctx), + BaseRenderData: *alps.NewBaseRenderData(ctx). + WithTitle(calendar.Name + " Calendar: " + start.Format("January 2006= ")), Time: start, Now: time.Now(), // TODO: Use client time zone Calendar: calendar, @@ -219,9 +220,10 @@ func registerRoutes(p *alps.GoPlugin, u *url.URL) { return fmt.Errorf("expected exactly one calendar object with path %q,= got %v", path, len(events)) } event :=3D &events[0] + summary, _ :=3D event.Data.Events()[0].Props.Text("SUMMARY") =20 return ctx.Render(http.StatusOK, "event.html", &EventRenderData{ - BaseRenderData: *alps.NewBaseRenderData(ctx), + BaseRenderData: *alps.NewBaseRenderData(ctx).WithTitle(summary), Calendar: calendar, Event: CalendarObject{event}, }) @@ -312,8 +314,10 @@ func registerRoutes(p *alps.GoPlugin, u *url.URL) { return ctx.Redirect(http.StatusFound, CalendarObject{co}.URL()) } =20 + summary, _ :=3D event.Props.Text("SUMMARY") + return ctx.Render(http.StatusOK, "update-event.html", &UpdateEventRend= erData{ - BaseRenderData: *alps.NewBaseRenderData(ctx), + BaseRenderData: *alps.NewBaseRenderData(ctx).WithTitle("Update " + su= mmary), Calendar: calendar, CalendarObject: co, Event: event, --=20 2.26.2