content,internal: cleanup aria-landmark values
Adjusts aria-landmark values to match updated greenlines.
Change-Id: I4573039ebf62df20a91ac3a52b1171f0d192d774
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/258258
Trust: Jamal Carvalho <jamal@golang.org>
Run-TryBot: Jamal Carvalho <jamal@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Julie Qiu <julie@golang.org>
diff --git a/content/static/html/base.tmpl b/content/static/html/base.tmpl
index ac012f7..351d693 100644
--- a/content/static/html/base.tmpl
+++ b/content/static/html/base.tmpl
@@ -87,7 +87,11 @@
</aside>
<div class="NavigationDrawer-scrim js-scrim" role="presentation">
</div>
-<main class="Site-content">{{block "main_content" .}}{{end}}</main>
+{{if (.Experiments.IsActive "unit-page")}}
+ <div class="Site-content">{{block "main_content" .}}{{end}}</div>
+{{else}}
+ <main class="Site-content">{{block "main_content" .}}{{end}}</main>
+{{end}}
<footer class="Site-footer">
{{block "pre_footer" .}}{{end}}
<div class="Footer">
diff --git a/content/static/html/helpers/_unit_header.tmpl b/content/static/html/helpers/_unit_header.tmpl
index ff6f677..760f228 100644
--- a/content/static/html/helpers/_unit_header.tmpl
+++ b/content/static/html/helpers/_unit_header.tmpl
@@ -5,7 +5,12 @@
-->
{{define "unit_header"}}
- <header class="UnitHeader">
+ <header class="UnitHeader" role="complementary"
+ aria-label="{{if .Unit.IsCommand}}command
+ {{else if .Unit.IsPackage}}package
+ {{else if .Unit.IsModule}}module
+ {{else}}directory{{end}}
+ {{.Title}} information">
<div class="UnitHeader-container">
<div class="UnitHeader-breadcrumb">
{{with .Breadcrumb}}
@@ -21,20 +26,18 @@
<h1 class="UnitHeader-title">
{{.Title}}
</h1>
- {{if .Unit.IsPackage}}
- {{if .Unit.IsCommand}}
- <span class="UnitHeader-badge">command</span>
- {{else}}
- <span class="UnitHeader-badge">package</span>
- {{end}}
+ {{if .Unit.IsCommand}}
+ <span class="UnitHeader-badge">command</span>
+ {{else if .Unit.IsPackage}}
+ <span class="UnitHeader-badge">package</span>
{{end}}
{{if .Unit.IsModule}}
<span class="UnitHeader-badge">module</span>
{{end}}
+ {{if not (or .Unit.IsPackage .Unit.IsModule)}}
+ <span class="UnitHeader-badge">directory</span>
+ {{end}}
</div>
- {{if not (or .Unit.IsPackage .Unit.IsModule)}}
- <span class="UnitHeader-badge">directory</span>
- {{end}}
<div class="UnitHeader-versionBanner $$GODISCOVERY_LATESTMAJORCLASS$$">
<img height="19px" width="16px" class="UnitHeader-detailIcon" src="/static/img/pkg-icon-info_19x16.svg">
<span>
diff --git a/content/static/html/pages/unit_details.tmpl b/content/static/html/pages/unit_details.tmpl
index 0015050..a9f783f 100644
--- a/content/static/html/pages/unit_details.tmpl
+++ b/content/static/html/pages/unit_details.tmpl
@@ -11,10 +11,15 @@
{{define "unit_content"}}
<div class="UnitDetails">
{{.MobileOutline}}
- <div class="UnitDetails-outline">
+ <div class="UnitDetails-outline" role="navigation"
+ aria-label="{{if .Unit.IsCommand}}command
+ {{else if .Unit.IsPackage}}package
+ {{else if .Unit.IsModule}}module
+ {{else}}directory{{end}}
+ details navigation">
{{block "unit_outline" .}}{{end}}
</div>
- <div class="UnitDetails-content">
+ <div class="UnitDetails-content" role="main">
{{if .CanShowDetails}}
{{if .Readme.String}}
{{block "unit_readme" .}}{{end}}
@@ -30,7 +35,7 @@
See our <a href="/license-policy">license policy</a>.
{{end}}
</div>
- <div class="UnitDetails-meta">
+ <div class="UnitDetails-meta" role="complementary" aria-label="links">
{{block "unit_meta" .}}{{end}}
</div>
</div>
diff --git a/content/static/html/pages/unit_importedby.tmpl b/content/static/html/pages/unit_importedby.tmpl
index 3453bb6..7b61ed8 100644
--- a/content/static/html/pages/unit_importedby.tmpl
+++ b/content/static/html/pages/unit_importedby.tmpl
@@ -5,7 +5,7 @@
-->
{{define "unit_content"}}
- <div class="Unit-content">
+ <div class="Unit-content" role="main">
{{block "importedby" .PackageDetails}}{{end}}
</div>
{{end}}
diff --git a/content/static/html/pages/unit_imports.tmpl b/content/static/html/pages/unit_imports.tmpl
index 8095f23..0cb0227 100644
--- a/content/static/html/pages/unit_imports.tmpl
+++ b/content/static/html/pages/unit_imports.tmpl
@@ -5,7 +5,7 @@
-->
{{define "unit_content"}}
- <div class="Unit-content">
+ <div class="Unit-content" role="main">
{{block "imports" .PackageDetails}}{{end}}
</div>
{{end}}
diff --git a/content/static/html/pages/unit_licenses.tmpl b/content/static/html/pages/unit_licenses.tmpl
index ea7248d..f1b94d3 100644
--- a/content/static/html/pages/unit_licenses.tmpl
+++ b/content/static/html/pages/unit_licenses.tmpl
@@ -5,7 +5,7 @@
-->
{{define "unit_content"}}
- <div class="Unit-content">
+ <div class="Unit-content" role="main">
{{block "licenses" .PackageDetails}}{{end}}
</div>
{{end}}
diff --git a/content/static/html/pages/unit_versions.tmpl b/content/static/html/pages/unit_versions.tmpl
index 6b0cfa2..b59af19 100644
--- a/content/static/html/pages/unit_versions.tmpl
+++ b/content/static/html/pages/unit_versions.tmpl
@@ -5,7 +5,7 @@
-->
{{define "unit_content"}}
- <div class="Unit-content">
+ <div class="Unit-content" role="main">
{{block "versions" .PackageDetails}}{{end}}
</div>
{{end}}
diff --git a/internal/fetch/dochtml/template_body.go b/internal/fetch/dochtml/template_body.go
index f37f22e..887243f 100644
--- a/internal/fetch/dochtml/template_body.go
+++ b/internal/fetch/dochtml/template_body.go
@@ -23,7 +23,7 @@
{{- if or .Consts .Vars .Funcs .Types .Examples.List -}}
<section class="Documentation-index">
- <h2 id="pkg-index" class="Documentation-indexHeader">Index <a href="#pkg-index">¶</a></h2>{{"\n\n" -}}
+ <h3 id="pkg-index" class="Documentation-indexHeader">Index <a href="#pkg-index">¶</a></h3>{{"\n\n" -}}
<ul class="Documentation-indexList">{{"\n" -}}
{{- if .Consts -}}<li class="Documentation-indexConstants"><a href="#pkg-constants">Constants</a></li>{{"\n"}}{{- end -}}
{{- if .Vars -}}<li class="Documentation-indexVariables"><a href="#pkg-variables">Variables</a></li>{{"\n"}}{{- end -}}
diff --git a/internal/fetch/dochtml/template_test.go b/internal/fetch/dochtml/template_test.go
index 3cec720..37d46d1 100644
--- a/internal/fetch/dochtml/template_test.go
+++ b/internal/fetch/dochtml/template_test.go
@@ -182,7 +182,7 @@
{{- if or .Consts .Vars .Funcs .Types .Examples.List -}}
<section class="Documentation-index">
- <h2 id="pkg-index" class="Documentation-indexHeader">Index <a href="#pkg-index">¶</a></h2>{{"\n\n" -}}
+ <h3 id="pkg-index" class="Documentation-indexHeader">Index <a href="#pkg-index">¶</a></h3>{{"\n\n" -}}
<ul class="Documentation-indexList">{{"\n" -}}
{{- if .Consts -}}<li class="Documentation-indexConstants"><a href="#pkg-constants">Constants</a></li>{{"\n"}}{{- end -}}
{{- if .Vars -}}<li class="Documentation-indexVariables"><a href="#pkg-variables">Variables</a></li>{{"\n"}}{{- end -}}
diff --git a/internal/godoc/testdata_test.go b/internal/godoc/testdata_test.go
index e7f14b3..71df7eb 100644
--- a/internal/godoc/testdata_test.go
+++ b/internal/godoc/testdata_test.go
@@ -62,7 +62,7 @@
<p>Package quote collects pithy sayings.</p>
</section>
<section class="Documentation-index">
- <h2 id="pkg-index" class="Documentation-indexHeader">Index <a href="#pkg-index">¶</a></h2>
+ <h3 id="pkg-index" class="Documentation-indexHeader">Index <a href="#pkg-index">¶</a></h3>
<ul class="Documentation-indexList">
<li class="Documentation-indexFunction">
<a href="#Glass">func Glass() string</a>
