Skip to content

Commit d7552c2

Browse files
authored
Add placeholder and aria attributes to release and wiki edit page (#24031)
- Add placeholders and aria-label all input fields on these two pages - Add margin before wiki change message - Remove labels from release page, replacing them with aria-label
1 parent cb15364 commit d7552c2

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

options/locale/locale_en-US.ini

+4-2
Original file line numberDiff line numberDiff line change
@@ -1746,6 +1746,8 @@ wiki.create_first_page = Create the First Page
17461746
wiki.page = Page
17471747
wiki.filter_page = Filter page
17481748
wiki.new_page = Page
1749+
wiki.page_title = Page title
1750+
wiki.page_content = Page content
17491751
wiki.default_commit_message = Write a note about this page update (optional).
17501752
wiki.save_page = Save Page
17511753
wiki.last_commit_info = %s edited this page %s
@@ -2311,9 +2313,9 @@ release.target = Target
23112313
release.tag_helper = Choose an existing tag or create a new tag.
23122314
release.tag_helper_new = New tag. This tag will be created from the target.
23132315
release.tag_helper_existing = Existing tag.
2314-
release.title = Title
2316+
release.title = Release title
23152317
release.title_empty = Title cannot be empty.
2316-
release.content = Content
2318+
release.message = Describe this release
23172319
release.prerelease_desc = Mark as Pre-Release
23182320
release.prerelease_helper = Mark this release unsuitable for production use.
23192321
release.cancel = Cancel

templates/repo/release/new.tmpl

+6-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{{if .PageIsEditRelease}}
2020
<b>{{.tag_name}}</b><span class="at">@</span><strong>{{.tag_target}}</strong>
2121
{{else}}
22-
<input id="tag-name" name="tag_name" value="{{.tag_name}}" placeholder="{{.locale.Tr "repo.release.tag_name"}}" autofocus required maxlength="255">
22+
<input id="tag-name" name="tag_name" value="{{.tag_name}}" aria-label="{{.locale.Tr "repo.release.tag_name"}}" placeholder="{{.locale.Tr "repo.release.tag_name"}}" autofocus required maxlength="255">
2323
<input id="tag-name-editor" type="hidden" data-existing-tags={{Json .Tags}} data-tag-helper={{.locale.Tr "repo.release.tag_helper"}} data-tag-helper-new={{.locale.Tr "repo.release.tag_helper_new"}} data-tag-helper-existing={{.locale.Tr "repo.release.tag_helper_existing"}}>
2424
<div id="tag-target-selector" class="gt-dib">
2525
<span class="at">@</span>
@@ -39,25 +39,24 @@
3939
</div>
4040
</div>
4141
<div>
42-
<span id="tag-helper" class="help gt-mt-2">{{.locale.Tr "repo.release.tag_helper"}}</span>
42+
<span id="tag-helper" class="help gt-mt-3 gt-pb-0">{{.locale.Tr "repo.release.tag_helper"}}</span>
4343
</div>
4444
{{end}}
4545
</div>
4646
</div>
47-
<div class="eleven wide column">
47+
<div class="eleven wide column gt-pt-0">
4848
<div class="field {{if .Err_Title}}error{{end}}">
49-
<label>{{.locale.Tr "repo.release.title"}}</label>
50-
<input name="title" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
49+
<input name="title" aria-label="{{.locale.Tr "repo.release.title"}}" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
5150
</div>
5251
<div class="field">
53-
<label>{{.locale.Tr "repo.release.content"}}</label>
54-
5552
{{template "shared/combomarkdowneditor" (dict
5653
"locale" $.locale
5754
"MarkdownPreviewUrl" (print .Repository.Link "/markup")
5855
"MarkdownPreviewContext" .RepoLink
5956
"TextareaName" "content"
6057
"TextareaContent" .content
58+
"TextareaPlaceholder" (.locale.Tr "repo.release.message")
59+
"TextareaAriaLabel" (.locale.Tr "repo.release.message")
6160
"DropzoneParentContainer" "form"
6261
)}}
6362
</div>

templates/repo/wiki/new.tmpl

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<form class="ui form" action="{{.Link}}?action={{if .PageIsWikiEdit}}_edit{{else}}_new{{end}}" method="post">
1515
{{.CsrfTokenHtml}}
1616
<div class="field {{if .Err_Title}}error{{end}}">
17-
<input name="title" value="{{.title}}" autofocus required>
17+
<input name="title" value="{{.title}}" aria-label="{{.locale.Tr "repo.wiki.page_title"}}" placeholder="{{.locale.Tr "repo.wiki.page_title"}}" autofocus required>
1818
</div>
1919
<div class="help">
2020
{{.locale.Tr "repo.wiki.page_name_desc"}}
@@ -29,11 +29,13 @@
2929
"MarkdownPreviewUrl" (print .Repository.Link "/markup")
3030
"MarkdownPreviewContext" .RepoLink
3131
"TextareaName" "content"
32+
"TextareaPlaceholder" (.locale.Tr "repo.wiki.page_content")
33+
"TextareaAriaLabel" (.locale.Tr "repo.wiki.page_content")
3234
"TextareaContent" $content
3335
)}}
3436

35-
<div class="field">
36-
<input name="message" placeholder="{{.locale.Tr "repo.wiki.default_commit_message"}}">
37+
<div class="field gt-mt-4">
38+
<input name="message" aria-label="{{.locale.Tr "repo.wiki.default_commit_message"}}" placeholder="{{.locale.Tr "repo.wiki.default_commit_message"}}">
3739
</div>
3840
<div class="text right">
3941
<button class="ui green button">

templates/shared/combomarkdowneditor.tmpl

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{{/*
22
Template Attributes:
3-
* locale
4-
* ContainerId / ContainerClasses : for the container element
5-
* MarkdownPreviewUrl / MarkdownPreviewContext: for the preview tab
6-
* TextareaName / TextareaContent / TextareaPlaceholder: for the main textarea
7-
* DropzoneParentContainer: for file upload (leave it empty if no upload)
3+
* locale: passed through for localization
4+
* ContainerId: id attribute for the container element
5+
* ContainerClasses: additional classes for the container element
6+
* MarkdownPreviewUrl: preview url for the preview tab
7+
* MarkdownPreviewContext: preview context for the preview tab
8+
* TextareaName: name attribute for the textarea
9+
* TextareaContent: content for the textarea
10+
* TextareaPlaceholder: placeholder attribute for the textarea
11+
* TextareaAriaLabel: aria-label attribute for the textarea
12+
* DropzoneParentContainer: container for file upload (leave it empty if no upload)
813
*/}}
914
<div {{if .ContainerId}}id="{{.ContainerId}}"{{end}} class="combo-markdown-editor {{.ContainerClasses}}" data-dropzone-parent-container="{{.DropzoneParentContainer}}">
1015
{{if .MarkdownPreviewUrl}}
@@ -40,7 +45,7 @@ Template Attributes:
4045
</div>
4146
</markdown-toolbar>
4247
<text-expander keys=": @">
43-
<textarea class="markdown-text-editor js-quick-submit" name="{{.TextareaName}}" placeholder="{{.TextareaPlaceholder}}">{{.TextareaContent}}</textarea>
48+
<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>
4449
</text-expander>
4550
</div>
4651
<div class="ui tab markup" data-tab-panel="markdown-previewer">

0 commit comments

Comments
 (0)