Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: invaild HTML #898

Merged
merged 11 commits into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions exampleSite/content/archives/2023/_index.ja.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
+++
title = "2023"
+++
3 changes: 3 additions & 0 deletions exampleSite/content/archives/2023/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
+++
title = "2023"
+++
3 changes: 3 additions & 0 deletions exampleSite/content/archives/2023/_index.zh-hans.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
+++
title = "2023"
+++
3 changes: 3 additions & 0 deletions exampleSite/content/archives/2023/_index.zh-hant.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
+++
title = "2023"
+++
10 changes: 5 additions & 5 deletions layouts/_default/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ <h1>{{ $pageTitle }}</h1>
{{- range $i, $v := $faq -}}
<li class="nav-item" role="presentation">
{{- if eq $i 0 -}}
<button class="nav-link active" id="tab{{ .title }}" role="tab" type="button" aria-current="page" data-bs-toggle="tab" data-bs-target="#faq-{{ $i }}" aria-controls="{{ .title }}" aria-selected="true">
<button class="nav-link active" id="faq-{{ $i }}-tab" role="tab" type="button" aria-current="page" data-bs-toggle="tab" data-bs-target="#faq-{{ $i }}-pane" aria-selected="true">
{{- .title -}}
</button>
{{- else -}}
<button class="nav-link" id="tab{{ .title }}" role="tab" type="button" data-bs-toggle="tab" data-bs-target="#faq-{{ $i }}" aria-controls="{{ .title }}" aria-selected="false">
<button class="nav-link" id="faq-{{ $i }}-tab" role="tab" type="button" data-bs-toggle="tab" data-bs-target="#faq-{{ $i }}-pane" aria-selected="false">
{{- .title -}}
</button>
{{- end -}}
Expand All @@ -25,19 +25,19 @@ <h1>{{ $pageTitle }}</h1>
</ul>
<div class="tab-content">
{{- range $i, $v := $faq -}}
<div class="tab-pane fade{{ if eq $i 0}} show active{{ end }}" id="faq-{{ $i }}" role="tabpanel" aria-labelledby="{{ .title }}-tab">
<div class="tab-pane fade{{ if eq $i 0}} show active{{ end }}" id="faq-{{ $i }}-pane" role="tabpanel" aria-labelledby="faq-{{ $i }}-tab">
<div class="accordion" id="faq-{{ $i }}">
{{- $title := .title -}}
{{- range $j, $v := .questions }}
{{- $id := printf "faq-%d-%d" $i $j -}}
<div class="faq accordion-item">
<h2 class="accordion-header faq-question">
<button class="accordion-button{{ if ne 0 $j }} collapsed{{ end }}" type="button" data-bs-toggle="collapse" data-bs-target="#{{ $id }}"
aria-expanded="{{ if eq 0 $j }}true{{ else }}false{{ end }}" aria-controls="{{ $id }}">
aria-expanded="{{ if eq 0 $j }}true{{ else }}false{{ end }}">
{{- .question -}}
</button>
</h2>
<div id="{{ $id }}" class="accordion-collapse collapse{{ if eq 0 $j }} show{{ end }}" aria-labelledby="{{ $id }}" data-bs-parent="#faq-{{ $i }}">
<div id="{{ $id }}" class="accordion-collapse collapse{{ if eq 0 $j }} show{{ end }}" data-bs-parent="#faq-{{ $i }}">
<div class="faq-answer accordion-body surface">
{{- .answer | $.Page.RenderString -}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/contact/recaptcha.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{- with $.Site.Params.contact.reCaptcha -}}
<div class="mb-3">
<label for="g-recaptcha-response" id="reCaptchaLabel" class="form-label text-danger">reCAPTCHA</label>
<label id="reCaptchaLabel" class="form-label text-danger">reCAPTCHA</label>
<div class="g-recaptcha" data-sitekey="{{ .siteKey }}" data-callback="reCaptchaCallback"
data-expired-callback="reCaptchaExpiredCallback"></div>
</div>
<script text="javascript">
<script>
var reCaptchaLabel = document.querySelector('#reCaptchaLabel');
var reCaptchaOnload = function () {
document.querySelector('#g-recaptcha-response').setAttribute("required", true);
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/docs/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
</a>
</div>
<div class="docs-nav-subnavs border-start mt-2 collapse {{ if or $active $expand}} show{{ end }}{{ if $active }} border-primary{{ end }}" id="{{ $sectionId }}">
<ul class="btn-toggle-nav list-unstyled fw-normal ms-2 small">
<div class="btn-toggle-nav fw-normal ms-2 small">
{{ template "walk-nav" (dict "section" . "page" $page) }}
</ul>
</div>
</div>
</li>
{{- else -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/docs/repo.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<h2 class="card-title fs-4 my-2 text-surface d-none d-lg-block">{{ i18n "repo_title" }}</h2>
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#repo" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="repo">
role="button" data-bs-toggle="collapse" href="#repo" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="repo">
{{ i18n "repo_title" }}
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/header/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="{{- partialCached "functions/container-class" . .FirstSection -}}">
{{- if eq .Type "docs" }}
<button class="navbar-toggler border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasDocsNav"
aria-controls="offcanvasDocsCatalog" aria-expanded="false" aria-label="Toggle docs navigation">
aria-expanded="false" aria-label="Toggle docs navigation">
<i class="fas fa-bars"></i>
</button>
{{- end }}
Expand Down
7 changes: 6 additions & 1 deletion layouts/partials/post/panel/toc.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{{- if partial "functions/toc" . -}}
<a class="action action-toc{{ if eq .Type "docs" }} d-xxl-none{{ end }}" href="#postTOC" aria-controls="Table of contents" role="button" title="Table of contents">
{{- if ne .Type "docs" }}
<a class="action action-toc d-none d-xxl-block" href="#postTOC" role="button" title="Table of contents">
<i class="fas fa-fw fa-list-alt"></i>
</a>
{{- end }}
<a class="action action-toc d-block d-xxl-none" href="#post-toc-container" role="button" title="Table of contents">
<i class="fas fa-fw fa-list-alt"></i>
</a>
{{- end -}}
2 changes: 1 addition & 1 deletion layouts/partials/post/toc-wrapper.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if partial "functions/toc" . -}}
{{ $withoutSidebar := eq .Params.sidebar false }}
<div id="postTOC" class="mt-2 mb-3{{ if not $withoutSidebar }} d-block d-xxl-none{{ end }}">
<div class="mt-2 mb-3{{ if not $withoutSidebar }} d-block d-xxl-none{{ end }}">
<h2 class="text-surface mb-3">{{ i18n "table_of_contents" }}</h2>
<div id="post-toc-container">
{{/* Output the TOC if sidebar is disabled. */}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/sidebar/archive.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2 class="card-title my-2 fs-4 text-surface d-none d-lg-block">
</h2>
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#archives" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="archives">
role="button" data-bs-toggle="collapse" href="#archives" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="archives">
{{ i18n "archives" }}
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/sidebar/featured-posts.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ <h2 class="card-title my-2 fs-4 text-surface d-none d-lg-block">
</h2>
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent{{ cond $collapsed ` collapsed` `` }}"
type="button"
role="button"
data-bs-toggle="collapse"
data-bs-target="#featured-posts"
href="#featured-posts"
aria-expanded="{{ cond $collapsed `false` `true` }}"
aria-controls="featured-posts">
{{ i18n "featured_posts" }}
Expand Down
10 changes: 5 additions & 5 deletions layouts/partials/sidebar/posts-toggle.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

{{- if or $featuredPosts $recentPosts }}
<div class="accordion posts-toggle">
<section class="row card component accordion-item">
<div class="row card component accordion-item">
<div class="accordion-header card-header border-0">
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent{{ cond $collapsed ` collapsed` `` }}"
type="button"
role="button"
data-bs-toggle="collapse"
data-bs-target="#posts-toggle"
href="#posts-toggle"
aria-expanded="{{ cond $collapsed `false` `true` }}"
aria-controls="posts-toggle">
{{ i18n "posts" }}
Expand All @@ -33,7 +33,7 @@
<div
class="card-body collapse accordion-collapse accordion-body d-lg-block{{ cond (not $collapsed) ` show` `` }}"
id="posts-toggle">
<ul class="nav nav-pills nav-fill" id="myTab" role="tablist">
<ul class="nav nav-pills nav-fill" role="tablist">
{{- if $featuredPosts }}
<li class="nav-item" role="presentation">
<button
Expand Down Expand Up @@ -101,7 +101,7 @@
{{- end }}
</div>
</div>
</section>
</div>
</div>
{{- end }}
{{- end -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/sidebar/profile/compact.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="accordion-header card-header border-0" id="profile-header">
<a
class="accordion-button d-lg-none mb-2 shadow-none p-0 bg-transparent text-surface{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#profile" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="profile">
role="button" data-bs-toggle="collapse" href="#profile" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="profile">
{{ i18n "profile" }}
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/sidebar/profile/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="accordion-header card-header border-0" id="profile-header">
<a
class="accordion-button d-lg-none mb-2 shadow-none p-0 bg-transparent text-surface{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#profile" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="profile">
role="button" data-bs-toggle="collapse" href="#profile" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="profile">
{{ i18n "profile" }}
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/sidebar/recent-posts.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ <h2 class="card-title my-2 fs-4 text-surface d-none d-lg-block">
</h2>
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent{{ cond $collapsed ` collapsed` `` }}"
type="button"
role="button"
data-bs-toggle="collapse"
data-bs-target="#recent-posts"
href="#recent-posts"
aria-expanded="{{ cond $collapsed `false` `true` }}"
aria-controls="recent-posts">
{{ i18n "recent_posts" }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/sidebar/stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="accordion-header card-header border-0" id="stats-header">
<a
class="accordion-button d-lg-none mb-2 shadow-none p-0 bg-transparent text-surface{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#stats" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="stats">
role="button" data-bs-toggle="collapse" href="#stats" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="stats">
{{ i18n "stats" }}
</a>
</div>
Expand Down
14 changes: 7 additions & 7 deletions layouts/partials/sidebar/taxonomies-toggle.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{{- if default true .Site.Params.sidebar.taxonomiesToggle }}
{{- $archives := default true $.Site.Params.sidebar.taxonomiesToggleArchives }}
<div class="accordion taxonomies-toggle">
<section class="row card component accordion-item">
<div class="row card component accordion-item">
<div class="accordion-header card-header border-0">
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#taxonomies-toggle" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="taxonomies-toggle">
role="button" data-bs-toggle="collapse" href="#taxonomies-toggle" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="taxonomies-toggle">
{{ i18n "taxonomies" }}
</a>
</div>
<div class="card-body collapse accordion-collapse accordion-body d-lg-block{{ if not $collapsed }} show{{ end }}" id="taxonomies-toggle">
<ul class="nav nav-pills nav-fill" id="myTab" role="tablist">
<ul class="nav nav-pills nav-fill" role="tablist">
{{- $counter := 0 }}
{{- range $expected := $.Site.Params.sidebarTaxonomies }}
{{- range $key, $value := $.Site.Taxonomies }}
Expand All @@ -23,7 +23,7 @@
{{- with $value.ByCount }}
<li class="nav-item" role="presentation">
<button class="nav-link{{ if eq $counter 0 }} active{{ end }}" id="taxonomy{{ $key | title }}Tab" data-bs-toggle="tab" data-bs-target="#taxonomy{{ $key | title }}"
type="button" role="tab" aria-controls="{{ i18n $key }}" aria-selected="true">
type="button" role="tab" aria-controls="taxonomy{{ $key | title }}" aria-selected="true">
{{ i18n $key }}
</button>
</li>
Expand All @@ -35,7 +35,7 @@
{{- end }}
{{- if $archives }}
<li class="nav-item" role="presentation">
<button class="nav-link" id="taxonomyArchivesTab" data-bs-toggle="tab" data-bs-target="#taxonomyArchive"
<button class="nav-link" id="taxonomyArchivesTab" data-bs-toggle="tab" data-bs-target="#taxonomyArchives"
type="button" role="tab" aria-controls="taxonomyArchives" aria-selected="true">
{{ i18n "archives" }}
</button>
Expand Down Expand Up @@ -80,12 +80,12 @@
{{- end }}
{{- end }}
{{- if $archives }}
<div class="tab-pane" id="taxonomyArchive" role="tabpanel" aria-labelledby="taxonomyArchiveTab" tabindex="0">
<div class="tab-pane" id="taxonomyArchives" role="tabpanel" aria-labelledby="taxonomyArchivesTab" tabindex="0">
{{- partial "sidebar/archive-items" . }}
</div>
{{- end }}
</div>
</div>
</section>
</div>
</div>
{{- end -}}
4 changes: 2 additions & 2 deletions layouts/partials/sidebar/taxonomies.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
{{- if $taxonomyCount }}
{{- with $value.ByCount }}
<div class="accordion {{ $key }}-taxonomies">
<section class="row card component">
class="row card component">
<div class="card-header">
<h2 class="card-title my-2 fs-4 text-surface d-none d-lg-block">
<a href="{{ absLangURL (urlize $key) }}">{{ i18n $key }}</a>
</h2>
<a
class="accordion-button d-lg-none mb-1 shadow-none p-0 bg-transparent text-surface{{ if $collapsed }} collapsed{{ end }}"
type="button" data-bs-toggle="collapse" data-bs-target="#taxonomy-{{ $key }}" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="taxonomy-{{ $key }}">
role="button" data-bs-toggle="collapse" href="#taxonomy-{{ $key }}" aria-expanded="{{ if $collapsed }}false{{ else }}true{{ end }}" aria-controls="taxonomy-{{ $key }}">
{{ i18n $key }}
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/sidebar/toc.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<div class="accordion-item row mb-4 card component" id="postTOC">
<div class="card-header accordion-header">
<h2 class="card-title fs-4 my-2 text-surface d-none d-lg-block">{{ i18n "table_of_contents" }}</h2>
<a class="accordion-button d-lg-none mb-1 collapsed shadow-none p-0 bg-transparent" type="button" data-bs-toggle="collapse" data-bs-target="#post-toc" aria-expanded="false" aria-controls="post-toc">
<a class="accordion-button d-lg-none mb-1 collapsed shadow-none p-0 bg-transparent" role="button" data-bs-toggle="collapse" href="#post-toc" aria-expanded="false" aria-controls="post-toc">
{{ i18n "table_of_contents" }}
</a>
</div>
<div class="card-body collapse accordion-collapse accordion-body d-lg-block" id="post-toc" aria-labelledby="post-toc-header">
<div class="card-body collapse accordion-collapse accordion-body d-lg-block" id="post-toc">
{{ .TableOfContents }}
</div>
</div>
Expand Down