From b60510067ffc3c4f339123723d3e8e39ca045665 Mon Sep 17 00:00:00 2001 From: krvpb024 Date: Mon, 5 Feb 2024 14:20:05 +0800 Subject: [PATCH] add alert role to alert message element --- internal/template/templates/common/layout.html | 4 ++-- internal/template/templates/views/add_subscription.html | 4 ++-- internal/template/templates/views/bookmark_entries.html | 2 +- internal/template/templates/views/categories.html | 2 +- internal/template/templates/views/category_entries.html | 2 +- internal/template/templates/views/category_feeds.html | 2 +- internal/template/templates/views/create_api_key.html | 2 +- internal/template/templates/views/create_category.html | 2 +- internal/template/templates/views/create_user.html | 2 +- internal/template/templates/views/edit_category.html | 2 +- internal/template/templates/views/edit_feed.html | 8 ++++---- internal/template/templates/views/edit_user.html | 2 +- internal/template/templates/views/feed_entries.html | 6 +++--- internal/template/templates/views/feeds.html | 2 +- internal/template/templates/views/history_entries.html | 2 +- internal/template/templates/views/import.html | 2 +- internal/template/templates/views/integrations.html | 2 +- internal/template/templates/views/login.html | 4 ++-- internal/template/templates/views/search_entries.html | 2 +- internal/template/templates/views/settings.html | 4 ++-- internal/template/templates/views/shared_entries.html | 2 +- internal/template/templates/views/unread_entries.html | 2 +- internal/template/templates/views/users.html | 2 +- internal/template/templates/views/webauthn_rename.html | 2 +- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/internal/template/templates/common/layout.html b/internal/template/templates/common/layout.html index ac479fc31ad..bc571f3ca19 100644 --- a/internal/template/templates/common/layout.html +++ b/internal/template/templates/common/layout.html @@ -134,10 +134,10 @@ {{ end }} {{ if .flashMessage }} -
{{ .flashMessage }}
+ {{ end }} {{ if .flashErrorMessage }} -
{{ .flashErrorMessage }}
+ {{ end }} {{template "page_header" .}} diff --git a/internal/template/templates/views/add_subscription.html b/internal/template/templates/views/add_subscription.html index d23e70539d5..204d5cba179 100644 --- a/internal/template/templates/views/add_subscription.html +++ b/internal/template/templates/views/add_subscription.html @@ -9,13 +9,13 @@

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

{{ define "content"}} {{ if not .categories }} -

{{ t "page.add_feed.no_category" }}

+ {{ else }}
{{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/bookmark_entries.html b/internal/template/templates/views/bookmark_entries.html index 84e64430d88..3facf96ab17 100644 --- a/internal/template/templates/views/bookmark_entries.html +++ b/internal/template/templates/views/bookmark_entries.html @@ -12,7 +12,7 @@

{{ define "content"}} {{ if not .entries }} -

{{ t "alert.no_bookmark" }}

+ {{ else }}
{{ template "pagination" .pagination }} diff --git a/internal/template/templates/views/categories.html b/internal/template/templates/views/categories.html index 9856207dff6..ba9803542d6 100644 --- a/internal/template/templates/views/categories.html +++ b/internal/template/templates/views/categories.html @@ -19,7 +19,7 @@

{{ define "content"}} {{ if not .categories }} -

{{ t "alert.no_category" }}

+ {{ else }}
{{ range .categories }} diff --git a/internal/template/templates/views/category_entries.html b/internal/template/templates/views/category_entries.html index 8551eb22e71..e4c11a2f10a 100644 --- a/internal/template/templates/views/category_entries.html +++ b/internal/template/templates/views/category_entries.html @@ -57,7 +57,7 @@

{{ define "content"}} {{ if not .entries }} -

{{ t "alert.no_category_entry" }}

+ {{ else }}
{{ template "pagination" .pagination }} diff --git a/internal/template/templates/views/category_feeds.html b/internal/template/templates/views/category_feeds.html index bcb9a0266a0..326d161de1e 100644 --- a/internal/template/templates/views/category_feeds.html +++ b/internal/template/templates/views/category_feeds.html @@ -37,7 +37,7 @@

{{ define "content"}} {{ if not .feeds }} -

{{ t "alert.no_feed_in_category" }}

+ {{ else }} {{ template "feed_list" dict "user" .user "feeds" .feeds "ParsingErrorCount" .ParsingErrorCount }} {{ end }} diff --git a/internal/template/templates/views/create_api_key.html b/internal/template/templates/views/create_api_key.html index 8f5b5959f88..05b6e85e6e6 100644 --- a/internal/template/templates/views/create_api_key.html +++ b/internal/template/templates/views/create_api_key.html @@ -12,7 +12,7 @@

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

{{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/create_category.html b/internal/template/templates/views/create_category.html index cad6a22dc3b..319d13343b1 100644 --- a/internal/template/templates/views/create_category.html +++ b/internal/template/templates/views/create_category.html @@ -18,7 +18,7 @@

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

{{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/create_user.html b/internal/template/templates/views/create_user.html index 2c4aecb4fb3..beac5688f19 100644 --- a/internal/template/templates/views/create_user.html +++ b/internal/template/templates/views/create_user.html @@ -12,7 +12,7 @@

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

{{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/edit_category.html b/internal/template/templates/views/edit_category.html index 97b0c28762d..6c8eccf132f 100644 --- a/internal/template/templates/views/edit_category.html +++ b/internal/template/templates/views/edit_category.html @@ -24,7 +24,7 @@

{{ t "page.edit_category.title" .category.Title }} {{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/edit_feed.html b/internal/template/templates/views/edit_feed.html index c066b9641b4..e518c9bd436 100644 --- a/internal/template/templates/views/edit_feed.html +++ b/internal/template/templates/views/edit_feed.html @@ -28,10 +28,10 @@

{{ .feed.Title }}

{{ define "content"}} {{ if not .categories }} -

{{ t "page.add_feed.no_category" }}

+ {{ else }} {{ if ne .feed.ParsingErrorCount 0 }} -
+ @@ -41,7 +41,7 @@

{{ t "page.edit_feed.last_parsing_error" }}

{{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }}
@@ -200,7 +200,7 @@

{{ t "page.edit_feed.last_parsing_error" }}

-
+