From 0590cb7048adfb4bde52372dc2b332e65f22b7b0 Mon Sep 17 00:00:00 2001 From: SIkebe Date: Mon, 14 Sep 2020 10:42:50 +0900 Subject: [PATCH] Improve accessibility (#2552) * Document language missing * Missing form label * Image elements do not have [alt] attributes * Fix metals specific configuration * [user-scalable="no"] is used in the element or the [maximum-scale] attribute is less than 5 * Fix AvatarImageProviderSpec * [id] attributes on active, focusable elements are not unique * Links do not have a discernible name * Links to cross-origin destinations are unsafe --- .gitignore | 6 +- .../core/view/AvatarImageProvider.scala | 4 +- .../gitbucket/core/account/edit.scala.html | 2 +- .../core/account/groupform.scala.html | 6 +- .../gitbucket/core/account/hooks.scala.html | 6 +- .../gitbucket/core/account/newrepo.scala.html | 4 +- .../gitbucket/core/admin/data.scala.html | 88 +++++++++---------- .../core/admin/settings_system.scala.html | 10 +-- .../gitbucket/core/admin/user.scala.html | 6 +- .../core/dashboard/issueslist.scala.html | 4 +- .../gitbucket/core/dashboard/repos.scala.html | 2 +- .../core/dashboard/sidebar.scala.html | 2 +- .../gitbucket/core/helper/account.scala.html | 2 +- .../core/helper/commitcomment.scala.html | 4 +- .../core/helper/datepicker.scala.html | 26 +++--- .../gitbucket/core/helper/dropdown.scala.html | 3 +- .../gitbucket/core/helper/preview.scala.html | 3 +- .../core/issues/commentform.scala.html | 2 +- .../gitbucket/core/issues/list.scala.html | 4 +- .../core/issues/listparts.scala.html | 8 +- .../core/issues/milestones/edit.scala.html | 2 +- src/main/twirl/gitbucket/core/main.scala.html | 8 +- .../core/pulls/mergeguide.scala.html | 2 +- .../gitbucket/core/releases/form.scala.html | 8 +- .../twirl/gitbucket/core/repo/blob.scala.html | 4 +- .../gitbucket/core/repo/editor.scala.html | 12 ++- .../gitbucket/core/repo/files.scala.html | 8 +- .../twirl/gitbucket/core/repo/find.scala.html | 2 +- .../core/settings/branches.scala.html | 4 +- .../gitbucket/core/settings/danger.scala.html | 2 +- .../core/settings/edithookform.scala.html | 8 +- .../gitbucket/core/settings/hooks.scala.html | 2 +- .../twirl/gitbucket/core/wiki/edit.scala.html | 3 +- .../gitbucket/core/wiki/history.scala.html | 2 +- .../twirl/gitbucket/core/wiki/page.scala.html | 6 +- src/main/webapp/assets/common/js/gitbucket.js | 2 +- .../core/view/AvatarImageProviderSpec.scala | 14 +-- 37 files changed, 143 insertions(+), 138 deletions(-) diff --git a/.gitignore b/.gitignore index d2cedb993..5769fee83 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,8 @@ project/plugins/project/ # Metals specific .metals .bloop -project/metals.sbt \ No newline at end of file +**/metals.sbt + +# Visual Studio Code specific +.vscode + diff --git a/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala index 3df7c8602..cd1b0966e 100644 --- a/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala +++ b/src/main/scala/gitbucket/core/view/AvatarImageProvider.scala @@ -45,11 +45,11 @@ trait AvatarImageProvider { self: RequestCache => if (tooltip) { Html( - s"""""" + s"""@${userName}""" ) } else { Html( - s"""""" + s"""@${userName}""" ) } } diff --git a/src/main/twirl/gitbucket/core/account/edit.scala.html b/src/main/twirl/gitbucket/core/account/edit.scala.html index 25c3dc028..2ba6424dc 100644 --- a/src/main/twirl/gitbucket/core/account/edit.scala.html +++ b/src/main/twirl/gitbucket/core/account/edit.scala.html @@ -34,7 +34,7 @@
Additional Mail Address: @extraMailAddresses.zipWithIndex.map { case (mail, idx) => - + }
diff --git a/src/main/twirl/gitbucket/core/account/groupform.scala.html b/src/main/twirl/gitbucket/core/account/groupform.scala.html index 6d74cc179..6d5ebc2bc 100644 --- a/src/main/twirl/gitbucket/core/account/groupform.scala.html +++ b/src/main/twirl/gitbucket/core/account/groupform.scala.html @@ -17,14 +17,14 @@ }
- +
- +
@@ -119,7 +119,7 @@ $(function(){ .append(' ') .append($('').attr('href', '@context.path/' + userName).text(userName)) .append(' ') - .append($(''))); + .append($(''))); } function updateMembers(){ diff --git a/src/main/twirl/gitbucket/core/account/hooks.scala.html b/src/main/twirl/gitbucket/core/account/hooks.scala.html index 66c0e607a..5b2bd1731 100644 --- a/src/main/twirl/gitbucket/core/account/hooks.scala.html +++ b/src/main/twirl/gitbucket/core/account/hooks.scala.html @@ -13,7 +13,7 @@

These webhooks notify external services when certain events occur within any of your repositories. When any of the specified events occur, GitBucket will send a POST request to all of the endpoints (URLs) you provide. - Learn more about this feature on the GitBucket Wiki. + Learn more about this feature on the GitBucket Wiki.

Add webhook @@ -27,10 +27,10 @@
- + - +
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html index 4fcaaf4ad..4b8be892f 100644 --- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html +++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html @@ -32,7 +32,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
Repository name
- +
@@ -86,7 +86,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C Create a new repository by cloning an existing git repository. - +
diff --git a/src/main/twirl/gitbucket/core/admin/data.scala.html b/src/main/twirl/gitbucket/core/admin/data.scala.html index fadc0f384..92de87e72 100644 --- a/src/main/twirl/gitbucket/core/admin/data.scala.html +++ b/src/main/twirl/gitbucket/core/admin/data.scala.html @@ -1,44 +1,44 @@ -@(tableNames: Seq[String])(implicit context: gitbucket.core.controller.Context) -@gitbucket.core.html.main("Data export / import"){ - @gitbucket.core.admin.html.menu("data") { -
-
Export
-
-
- @tableNames.map { tableName => -
- -
- } - -
-
-
- -
-
Import
-
-
- - -
-
-
- } -} - \ No newline at end of file +@(tableNames: Seq[String])(implicit context: gitbucket.core.controller.Context) +@gitbucket.core.html.main("Data export / import"){ + @gitbucket.core.admin.html.menu("data") { +
+
Export
+
+
+ @tableNames.map { tableName => +
+ +
+ } + +
+
+
+ +
+
Import
+
+
+ + +
+
+
+ } +} + diff --git a/src/main/twirl/gitbucket/core/admin/settings_system.scala.html b/src/main/twirl/gitbucket/core/admin/settings_system.scala.html index f728a0c71..3babcebeb 100644 --- a/src/main/twirl/gitbucket/core/admin/settings_system.scala.html +++ b/src/main/twirl/gitbucket/core/admin/settings_system.scala.html @@ -35,7 +35,7 @@
- +
@@ -51,9 +51,9 @@
- +
- +
@@ -97,9 +97,9 @@
- +
- +
diff --git a/src/main/twirl/gitbucket/core/admin/user.scala.html b/src/main/twirl/gitbucket/core/admin/user.scala.html index ae791bb35..f74193297 100644 --- a/src/main/twirl/gitbucket/core/admin/user.scala.html +++ b/src/main/twirl/gitbucket/core/admin/user.scala.html @@ -53,7 +53,7 @@
Additional Mail Address: @extraMailAddresses.zipWithIndex.map { case (mail, idx) => - + }
@@ -67,14 +67,14 @@
- +
- +
diff --git a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html index 74493e9d9..5476ad5bb 100644 --- a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html @@ -22,9 +22,9 @@ @issue.userName/@issue.repositoryName ･ @if(issue.isPullRequest){ - @issue.title + @issue.title } else { - @issue.title + @issue.title } @gitbucket.core.issues.html.commitstatus(issue, commitStatus) @labels.map { label => diff --git a/src/main/twirl/gitbucket/core/dashboard/repos.scala.html b/src/main/twirl/gitbucket/core/dashboard/repos.scala.html index 5a9b5a0b7..3e268d986 100644 --- a/src/main/twirl/gitbucket/core/dashboard/repos.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/repos.scala.html @@ -7,7 +7,7 @@ @gitbucket.core.dashboard.html.tab("repos")
- diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html index 8de6f5bbc..35a40452d 100644 --- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html @@ -7,7 +7,7 @@ @if(recentRepositories.isEmpty){
  • No repositories
    • } else { -
    • +
    • @recentRepositories.zipWithIndex.map { case (repository, i) =>
  • @gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/@repository.name diff --git a/src/main/twirl/gitbucket/core/helper/account.scala.html b/src/main/twirl/gitbucket/core/helper/account.scala.html index 80ab8ba16..835f41076 100644 --- a/src/main/twirl/gitbucket/core/helper/account.scala.html +++ b/src/main/twirl/gitbucket/core/helper/account.scala.html @@ -1,6 +1,6 @@ @(id: String, width: Int, user: Boolean, group: Boolean)(implicit context: gitbucket.core.controller.Context) - + +@(name: String, value: Option[java.util.Date]) +@import gitbucket.core.view.helpers +
    + + +
    + diff --git a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html index 927b9853e..36533ffc6 100644 --- a/src/main/twirl/gitbucket/core/helper/dropdown.scala.html +++ b/src/main/twirl/gitbucket/core/helper/dropdown.scala.html @@ -6,8 +6,7 @@ filter: (String, String) = ("",""))(body: Html) @defining(if(filter._1.isEmpty) "" else filter._1 + "-" + scala.util.Random.alphanumeric.take(4).mkString){ filterId =>
    -
      diff --git a/src/main/twirl/gitbucket/core/issues/list.scala.html b/src/main/twirl/gitbucket/core/issues/list.scala.html index 4421b2e18..b84f98fa7 100644 --- a/src/main/twirl/gitbucket/core/issues/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/list.scala.html @@ -26,10 +26,10 @@
    - + - +
    @if(isEditable){ diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index 716b8fa0a..2a9745e82 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -26,7 +26,7 @@ - + @gitbucket.core.helper.html.dropdown("Author", filter = ("author", "Find Author...")) { @collaborators.map { collaborator => @@ -210,7 +210,7 @@ @if(isManageable){ - + } @* @@ -219,9 +219,9 @@ @issue.repositoryName ･ } @if(target == "issues"){ - @issue.title + @issue.title } else { - @issue.title + @issue.title } @gitbucket.core.issues.html.commitstatus(issue, commitStatus) @labels.map { label => diff --git a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html index 1e3c6a3f0..996d4d3c8 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/edit.scala.html @@ -10,7 +10,7 @@
    - +
    diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html index 5d0f8881d..0e9b6a9c0 100644 --- a/src/main/twirl/gitbucket/core/main.scala.html +++ b/src/main/twirl/gitbucket/core/main.scala.html @@ -2,10 +2,10 @@ @import gitbucket.core.plugin.PluginRegistry @import gitbucket.core.view.helpers - + - + @title @@ -78,7 +78,7 @@ }
    - +
      @@ -96,7 +96,7 @@
        @if(context.loginAccount.isDefined){
      • - +
          diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html index 8ee25305d..3b4064238 100644 --- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -128,7 +128,7 @@ }
    - + }

    diff --git a/src/main/twirl/gitbucket/core/releases/form.scala.html b/src/main/twirl/gitbucket/core/releases/form.scala.html index e69e5099e..1fda93ad3 100644 --- a/src/main/twirl/gitbucket/core/releases/form.scala.html +++ b/src/main/twirl/gitbucket/core/releases/form.scala.html @@ -15,9 +15,10 @@

    Update release for @tag.name

    } - +
    - Previous tag: @tags.map { tag => } @@ -36,7 +37,8 @@ completionContext = "releases", style = "height: 200px; max-height: 500px;", elastic = true, - placeholder = "Describe this release" + placeholder = "Describe this release", + ariaLabel = "Release content" )
      @release.map { case (release, assets) => diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html index 48348f62d..da5326e8b 100644 --- a/src/main/twirl/gitbucket/core/repo/blob.scala.html +++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html @@ -69,10 +69,10 @@ } History @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){ - + } @if(hasWritePermission && repository.branchList.contains(branch)){ - + }
    diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html index a97bc55ca..9223dd28b 100644 --- a/src/main/twirl/gitbucket/core/repo/editor.scala.html +++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html @@ -23,7 +23,7 @@ @pathList.zipWithIndex.map { case (section, i) => @section / } - + @@ -32,7 +32,7 @@
    - @@ -40,7 +40,7 @@
    - @@ -96,11 +96,9 @@
    -
    - Commit changes -
    +
    - +
    @if(fileName.isEmpty){ diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index 16a62837c..cd341a934 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -34,7 +34,7 @@
    Download ZIP - + @if(commitCount > 10000){10000+} else {@commitCount} @helpers.plural(commitCount, "commit")
    Transfer to URL with SHA @@ -43,7 +43,7 @@
    @if(context.platform != "linux" && context.platform != null){ - + }
    @@ -71,7 +71,7 @@
    } - + }
    @@ -203,7 +203,7 @@ @filePath.last @if(hasWritePermission){
    - +
    }
    diff --git a/src/main/twirl/gitbucket/core/repo/find.scala.html b/src/main/twirl/gitbucket/core/repo/find.scala.html index d8bf046c0..8bc1c0795 100644 --- a/src/main/twirl/gitbucket/core/repo/find.scala.html +++ b/src/main/twirl/gitbucket/core/repo/find.scala.html @@ -10,7 +10,7 @@
    @repository.name / - +
    diff --git a/src/main/twirl/gitbucket/core/settings/branches.scala.html b/src/main/twirl/gitbucket/core/settings/branches.scala.html index 3ecbba1a0..02b11706d 100644 --- a/src/main/twirl/gitbucket/core/settings/branches.scala.html +++ b/src/main/twirl/gitbucket/core/settings/branches.scala.html @@ -21,7 +21,7 @@

    The default branch is considered the “base” branch in your repository, against which all pull requests and code commits are automatically made (unless you specify a different branch).

    - @repository.branchList.map { branch => } @@ -36,7 +36,7 @@

    Protect branches to disable force pushing, prevent branches from being deleted, and optionally, require status checks before merging. - @repository.branchList.map { branch => diff --git a/src/main/twirl/gitbucket/core/settings/danger.scala.html b/src/main/twirl/gitbucket/core/settings/danger.scala.html index 2927f5ad3..34069ef55 100644 --- a/src/main/twirl/gitbucket/core/settings/danger.scala.html +++ b/src/main/twirl/gitbucket/core/settings/danger.scala.html @@ -23,7 +23,7 @@

    Rename this repository. This will make the current URL unavailable.
    - +
    diff --git a/src/main/twirl/gitbucket/core/settings/edithookform.scala.html b/src/main/twirl/gitbucket/core/settings/edithookform.scala.html index 3923e5524..ed6f600e8 100644 --- a/src/main/twirl/gitbucket/core/settings/edithookform.scala.html +++ b/src/main/twirl/gitbucket/core/settings/edithookform.scala.html @@ -16,7 +16,7 @@
    - +
    @@ -29,15 +29,15 @@
    - +
    -
    - +
    diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html index 59ecb3bf7..d6086ac33 100644 --- a/src/main/twirl/gitbucket/core/settings/hooks.scala.html +++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html @@ -14,7 +14,7 @@

    Webhooks notify external services when certain events occur within this repository. When any of the specified events occur, GitBucket will send a POST request to all of the endpoints (URLs) you provide. - Learn more about this feature on the GitBucket Wiki. + Learn more about this feature on the GitBucket Wiki.

    Add webhook diff --git a/src/main/twirl/gitbucket/core/wiki/edit.scala.html b/src/main/twirl/gitbucket/core/wiki/edit.scala.html index 7399f95d5..e0f95d880 100644 --- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html @@ -14,7 +14,7 @@

    Editing @if(pageName.isEmpty){New Page} else {@pageName}

    - +
    @gitbucket.core.helper.html.preview( repository = repository, @@ -28,6 +28,7 @@ style = "height: 400px;", styleClass = "monospace", placeholder = "", + ariaLabel = "Page content", uid = 1 )
    diff --git a/src/main/twirl/gitbucket/core/wiki/history.scala.html b/src/main/twirl/gitbucket/core/wiki/history.scala.html index faf65a74e..2d1857001 100644 --- a/src/main/twirl/gitbucket/core/wiki/history.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/history.scala.html @@ -36,7 +36,7 @@ @commits.map { commit => - + @helpers.avatarLink(commit, 20) @helpers.user(commit.authorName, commit.authorEmailAddress) @gitbucket.core.helper.html.datetimeago(commit.authorTime): @commit.shortMessage diff --git a/src/main/twirl/gitbucket/core/wiki/page.scala.html b/src/main/twirl/gitbucket/core/wiki/page.scala.html index c68d68c5a..855856cee 100644 --- a/src/main/twirl/gitbucket/core/wiki/page.scala.html +++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html @@ -12,10 +12,10 @@
    - + - +
    Page History @@ -72,7 +72,7 @@ Clone this wiki locally
    @gitbucket.core.helper.html.copy("repository-url", "repository-url-copy", WikiService.wikiHttpUrl(repository)){ - + } @if(WikiService.wikiSshUrl(repository).isDefined) {
    diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js index 75a68f00b..8ed67d506 100644 --- a/src/main/webapp/assets/common/js/gitbucket.js +++ b/src/main/webapp/assets/common/js/gitbucket.js @@ -705,7 +705,7 @@ var imageDiff ={ function addExtraMailAddress() { var fieldset = $('#extraMailAddresses'); var count = $('.extraMailAddress').length; - var html = '' + var html = '' + ''; fieldset.append(html); } diff --git a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala index 5a969cdb7..facdbab36 100644 --- a/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala +++ b/src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala @@ -35,7 +35,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 32).toString == - "" + """@user""" ) } @@ -47,7 +47,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 32).toString == - s"""""" + s"""@user""" ) } @@ -59,7 +59,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 32).toString == - s"""""" + s"""@user""" ) } @@ -69,7 +69,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 20, "hoge@hoge.com").toString == - "" + """@user""" ) } @@ -79,7 +79,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 20).toString == - "" + """@user""" ) } @@ -89,7 +89,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 20, "hoge@hoge.com").toString == - "" + """@user""" ) } @@ -99,7 +99,7 @@ class AvatarImageProviderSpec extends AnyFunSpec { assert( provider.toHtml("user", 20, "hoge@hoge.com", true).toString == - "" + """@user""" ) } }