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

Fix accessibility issues identified by tool #5795

Merged
merged 12 commits into from
Apr 13, 2018
Merged

Fix accessibility issues identified by tool #5795

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b1aef76
fix major nav issues
Apr 11, 2018
d35ca48
packages and display package fixes
Apr 11, 2018
f7ac4c5
tablist for profile tab
Apr 11, 2018
8764838
correctly set aria-expanded in section on api keys page and elsewhere
Apr 11, 2018
781afb7
apikeys accountsettings profiles
Apr 12, 2018
4df30e3
page-subheading too invisible
Apr 12, 2018
1678baf
remaining fixes
Apr 12, 2018
cec2e3c
jquery validate errors
Apr 12, 2018
1c7947e
add aria-describedby comment
Apr 12, 2018
0254ebe
removed unnecessary css and class
Apr 12, 2018
279b122
single sign-in assistance link instead of one per provider
Apr 13, 2018
66dcf5f
Merge branch 'dev' into sb-kerosisangry
Apr 13, 2018
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
7 changes: 2 additions & 5 deletions src/Bootstrap/dist/css/bootstrap-theme.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions src/Bootstrap/less/theme/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,13 @@ body {
.main-container {
padding-bottom: 75px;
height: auto;

.page-subheading {
color: #777;
}
}

.navbar-logo {
margin: 8px 20px 0 0;
}

.navbar-seperated {
.navbar-separated {
.seperator {
padding: 11px 0;
color: #fff;
Expand Down
4 changes: 2 additions & 2 deletions src/NuGetGallery/App_Code/ViewHelpers.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);

@helper AjaxAntiForgeryToken(System.Web.Mvc.HtmlHelper html)
{
<form id="AntiForgeryForm">
<form aria-hidden="true" id="AntiForgeryForm">
@html.AntiForgeryToken()
</form>
}
Expand Down Expand Up @@ -532,7 +532,7 @@ var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);
@if (!disabled)
{
<a href="#" role="button" data-toggle="collapse" data-target="#@id-container"
aria-expanded="@expanded" aria-controls="@id-container" id="show-@id-container">
aria-expanded="@(expanded ? "true" : "false")" aria-controls="@id-container" id="show-@id-container">
<i class="ms-Icon ms-Icon--@(expanded ? expandedIcon : collapsedIcon)"
aria-hidden="@(expanded ? "false" : "true")"></i>
<span>@title(MvcHtmlString.Empty)</span>
Expand Down
35 changes: 35 additions & 0 deletions src/NuGetGallery/Scripts/gallery/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,45 @@
} else {
error.insertAfter(element);
}
},
showErrors: function (errorMap, errorList) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jquery.validate calls it whenever the state of our forms has changed. It adds validation error text to our forms when the content isn't correct. I'm using their default process and appending an additional step.

this.defaultShowErrors();

var i;
Copy link
Contributor Author

@scottbommarito scottbommarito Apr 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JQuery Validate adds an aria-describedby attribute to every validated field, even if the validation is successful. This is wrong because if there is no error, the aria-describedby leads to an empty element, which is invalid. This code removes the unnecessary attribute.

EDIT: going to put this in a comment for future's sake

for (i = 0; this.errorList[i]; i++) {
removeInvalidAriaDescribedBy(this.errorList[i].element);
}

for (i = 0; this.successList[i]; i++) {
removeInvalidAriaDescribedBy(this.successList[i]);
}
}
});
}

