Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add placeholder and aria attributes to release and wiki edit page #24031

Merged
merged 10 commits into from
Apr 10, 2023
Merged

Add placeholder and aria attributes to release and wiki edit page #24031

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31f8923
Add placeholder attributes to release and wiki edit page
silverwind Apr 10, 2023
68284b7
make release page more compact
silverwind Apr 10, 2023
42af540
add quotes
silverwind Apr 10, 2023
2f7d937
remove unused locale string
silverwind Apr 10, 2023
5c39904
add aria-label
silverwind Apr 10, 2023
bb2532b
more aria-label
silverwind Apr 10, 2023
2bf911c
revert air change
silverwind Apr 10, 2023
06de744
update template docs
silverwind Apr 10, 2023
f3bd81d
remove title cases
silverwind Apr 10, 2023
ea0d15d
Merge branch 'main' into placeholders
jolheiser Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .air.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
silverwind marked this conversation as resolved.
Show resolved Hide resolved
exclude_regex = ["_test.go$", "_gen.go$"]
6 changes: 4 additions & 2 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.page_title = Page Title
wiki.page_content = Page Content
silverwind marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -2311,9 +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.content = Content
release.message = Describe this Release
silverwind marked this conversation as resolved.
Show resolved Hide resolved
release.prerelease_desc = Mark as Pre-Release
release.prerelease_helper = Mark this release unsuitable for production use.
release.cancel = Cancel
Expand Down
11 changes: 5 additions & 6 deletions templates/repo/release/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,24 @@
</div>
</div>
<div>
<span id="tag-helper" class="help gt-mt-2">{{.locale.Tr "repo.release.tag_helper"}}</span>
<span id="tag-helper" class="help gt-mt-3 gt-pb-0">{{.locale.Tr "repo.release.tag_helper"}}</span>
</div>
{{end}}
</div>
</div>
<div class="eleven wide column">
<div class="eleven wide column gt-pt-0">
<div class="field {{if .Err_Title}}error{{end}}">
<label>{{.locale.Tr "repo.release.title"}}</label>
<input name="title" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
<input name="title" aria-label="{{.locale.Tr "repo.release.title"}}" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
</div>
<div class="field">
<label>{{.locale.Tr "repo.release.content"}}</label>

{{template "shared/combomarkdowneditor" (dict
"locale" $.locale
"MarkdownPreviewUrl" (print .Repository.Link "/markup")
"MarkdownPreviewContext" .RepoLink
"TextareaName" "content"
"TextareaContent" .content
"TextareaPlaceholder" (.locale.Tr "repo.release.message")
"TextareaAriaLabel" (.locale.Tr "repo.release.message")
"DropzoneParentContainer" "form"
)}}
</div>
Expand Down
6 changes: 4 additions & 2 deletions templates/repo/wiki/new.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<form class="ui form" action="{{.Link}}?action={{if .PageIsWikiEdit}}_edit{{else}}_new{{end}}" method="post">
{{.CsrfTokenHtml}}
<div class="field {{if .Err_Title}}error{{end}}">
<input name="title" value="{{.title}}" autofocus required>
<input name="title" value="{{.title}}" aria-label="{{.locale.Tr "repo.wiki.page_title"}}" placeholder="{{.locale.Tr "repo.wiki.page_title"}}" autofocus required>
</div>
<div class="help">
{{.locale.Tr "repo.wiki.page_name_desc"}}
Expand All @@ -29,10 +29,12 @@
"MarkdownPreviewUrl" (print .Repository.Link "/markup")
"MarkdownPreviewContext" .RepoLink
"TextareaName" "content"
"TextareaPlaceholder" (.locale.Tr "repo.wiki.page_content")
"TextareaAriaLabel" (.locale.Tr "repo.wiki.page_content")
"TextareaContent" $content
)}}

<div class="field">
<div class="field gt-mt-4">
<input name="message" placeholder="{{.locale.Tr "repo.wiki.default_commit_message"}}">
</div>
<div class="text right">
Expand Down
2 changes: 1 addition & 1 deletion templates/shared/combomarkdowneditor.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Template Attributes:
</div>
</markdown-toolbar>
<text-expander keys=": @">
<textarea class="markdown-text-editor js-quick-submit" name="{{.TextareaName}}" placeholder="{{.TextareaPlaceholder}}">{{.TextareaContent}}</textarea>
<textarea class="markdown-text-editor js-quick-submit"{{if .TextareaName}} name="{{.TextareaName}}"{{end}}{{if .TextareaPlaceholder}} placeholder="{{.TextareaPlaceholder}}"{{end}}{{if .TextareaAriaLabel}} aria-label="{{.TextareaAriaLabel}}"{{end}}>{{.TextareaContent}}</textarea>
silverwind marked this conversation as resolved.
Show resolved Hide resolved
</text-expander>
</div>
<div class="ui tab markup" data-tab-panel="markdown-previewer">
Expand Down