diff --git a/internal/template/templates/common/layout.html b/internal/template/templates/common/layout.html index ac479fc3..bc571f3c 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 d23e7053..204d5cba 100644 --- a/internal/template/templates/views/add_subscription.html +++ b/internal/template/templates/views/add_subscription.html @@ -9,13 +9,13 @@ {{ 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 84e64430..3facf96a 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 9856207d..ba980354 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 d614eda4..0c46ebd4 100644 --- a/internal/template/templates/views/category_entries.html +++ b/internal/template/templates/views/category_entries.html @@ -59,7 +59,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 fcc88f7a..9930081f 100644 --- a/internal/template/templates/views/category_feeds.html +++ b/internal/template/templates/views/category_feeds.html @@ -38,7 +38,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 8f5b5959..05b6e85e 100644 --- a/internal/template/templates/views/create_api_key.html +++ b/internal/template/templates/views/create_api_key.html @@ -12,7 +12,7 @@ {{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/create_category.html b/internal/template/templates/views/create_category.html index cad6a22d..319d1334 100644 --- a/internal/template/templates/views/create_category.html +++ b/internal/template/templates/views/create_category.html @@ -18,7 +18,7 @@ {{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/create_user.html b/internal/template/templates/views/create_user.html index 2c4aecb4..beac5688 100644 --- a/internal/template/templates/views/create_user.html +++ b/internal/template/templates/views/create_user.html @@ -12,7 +12,7 @@ {{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/edit_category.html b/internal/template/templates/views/edit_category.html index 97b0c287..6c8eccf1 100644 --- a/internal/template/templates/views/edit_category.html +++ b/internal/template/templates/views/edit_category.html @@ -24,7 +24,7 @@ {{ if .errorMessage }} -
{{ .errorMessage }}
+ {{ end }} diff --git a/internal/template/templates/views/edit_feed.html b/internal/template/templates/views/edit_feed.html index c066b964..e518c9bd 100644 --- a/internal/template/templates/views/edit_feed.html +++ b/internal/template/templates/views/edit_feed.html @@ -28,10 +28,10 @@ {{ define "content"}} {{ if not .categories }} -

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

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