diff options
29 files changed, 86 insertions, 86 deletions
diff --git a/internal/template/templates/common/layout.html b/internal/template/templates/common/layout.html index ce501cf6..a8e4e89a 100644 --- a/internal/template/templates/common/layout.html +++ b/internal/template/templates/common/layout.html @@ -64,7 +64,7 @@ <a class="skip-to-content-link" href="#main"> Skip to content </a> - <div class="header"> + <header class="header"> <nav> <div class="logo"> <a aria-label="{{ t "menu.home_page" }}" href="{{ route .user.DefaultHomePage }}"> @@ -127,7 +127,7 @@ </form> </details> </search> - </div> + </header> {{ end }} {{ if .flashMessage }} <div class="flash-message alert alert-success">{{ .flashMessage }}</div> @@ -136,7 +136,7 @@ <div class="flash-error-message alert alert-error">{{ .flashErrorMessage }}</div> {{ end }} - {{template "header" .}} + {{template "page_header" .}} <main id="main"> {{template "content" .}} diff --git a/internal/template/templates/views/about.html b/internal/template/templates/views/about.html index eab73af9..19be5222 100644 --- a/internal/template/templates/views/about.html +++ b/internal/template/templates/views/about.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.about.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.about.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/add_subscription.html b/internal/template/templates/views/add_subscription.html index 701ead08..d23e7053 100644 --- a/internal/template/templates/views/add_subscription.html +++ b/internal/template/templates/views/add_subscription.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.add_feed.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1> {{ template "feed_menu" }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/api_keys.html b/internal/template/templates/views/api_keys.html index 2889d030..956ca58b 100644 --- a/internal/template/templates/views/api_keys.html +++ b/internal/template/templates/views/api_keys.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.api_keys.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.api_keys.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/bookmark_entries.html b/internal/template/templates/views/bookmark_entries.html index 925cdcc5..5e08bde5 100644 --- a/internal/template/templates/views/bookmark_entries.html +++ b/internal/template/templates/views/bookmark_entries.html @@ -1,13 +1,13 @@ {{ define "title"}}{{ t "page.starred.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title" dir="auto"> {{ t "page.starred.title" }} <span aria-hidden="true"> ({{ .total }})</span> </h1> <span class="sr-only">{{ t "page.starred.total" }}: {{ .total }}</span> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/categories.html b/internal/template/templates/views/categories.html index a0c273af..d45bf7f7 100644 --- a/internal/template/templates/views/categories.html +++ b/internal/template/templates/views/categories.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.categories.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title" dir="auto"> {{ t "page.categories.title" }} <span aria-hidden="true"> ({{ .total }})</span> @@ -14,7 +14,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/category_entries.html b/internal/template/templates/views/category_entries.html index 8b61a86e..9e594a5c 100644 --- a/internal/template/templates/views/category_entries.html +++ b/internal/template/templates/views/category_entries.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ .category.Title }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title" dir="auto"> {{ .category.Title }} <span aria-hidden="true">({{ .total }})</span> @@ -52,7 +52,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/category_feeds.html b/internal/template/templates/views/category_feeds.html index 0b7df40e..2564cf68 100644 --- a/internal/template/templates/views/category_feeds.html +++ b/internal/template/templates/views/category_feeds.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ .category.Title }} > {{ t "page.feeds.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title" dir="auto"> {{ .category.Title }} <span aria-hidden="true">></span> {{ t "page.feeds.title" }} <span aria-hidden="true"> ({{ .total }})</span> @@ -34,7 +34,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/choose_subscription.html b/internal/template/templates/views/choose_subscription.html index 7a671cac..01d2ed60 100644 --- a/internal/template/templates/views/choose_subscription.html +++ b/internal/template/templates/views/choose_subscription.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.add_feed.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.add_feed.title" }}</h1> {{ template "feed_menu" }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/create_api_key.html b/internal/template/templates/views/create_api_key.html index 843ea6ad..8f5b5959 100644 --- a/internal/template/templates/views/create_api_key.html +++ b/internal/template/templates/views/create_api_key.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.new_api_key.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.new_api_key.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/create_category.html b/internal/template/templates/views/create_category.html index 62a3e1e5..cad6a22d 100644 --- a/internal/template/templates/views/create_category.html +++ b/internal/template/templates/views/create_category.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.new_category.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.new_category.title" }}</h1> <nav aria-label="{{ t "page.new_category.title" }} {{ t "menu.title" }}"> <ul> @@ -10,7 +10,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/create_user.html b/internal/template/templates/views/create_user.html index 99437a27..2c4aecb4 100644 --- a/internal/template/templates/views/create_user.html +++ b/internal/template/templates/views/create_user.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.new_user.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.new_user.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/edit_category.html b/internal/template/templates/views/edit_category.html index 0307abec..97b0c287 100644 --- a/internal/template/templates/views/edit_category.html +++ b/internal/template/templates/views/edit_category.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.edit_category.title" .category.Title }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.edit_category.title" .category.Title }}</h1> <nav aria-label="{{ t "page.edit_category.title" .category.Title }} {{ t "menu.title" }}"> <ul> @@ -16,7 +16,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/edit_feed.html b/internal/template/templates/views/edit_feed.html index 07848286..c066b964 100644 --- a/internal/template/templates/views/edit_feed.html +++ b/internal/template/templates/views/edit_feed.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.edit_feed.title" .feed.Title }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title" dir="auto">{{ .feed.Title }}</h1> <nav aria-label="{{ .feed.Title }} {{ t "menu.title" }}"> <ul> @@ -23,7 +23,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/edit_user.html b/internal/template/templates/views/edit_user.html index 56104509..8888daf3 100644 --- a/internal/template/templates/views/edit_user.html +++ b/internal/template/templates/views/edit_user.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.edit_user.title" .selected_user.Username }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.edit_user.title" .selected_user.Username }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/entry.html b/internal/template/templates/views/entry.html index 08e7f1a5..bc357617 100644 --- a/internal/template/templates/views/entry.html +++ b/internal/template/templates/views/entry.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ .entry.Title }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <div class="entry-header"> <h1 id="page-header-title" dir="auto"> <a href="{{ .entry.URL | safeURL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer">{{ .entry.Title }}</a> @@ -144,7 +144,7 @@ {{ end }} </div> </div> -</header> +</section> {{ end }} diff --git a/internal/template/templates/views/feed_entries.html b/internal/template/templates/views/feed_entries.html index e101a3ce..6efa9a19 100644 --- a/internal/template/templates/views/feed_entries.html +++ b/internal/template/templates/views/feed_entries.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ .feed.Title }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title" dir="auto"> <a href="{{ .feed.SiteURL | safeURL }}" title="{{ .feed.SiteURL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="{{ .user.MarkReadOnView }}">{{ .feed.Title }}</a> <span aria-hidden="true">({{ .total }})</span> @@ -70,7 +70,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/feeds.html b/internal/template/templates/views/feeds.html index d2584c25..1350d969 100644 --- a/internal/template/templates/views/feeds.html +++ b/internal/template/templates/views/feeds.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.feeds.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.feeds.title" }} ({{ .total }})</h1> {{ template "feed_menu" }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/history_entries.html b/internal/template/templates/views/history_entries.html index 627d3447..9fda4295 100644 --- a/internal/template/templates/views/history_entries.html +++ b/internal/template/templates/views/history_entries.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.history.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title"> {{ t "page.history.title" }} <span aria-hidden="true">({{ .total }})</span> @@ -25,7 +25,7 @@ </li> </ul> </nav> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/import.html b/internal/template/templates/views/import.html index ff0cad22..7e6fd7cb 100644 --- a/internal/template/templates/views/import.html +++ b/internal/template/templates/views/import.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.import.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.import.title" }}</h1> {{ template "feed_menu" }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/integrations.html b/internal/template/templates/views/integrations.html index dd2ad625..70a7144c 100644 --- a/internal/template/templates/views/integrations.html +++ b/internal/template/templates/views/integrations.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.integrations.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.integrations.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} @@ -144,7 +144,7 @@ <label> <input type="checkbox" name="linkace_check_disabled" value="1" {{ if .form.LinkAceCheckDisabled }}checked{{ end }}> {{ t "form.integration.linkace_check_disabled" }} </label> - + <div class="buttons"> <button type="submit" class="button button-primary" data-label-loading="{{ t "form.submit.saving" }}">{{ t "action.update" }}</button> </div> diff --git a/internal/template/templates/views/login.html b/internal/template/templates/views/login.html index 3a9a3f82..d448df74 100644 --- a/internal/template/templates/views/login.html +++ b/internal/template/templates/views/login.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.login.title" }}{{ end }} -{{ define "header"}}{{ end }} +{{ define "page_header"}}{{ end }} {{ define "content"}} <section class="login-form"> diff --git a/internal/template/templates/views/search_entries.html b/internal/template/templates/views/search_entries.html index ae88174b..eb178f9f 100644 --- a/internal/template/templates/views/search_entries.html +++ b/internal/template/templates/views/search_entries.html @@ -1,9 +1,9 @@ {{ define "title"}}{{ t "page.search.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.search.title" }} ({{ .total }})</h1> -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/sessions.html b/internal/template/templates/views/sessions.html index 37efbcdb..96cd7f13 100644 --- a/internal/template/templates/views/sessions.html +++ b/internal/template/templates/views/sessions.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.sessions.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.sessions.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/settings.html b/internal/template/templates/views/settings.html index b07f2e01..079573e3 100644 --- a/internal/template/templates/views/settings.html +++ b/internal/template/templates/views/settings.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.settings.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.settings.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/shared_entries.html b/internal/template/templates/views/shared_entries.html index 6aeb5384..8c387ade 100644 --- a/internal/template/templates/views/shared_entries.html +++ b/internal/template/templates/views/shared_entries.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.shared_entries.title" }} ({{ .total }}){{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title"> {{ t "page.shared_entries.title" }} <span aria-hidden="true">({{ .total }})</span> @@ -25,7 +25,7 @@ </ul> </nav> {{ end }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/unread_entries.html b/internal/template/templates/views/unread_entries.html index 9fc03c89..2daec274 100644 --- a/internal/template/templates/views/unread_entries.html +++ b/internal/template/templates/views/unread_entries.html @@ -1,7 +1,7 @@ {{ define "title"}}{{ t "page.unread.title" }} {{ if gt .countUnread 0 }}({{ .countUnread }}){{ end }} {{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title"> {{ t "page.unread.title" }} <span aria-hidden="true">(<span class="unread-counter">{{ .countUnread }}</span>)</span> @@ -32,7 +32,7 @@ </ul> </nav> {{ end }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/users.html b/internal/template/templates/views/users.html index f85de752..0b8eb1c0 100644 --- a/internal/template/templates/views/users.html +++ b/internal/template/templates/views/users.html @@ -1,10 +1,10 @@ {{ define "title"}}{{ t "page.users.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.users.title" }}</h1> {{ template "settings_menu" dict "user" .user }} -</header> +</section> {{ end }} {{ define "content"}} diff --git a/internal/template/templates/views/webauthn_rename.html b/internal/template/templates/views/webauthn_rename.html index 269623e0..9443c73b 100644 --- a/internal/template/templates/views/webauthn_rename.html +++ b/internal/template/templates/views/webauthn_rename.html @@ -1,9 +1,9 @@ {{ define "title"}}{{ t "page.webauthn_rename.title" }}{{ end }} -{{ define "header"}} -<header class="page-header" aria-labelledby="page-header-title"> +{{ define "page_header"}} +<section class="page-header" aria-labelledby="page-header-title"> <h1 id="page-header-title">{{ t "page.webauthn_rename.title" }}</h1> -</header> +</section> {{ end }} {{ define "content"}} |