From e0f2868d346024d62ee72de0e28abfabb201792c Mon Sep 17 00:00:00 2001
From: kez <kez@torproject.org>
Date: Sun, 14 Aug 2022 14:34:48 -0700
Subject: [PATCH] Rename ExtraData to more appropriate BodyAttributes

---
 viewutil/base.html   |  4 ++--
 viewutil/viewutil.go | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/viewutil/base.html b/viewutil/base.html
index a55c558..6e91092 100644
--- a/viewutil/base.html
+++ b/viewutil/base.html
@@ -15,7 +15,7 @@
 	<script src="/static/shortcuts.js"></script>
 	{{range .HeadElements}}{{.}}{{end}}
 </head>
-<body data-rrh-addr="{{if .Addr}}{{.Addr}}{{else}}{{.Meta.Addr}}{{end}}"{{range .ExtraData}} data-rrh-{{.}}=""{{end}}>
+<body data-rrh-addr="{{if .Addr}}{{.Addr}}{{else}}{{.Meta.Addr}}{{end}}"{{range .BodyAttributes}} data-rrh-{{.}}=""{{end}}>
 <header>
 	<nav class="main-width top-bar">
 		<ul class="top-bar__wrapper">
@@ -61,4 +61,4 @@
 <script src="/static/view.js"></script>
 </body>
 </html>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/viewutil/viewutil.go b/viewutil/viewutil.go
index f7ec80f..5693933 100644
--- a/viewutil/viewutil.go
+++ b/viewutil/viewutil.go
@@ -91,14 +91,14 @@ func localizedBaseWithWeirdBody(meta Meta) *template.Template {
 }
 
 type BaseData struct {
-	Meta          Meta
-	HeadElements  []string
-	HeaderLinks   []HeaderLink
-	CommonScripts []string
-	Addr          string
-	Title         string // TODO: remove
-	Body          string // TODO: remove
-	ExtraData    []string
+	Meta           Meta
+	HeadElements   []string
+	HeaderLinks    []HeaderLink
+	CommonScripts  []string
+	Addr           string
+	Title          string // TODO: remove
+	Body           string // TODO: remove
+	BodyAttributes []string
 }
 
 func (bd *BaseData) withBaseValues(meta Meta, headerLinks []HeaderLink, commonScripts []string) {
@@ -114,13 +114,13 @@ func Base(meta Meta, title, body string, extraData []string, headElements ...str
 	meta.W = &w
 	t := localizedBaseWithWeirdBody(meta)
 	err := t.ExecuteTemplate(&w, "page", BaseData{
-		Meta:          meta,
-		Title:         title,
-		HeadElements:  headElements,
-		HeaderLinks:   HeaderLinks,
-		CommonScripts: cfg.CommonScripts,
-		Body:          body,
-		ExtraData:     extraData,
+		Meta:           meta,
+		Title:          title,
+		HeadElements:   headElements,
+		HeaderLinks:    HeaderLinks,
+		CommonScripts:  cfg.CommonScripts,
+		Body:           body,
+		BodyAttributes: extraData,
 	})
 	if err != nil {
 		log.Println(err)