function removeInvalidAriaDescribedBy(element) {
var describedBy = element.getAttribute("aria-describedby");
if (!describedBy) {
return;
}

var ids = describedBy.split(" ")
.filter(function (describedById) {
if (!describedById) {
return false;
}

var describedByElement = $("#" + describedById);
return describedByElement && describedByElement.text();
});

if (ids.length) {
element.setAttribute("aria-describedby", ids.join(" "));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only call `setAttribute if the IDs set has changed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is setAttribute an expensive operation? I feel like the code is much simpler like this.

} else {
element.removeAttribute("aria-describedby");
}
}

nuget.parseNumber = function (unparsedValue) {
unparsedValue = ('' + unparsedValue).replace(/,/g, '');
var parsedValue = parseInt(unparsedValue);
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Scripts/gallery/page-signin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$(function () {
'use strict';
$('#signin-assistance').click(function () {
$('.signin-assistance').click(function () {
$('#signinAssistanceModal').modal({
show: true
});
Expand Down
6 changes: 3 additions & 3 deletions src/NuGetGallery/Views/Authentication/SignIn.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
</div>
</div>
<div class="row text-center create-provider-account">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should only be one of these... not one per provider. You can put it in a Model.Providers.Count > 0 if depending on what @shishirx34 things.

<span>
<a href="#" id="signin-assistance">Need assistance signing in?</a>
</span>
<span>
<a href="#" class="signin-assistance">Need assistance signing in?</a>
</span>
</div>
}

Expand Down
4 changes: 2 additions & 2 deletions src/NuGetGallery/Views/Authentication/_SigninAssistance.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="text-row">
<label for="newOwnerUserName">Please enter the username</label>
<input type="text" id="usernameForAssistance" name="usernameForAssistance" data-bind="value: usernameForAssistance" aria-required="true" class="form-control" />
<div class="text-danger form-error-message" id="warning-message" data-bind="text: message"></div>
<div class="text-danger form-error-message" data-bind="text: message"></div>
</div>
</div>
<div class="form-button-node username-submit">
Expand All @@ -40,7 +40,7 @@
<div class="text-row">
<input class="form-control" type="text" id="emailAddress" name="emailAddress" data-bind="value: inputEmailAddress" aria-required="true" />
</div>
<div class="text-danger form-error-message" id="warning-message" data-bind="text: message"></div>
<div class="text-danger form-error-message" data-bind="text: message"></div>
</div>
<div class="form-button-node email-submit">
<input type="submit" class="btn btn-primary btn-block action-button" data-bind="click: sendEmailNotification" value="Next" />
Expand Down
4 changes: 1 addition & 3 deletions src/NuGetGallery/Views/Organizations/ManageOrganization.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
}

<section role="main" class="container main-container page-manage-organizations">
<form id="AntiForgeryForm">
@Html.AntiForgeryToken()
</form>
@ViewHelpers.AjaxAntiForgeryToken(Html)
<div class="row">
<div class="col-md-12">
@ViewHelpers.OrganizationsBreadcrumb(
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Packages/Delete.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
new
{
@class = "form-control",
title = "Selection A Version...",
title = "Select a version",
id = "input-select-version"
})
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@

<section role="main" class="container main-container page-package-details">
<div class="row">
<aside class="col-sm-1">
<aside aria-label="Package icon" class="col-sm-1">
<h3>
<img class="package-icon img-responsive" aria-hidden="true" alt=""
src="@(PackageHelper.ShouldRenderUrl(Model.IconUrl) ? Model.IconUrl : Url.Absolute("~/Content/gallery/img/default-package-icon.svg"))"
Expand Down Expand Up @@ -480,7 +480,7 @@
}
</div>
</article>
<aside class="col-sm-3 package-details-info">
<aside aria-label="Package details info" class="col-sm-3 package-details-info">
<h2>Info</h2>
<ul class="list-unstyled ms-Icon-ul">
<li>
Expand Down
6 changes: 3 additions & 3 deletions src/NuGetGallery/Views/Packages/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
</a>
</h2>
<div class="collapse in" id="select-package-version-form" aria-expanded="true">
<form id="cancel-form">
<form aria-hidden="true" id="cancel-form">
@Html.AntiForgeryToken()
</form>
<form id="select-version-form" enctype="multipart/form-data">
<form aria-label="Select package version to edit" id="select-version-form" enctype="multipart/form-data">
@Html.AntiForgeryToken()

@Html.ValidationSummary(true)
Expand All @@ -60,7 +60,7 @@
new
{
@class = "form-control selectpicker show-tick show-menu-arrow btn-block",
@title = "Select A Version...",
@title = "Select a version",
@id = "input-select-version"
})
</label>
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Packages/ManagePackageOwners.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class="col-md-1">
<img width="@Constants.GravatarElementSize"
height="@Constants.GravatarElementSize"
data-bind="attr:{src: imageUrl}" />
data-bind="attr: { src: imageUrl, 'aria-label': 'Profile picture for ' + name() }" />
</div>
<div class="col-md-8 ms-font-xl">
<span>
Expand Down
6 changes: 3 additions & 3 deletions src/NuGetGallery/Views/Packages/UploadPackage.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="row">
<div class="@ViewHelpers.GetColumnClasses(ViewBag)">
@ViewHelpers.PackagesBreadcrumb(Url, CurrentUser, true, @<text>Upload</text>)
<div class="page-subheading text-center">
<div class="text-center">
<p class="message">Your package file will be uploaded and hosted on the @(Config.Current.Brand) server (@(Config.Current.SiteRoot)).</p>
</div>
<div id="upload-package-container">
Expand All @@ -22,10 +22,10 @@
</a>
</h2>
<div class="collapse in" id="upload-package-form" aria-expanded="true">
<form id="cancel-form">
<form aria-hidden="true" id="cancel-form">
@Html.AntiForgeryToken()
</form>
<form id="uploadForm" enctype="multipart/form-data">
<form aria-label="Upload a package" id="uploadForm" enctype="multipart/form-data">
@Html.AntiForgeryToken()

@Html.ValidationSummary(true)
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Packages/_EditForm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form id="edit-readme-form">
<form aria-label="Edit your package" id="edit-readme-form">
@Html.AntiForgeryToken()

<div id="readme-collapser-container" class="hidden">
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Packages/_VerifyForm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form id="verify-metadata-form">
<form aria-label="Verify your package" id="verify-metadata-form">
@Html.AntiForgeryToken()

<div id="verify-collapser-container" class="hidden">
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Packages/_VerifyMetadata.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<div class="verify-package-field row">
<div class="verify-package-field-heading col-sm-12">Icon Preview</div>
<div id="icon-preview-container" class="col-sm-1">
<img class="package-icon img-responsive" id="icon-preview" data-bind="attr: { src: $data.IconUrl }" /> <!-- probably need to check this for safety-->
<img class="package-icon img-responsive" id="icon-preview" aria-label="The icon of your package" data-bind="attr: { src: $data.IconUrl }" /> <!-- probably need to check this for safety-->
</div>
</div>
<!-- /ko -->
Expand Down
18 changes: 8 additions & 10 deletions src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@

@helper DisplayNavigationItem(string tab, string url, bool bold = false, string title = null)
{
<li class="@(ViewBag.Tab == tab ? "active" : string.Empty)"
aria-selected="@(ViewBag.Tab == tab ? "true" : "false")" role="presentation">
<a role="menuitem" href="@url" title="@title">
<li class="@(ViewBag.Tab == tab ? "active" : string.Empty)" role="presentation">
<a role="tab" aria-selected="@(ViewBag.Tab == tab ? "true" : "false")" href="@url" title="@title">
@if (bold)
{
@:<b>
Expand All @@ -56,7 +55,7 @@
<div class="container">
<div class="row">
<div class="col-sm-12 text-center">
<a href="#skippedToContent" class="showOnFocus" title="Skip To Content" role="navigation">Skip To Content</a>
<a href="#skippedToContent" class="showOnFocus" title="Skip To Content">Skip To Content</a>
</div>
</div>
<div class="row">
Expand All @@ -75,7 +74,7 @@
</a>
</div>
<div id="navbar" class="navbar-collapse collapse" role="menubar">
<ul class="nav navbar-nav" role="menu">
<ul class="nav navbar-nav" role="tablist">
@DisplayNavigationItem("Packages", Url.PackageList())
@DisplayNavigationItem("Upload", Url.UploadPackage())
@if (StatisticsHelper.IsStatisticsPageAvailable)
Expand All @@ -92,17 +91,16 @@
</ul>
@if (ShowAuthInHeader)
{
<ul class="nav navbar-nav navbar-right navbar-seperated" role="menu">
<ul class="nav navbar-nav navbar-right navbar-separated" role="tablist">
@if (!User.Identity.IsAuthenticated)
{
var returnUrl = ViewData.ContainsKey(Constants.ReturnUrlViewDataKey) ? (string)ViewData[Constants.ReturnUrlViewDataKey] : Request.RawUrl;
@DisplayNavigationItem("Sign in", Url.LogOn(returnUrl), title: "Sign in to an existing NuGet.org account")
}
else
{
<li class="@(ViewBag.Tab == User.Identity.Name ? "active" : string.Empty) dropdown"
aria-selected="@(ViewBag.Tab == User.Identity.Name ? "true" : "false")" role="presentation">
<a href="#" role="menuitem" id="account-dropdown" class="dropdown-toggle" title="Open profile dropdown" data-toggle="dropdown">
<li class="@(ViewBag.Tab == User.Identity.Name ? "active" : string.Empty) dropdown" role="presentation">
<a href="#" aria-selected="@(ViewBag.Tab == User.Identity.Name ? "true" : "false")" role="tab" id="account-dropdown" class="dropdown-toggle" title="Open profile dropdown" data-toggle="dropdown">
<div>
@if (ShowWarningBanner)
{
Expand Down Expand Up @@ -163,7 +161,7 @@
{
<div class="container search-container">
<div class="row">
<form class="col-sm-12" action="@Url.PackageList()" method="get">
<form aria-label="Package search bar" class="col-sm-12" action="@Url.PackageList()" method="get">
@Html.Partial("_SearchBar")
@Html.Partial("_AutocompleteTemplate")
</form>
Expand Down
4 changes: 3 additions & 1 deletion src/NuGetGallery/Views/Shared/_AccountChangeNotifications.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
@(Model.ChangeNotifications.NotifyPackagePushed ? ViewBag.NotifyPackagePushedEnabled : ViewBag.NotifyPackagePushedNotEnabled)
</text>,
@<text>
@using (Html.BeginForm("ChangeEmailSubscription", controllerName))
@using (Html.BeginForm("ChangeEmailSubscription", controllerName, FormMethod.Post, new { aria_label = "Change email subscription settings" }))
{
@Html.AntiForgeryToken()

Expand All @@ -63,6 +63,7 @@
<b>@ViewBag.EmailAllowedLabel</b>
</label>
<div id="emailallowed-label" class="label-sibling">@Html.Raw(ViewBag.EmailAllowedDescription)</div>
@Html.ShowValidationMessagesFor(x => x.ChangeNotifications.EmailAllowed)
</div>

<div class="checkbox">
Expand All @@ -71,6 +72,7 @@
<b>@ViewBag.NotifyPackagePushedLabel</b>
</label>
<div id="notifypackagepushed-label" class="label-sibling">@ViewBag.NotifyPackagePushedDescription</div>
@Html.ShowValidationMessagesFor(x => x.ChangeNotifications.NotifyPackagePushed)
</div>

<p><strong>Note: </strong>@ViewBag.PrivacyNotice</p>
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Statistics/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<section role="main" class="container main-container page-statistics-overview">
<h1>Statistics</h1>

<span class="page-subheading ms-fontSize-l">
<span class="ms-fontSize-l">
@Html.Partial("_LastUpdated", Model)
</span>

Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Statistics/PackageVersions.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="col-xs-12">
<h1>Most Downloaded Package Versions</h1>

<span class="page-subheading ms-fontSize-l" data-bind="text: showAllPackageDownloads() ? 'Top 500 Packages Over the Last 6 Weeks' : 'Top 500 Community Packages Over the Last 6 Weeks'">
<span class="ms-fontSize-l" data-bind="text: showAllPackageDownloads() ? 'Top 500 Packages Over the Last 6 Weeks' : 'Top 500 Community Packages Over the Last 6 Weeks'">
Top 500 Community Packages Over the Last 6 Weeks
</span>
<label class="show-all-packages-toggle pull-right">
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Statistics/Packages.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="col-xs-12">
<h1>Most Downloaded Packages</h1>

<span class="page-subheading ms-fontSize-l" data-bind="text: showAllPackageDownloads() ? 'Top 100 Packages Over the Last 6 Weeks' : 'Top 100 Community Packages Over the Last 6 Weeks'">
<span class="ms-fontSize-l" data-bind="text: showAllPackageDownloads() ? 'Top 100 Packages Over the Last 6 Weeks' : 'Top 100 Community Packages Over the Last 6 Weeks'">
Top 100 Community Packages Over the Last 6 Weeks
</span>
<label class="show-all-packages-toggle pull-right">
Expand Down
2 changes: 1 addition & 1 deletion src/NuGetGallery/Views/Statistics/_PivotTable.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<script type="text/html" id="report-template">
<div class="row">
<div data-bind="if: $data && LastUpdatedUtc" class="last-updated col-xs-12 page-subheading">
<div data-bind="if: $data && LastUpdatedUtc" class="last-updated col-xs-12">
<span data-bind="text: 'Statistics last updated at ' + moment(LastUpdatedUtc).format('YYYY-MM-DD HH:mm:ss') + ' UTC.'"></span>
</div>
</div>
Expand Down
4 changes: 1 addition & 3 deletions src/NuGetGallery/Views/Users/ApiKeys.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
}

<section role="main" class="container main-container page-api-keys">
<form id="AntiForgeryForm">
@Html.AntiForgeryToken()
</form>
@ViewHelpers.AjaxAntiForgeryToken(Html)
<div class="row">
<div class="@ViewHelpers.GetColumnClasses(ViewBag)">
@ViewHelpers.BreadcrumbWithProfile(Url, CurrentUser, true, @<text>API keys</text>)
Expand Down
Loading