From 31f89233858ddc99cfee93048ab47e1ffbbd1907 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Apr 2023 12:28:36 +0200 Subject: [PATCH 1/9] Add placeholder attributes to release and wiki edit page --- .air.toml | 4 ++-- options/locale/locale_en-US.ini | 5 ++++- templates/repo/release/new.tmpl | 1 + templates/repo/wiki/new.tmpl | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.air.toml b/.air.toml index 069a88924388..84cfa2dc00b4 100644 --- a/.air.toml +++ b/.air.toml @@ -4,7 +4,7 @@ tmp_dir = ".air" [build] cmd = "make backend" bin = "gitea" -include_ext = ["go", "tmpl"] +include_ext = ["go", "tmpl", "ini"] exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata", "models/fixtures", "models/migrations/fixtures", "modules/migration/file_format_testdata", "modules/avatar/identicon/testdata"] -include_dir = ["cmd", "models", "modules", "options", "routers", "services"] +include_dir = ["cmd", "models", "modules", "options/locale", "routers", "services"] exclude_regex = ["_test.go$", "_gen.go$"] diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index eb1ffebc3771..29f5d5bb605a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1746,6 +1746,8 @@ wiki.create_first_page = Create the First Page wiki.page = Page wiki.filter_page = Filter page wiki.new_page = Page +wiki.title = Page Title +wiki.message = Page Content wiki.default_commit_message = Write a note about this page update (optional). wiki.save_page = Save Page wiki.last_commit_info = %s edited this page %s @@ -2311,8 +2313,9 @@ release.target = Target release.tag_helper = Choose an existing tag or create a new tag. release.tag_helper_new = New tag. This tag will be created from the target. release.tag_helper_existing = Existing tag. -release.title = Title +release.title = Release Title release.title_empty = Title cannot be empty. +release.message = Describe this Release release.content = Content release.prerelease_desc = Mark as Pre-Release release.prerelease_helper = Mark this release unsuitable for production use. diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index cd702d6aa679..a4b21653a38d 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -58,6 +58,7 @@ "MarkdownPreviewContext" .RepoLink "TextareaName" "content" "TextareaContent" .content + "TextareaPlaceholder" (.locale.Tr "repo.release.message") "DropzoneParentContainer" "form" )}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 57ab753e203a..480e7cee06d9 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -14,7 +14,7 @@
{{.CsrfTokenHtml}}
- +
{{.locale.Tr "repo.wiki.page_name_desc"}} @@ -29,10 +29,11 @@ "MarkdownPreviewUrl" (print .Repository.Link "/markup") "MarkdownPreviewContext" .RepoLink "TextareaName" "content" + "TextareaPlaceholder" (.locale.Tr "repo.wiki.message") "TextareaContent" $content )}} -
+
From 68284b7dd62312d38a25a4b352991aa995a33f1b Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Apr 2023 12:55:53 +0200 Subject: [PATCH 2/9] make release page more compact --- templates/repo/release/new.tmpl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index a4b21653a38d..04a5d8249fa7 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -39,19 +39,16 @@
- {{.locale.Tr "repo.release.tag_helper"}} + {{.locale.Tr "repo.release.tag_helper"}}
{{end}}
-
+
-
- - {{template "shared/combomarkdowneditor" (dict "locale" $.locale "MarkdownPreviewUrl" (print .Repository.Link "/markup") From 42af5403dc440065fbe59507af4af7884e7f327a Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Apr 2023 12:57:56 +0200 Subject: [PATCH 3/9] add quotes --- templates/repo/wiki/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 480e7cee06d9..ee913c8e1af4 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -14,7 +14,7 @@ {{.CsrfTokenHtml}}
- +
{{.locale.Tr "repo.wiki.page_name_desc"}} From 2f7d937efcc031bf0d2a52892596a186cffe55ef Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Apr 2023 13:00:02 +0200 Subject: [PATCH 4/9] remove unused locale string --- options/locale/locale_en-US.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 29f5d5bb605a..0c1200b83b48 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2316,7 +2316,6 @@ release.tag_helper_existing = Existing tag. release.title = Release Title release.title_empty = Title cannot be empty. release.message = Describe this Release -release.content = Content release.prerelease_desc = Mark as Pre-Release release.prerelease_helper = Mark this release unsuitable for production use. release.cancel = Cancel From 5c399047468684a739c25335425e728577419965 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Apr 2023 13:11:20 +0200 Subject: [PATCH 5/9] add aria-label --- options/locale/locale_en-US.ini | 4 ++-- templates/repo/release/new.tmpl | 3 ++- templates/repo/wiki/new.tmpl | 5 +++-- templates/shared/combomarkdowneditor.tmpl | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 0c1200b83b48..9e36dd376046 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1746,8 +1746,8 @@ wiki.create_first_page = Create the First Page wiki.page = Page wiki.filter_page = Filter page wiki.new_page = Page -wiki.title = Page Title -wiki.message = Page Content +wiki.page_title = Page Title +wiki.page_content = Page Content wiki.default_commit_message = Write a note about this page update (optional). wiki.save_page = Save Page wiki.last_commit_info = %s edited this page %s diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 04a5d8249fa7..33578caa3c17 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -46,7 +46,7 @@
- +
{{template "shared/combomarkdowneditor" (dict @@ -56,6 +56,7 @@ "TextareaName" "content" "TextareaContent" .content "TextareaPlaceholder" (.locale.Tr "repo.release.message") + "TextareaAriaLabel" (.locale.Tr "repo.release.message") "DropzoneParentContainer" "form" )}}
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index ee913c8e1af4..6a447ab5592e 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -14,7 +14,7 @@ {{.CsrfTokenHtml}}
- +
{{.locale.Tr "repo.wiki.page_name_desc"}} @@ -29,7 +29,8 @@ "MarkdownPreviewUrl" (print .Repository.Link "/markup") "MarkdownPreviewContext" .RepoLink "TextareaName" "content" - "TextareaPlaceholder" (.locale.Tr "repo.wiki.message") + "TextareaPlaceholder" (.locale.Tr "repo.wiki.page_content") + "TextareaAriaLabel" (.locale.Tr "repo.wiki.page_content") "TextareaContent" $content )}} diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 887673e40e0b..d0cf34024dd1 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -40,7 +40,7 @@ Template Attributes:
- +
From bb2532b230cdb2388721175941cbe190ca3f3a68 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 10 Apr 2023 13:14:27 +0200 Subject: [PATCH 6/9] more aria-label --- templates/repo/release/new.tmpl | 2 +- templates/repo/wiki/new.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 33578caa3c17..7a4e28cffa1b 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -19,7 +19,7 @@ {{if .PageIsEditRelease}} {{.tag_name}}@{{.tag_target}} {{else}} - +
@ diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 6a447ab5592e..0765cb2c353d 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -35,7 +35,7 @@ )}}
- +