From 74964793804c207bbc482b1098d4fe04a352a91c Mon Sep 17 00:00:00 2001 From: krvpb024 Date: Sat, 27 Jan 2024 16:25:55 +0800 Subject: [PATCH] change header tag usage to match landmark meaning --- internal/template/templates/common/layout.html | 6 +++--- internal/template/templates/views/about.html | 6 +++--- internal/template/templates/views/add_subscription.html | 6 +++--- internal/template/templates/views/api_keys.html | 6 +++--- internal/template/templates/views/bookmark_entries.html | 6 +++--- internal/template/templates/views/categories.html | 6 +++--- internal/template/templates/views/category_entries.html | 6 +++--- internal/template/templates/views/category_feeds.html | 6 +++--- .../template/templates/views/choose_subscription.html | 6 +++--- internal/template/templates/views/create_api_key.html | 6 +++--- internal/template/templates/views/create_category.html | 6 +++--- internal/template/templates/views/create_user.html | 6 +++--- internal/template/templates/views/edit_category.html | 6 +++--- internal/template/templates/views/edit_feed.html | 6 +++--- internal/template/templates/views/edit_user.html | 6 +++--- internal/template/templates/views/entry.html | 6 +++--- internal/template/templates/views/feed_entries.html | 6 +++--- internal/template/templates/views/feeds.html | 6 +++--- internal/template/templates/views/history_entries.html | 6 +++--- internal/template/templates/views/import.html | 6 +++--- internal/template/templates/views/integrations.html | 8 ++++---- internal/template/templates/views/login.html | 2 +- internal/template/templates/views/search_entries.html | 6 +++--- internal/template/templates/views/sessions.html | 6 +++--- internal/template/templates/views/settings.html | 6 +++--- internal/template/templates/views/shared_entries.html | 6 +++--- internal/template/templates/views/unread_entries.html | 6 +++--- internal/template/templates/views/users.html | 6 +++--- internal/template/templates/views/webauthn_rename.html | 6 +++--- 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 @@ Skip to content -
+
{{ end }} {{ if .flashMessage }}
{{ .flashMessage }}
@@ -136,7 +136,7 @@
{{ .flashErrorMessage }}
{{ end }} - {{template "header" .}} + {{template "page_header" .}}
{{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"}} -
+{{ define "page_header"}} +

{{ t "page.about.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.add_feed.title" }}

{{ template "feed_menu" }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.api_keys.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.starred.title" }}

{{ t "page.starred.total" }}: {{ .total }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.categories.title" }} @@ -14,7 +14,7 @@ -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ .category.Title }} @@ -52,7 +52,7 @@ -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ .category.Title }} {{ t "page.feeds.title" }} @@ -34,7 +34,7 @@ -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.add_feed.title" }}

{{ template "feed_menu" }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.new_api_key.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.new_category.title" }}

-
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.new_user.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.edit_category.title" .category.Title }}

-
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ .feed.Title }}

-
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.edit_user.title" .selected_user.Username }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ .entry.Title }} @@ -144,7 +144,7 @@ {{ end }}

- + {{ 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"}} -
+{{ define "page_header"}} +

{{ .feed.Title }} @@ -70,7 +70,7 @@ -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.feeds.title" }} ({{ .total }})

{{ template "feed_menu" }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.history.title" }} @@ -25,7 +25,7 @@ -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.import.title" }}

{{ template "feed_menu" }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.integrations.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ end }} {{ define "content"}} @@ -144,7 +144,7 @@ - +
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"}}
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"}} -
+{{ define "page_header"}} +

{{ t "page.search.title" }} ({{ .total }})

-
+
{{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.sessions.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.settings.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.shared_entries.title" }} @@ -25,7 +25,7 @@ {{ end }} -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.unread.title" }} @@ -32,7 +32,7 @@ {{ end }} -

+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.users.title" }}

{{ template "settings_menu" dict "user" .user }} -
+ {{ 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"}} -
+{{ define "page_header"}} +

{{ t "page.webauthn_rename.title" }}

-
+ {{ end }} {{ define "content"}}