Skip to content

Commit 6b07d75

Browse files
drewgilliesdrewgillies
authored
a11y fix - remove horizontal scrollbar from page (#8499)
1 parent 0971952 commit 6b07d75

1 file changed

Lines changed: 67 additions & 65 deletions

File tree

‎src/NuGetGallery/Views/Users/Organizations.cshtml‎

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -25,73 +25,75 @@
2525
<div>
2626
<p>You have @(orgCountString).</p>
2727
</div>
28-
<table class="table user-package-list">
29-
<thead>
30-
<tr class="manage-package-headings">
31-
<th class="hidden-xs"></th>
32-
<th>Organization</th>
33-
<th>Membership</th>
34-
<th>Members</th>
35-
<th>Packages</th>
36-
<th></th>
37-
</tr>
38-
</thead>
39-
@foreach (var organization in Model.Organizations)
40-
{
41-
<tbody>
42-
<tr class="manage-package-listing" data-bind="visible: Visible">
43-
<td class="align-middle hidden-xs">
44-
<img src="@GravatarHelper.Url(Url, organization.EmailAddress, organization.OrganizationName, 256)"
45-
class="package-icon img-responsive" aria-hidden="true" alt="" />
46-
</td>
47-
<td class="align-middle package-id">
48-
<a title="View Organization Profile" href="@Url.User(organization.OrganizationName)">
49-
@organization.OrganizationName
50-
</a>
51-
@if (organization.IsPendingRequest)
52-
{
53-
<span>(pending approval)</span>
54-
}
55-
</td>
56-
<td class="align-middle">
57-
@(organization.CurrentUserIsAdmin ? "Administrator" : "Collaborator")
58-
</td>
59-
<td class="align-middle text-nowrap">
60-
@organization.MemberCount
61-
</td>
62-
<td class="align-middle text-nowrap">
63-
@organization.PackagesCount
64-
</td>
65-
<td class="text-right align-middle package-controls">
66-
@if (!organization.IsPendingRequest && !organization.IsPendingTransformRequest)
67-
{
68-
<a class="btn" href="@Url.ManageMyOrganization(organization.OrganizationName)" title="Edit Organization" aria-label="@("Edit Organization " + organization.OrganizationName)">
69-
<i class="ms-Icon ms-Icon--Edit" aria-hidden="true"></i>
28+
<div class="table-container">
29+
<table class="table user-package-list">
30+
<thead>
31+
<tr class="manage-package-headings">
32+
<th class="hidden-xs"></th>
33+
<th>Organization</th>
34+
<th>Membership</th>
35+
<th>Members</th>
36+
<th>Packages</th>
37+
<th></th>
38+
</tr>
39+
</thead>
40+
@foreach (var organization in Model.Organizations)
41+
{
42+
<tbody>
43+
<tr class="manage-package-listing" data-bind="visible: Visible">
44+
<td class="align-middle hidden-xs">
45+
<img src="@GravatarHelper.Url(Url, organization.EmailAddress, organization.OrganizationName, 256)"
46+
class="package-icon img-responsive" aria-hidden="true" alt="" />
47+
</td>
48+
<td class="align-middle package-id">
49+
<a title="View Organization Profile" href="@Url.User(organization.OrganizationName)">
50+
@organization.OrganizationName
7051
</a>
71-
}
72-
else if (organization.IsPendingRequest)
73-
{
74-
var accept = organization.IsPendingTransformRequest ? Url.ConfirmTransformAccount(organization.OrganizationName, organization.ConfirmationToken) : Url.AcceptOrganizationMembershipRequest(organization.OrganizationName, organization.ConfirmationToken);
75-
var reject = organization.IsPendingTransformRequest ? Url.RejectTransformAccount(organization.OrganizationName, organization.ConfirmationToken) : Url.RejectOrganizationMembershipRequest(organization.OrganizationName, organization.ConfirmationToken);
52+
@if (organization.IsPendingRequest)
53+
{
54+
<span>(pending approval)</span>
55+
}
56+
</td>
57+
<td class="align-middle">
58+
@(organization.CurrentUserIsAdmin ? "Administrator" : "Collaborator")
59+
</td>
60+
<td class="align-middle text-nowrap">
61+
@organization.MemberCount
62+
</td>
63+
<td class="align-middle text-nowrap">
64+
@organization.PackagesCount
65+
</td>
66+
<td class="text-right align-middle package-controls">
67+
@if (!organization.IsPendingRequest && !organization.IsPendingTransformRequest)
68+
{
69+
<a class="btn" href="@Url.ManageMyOrganization(organization.OrganizationName)" title="Edit Organization" aria-label="@("Edit Organization " + organization.OrganizationName)">
70+
<i class="ms-Icon ms-Icon--Edit" aria-hidden="true"></i>
71+
</a>
72+
}
73+
else if (organization.IsPendingRequest)
74+
{
75+
var accept = organization.IsPendingTransformRequest ? Url.ConfirmTransformAccount(organization.OrganizationName, organization.ConfirmationToken) : Url.AcceptOrganizationMembershipRequest(organization.OrganizationName, organization.ConfirmationToken);
76+
var reject = organization.IsPendingTransformRequest ? Url.RejectTransformAccount(organization.OrganizationName, organization.ConfirmationToken) : Url.RejectOrganizationMembershipRequest(organization.OrganizationName, organization.ConfirmationToken);
7677

77-
<form method="post" action="@accept">
78-
@Html.AntiForgeryToken()
79-
<button class="btn btn-default" type="submit" title="Accept Organization Membership Request" aria-label="@("Accept Organization Membership Request for " + organization.OrganizationName)">
80-
<i class="ms-Icon ms-Icon--Accept" aria-hidden="true"></i>
81-
</button>
82-
</form>
83-
<form method="post" action="@reject">
84-
@Html.AntiForgeryToken()
85-
<button class="btn btn-default" type="submit" title="Reject Organization Membership Request" aria-label="@("Reject Organization Membership Request for " + organization.OrganizationName)">
86-
<i class="ms-Icon ms-Icon--Cancel" aria-hidden="true"></i>
87-
</button>
88-
</form>
89-
}
90-
</td>
91-
</tr>
92-
</tbody>
93-
}
94-
</table>
78+
<form method="post" action="@accept">
79+
@Html.AntiForgeryToken()
80+
<button class="btn btn-default" type="submit" title="Accept Organization Membership Request" aria-label="@("Accept Organization Membership Request for " + organization.OrganizationName)">
81+
<i class="ms-Icon ms-Icon--Accept" aria-hidden="true"></i>
82+
</button>
83+
</form>
84+
<form method="post" action="@reject">
85+
@Html.AntiForgeryToken()
86+
<button class="btn btn-default" type="submit" title="Reject Organization Membership Request" aria-label="@("Reject Organization Membership Request for " + organization.OrganizationName)">
87+
<i class="ms-Icon ms-Icon--Cancel" aria-hidden="true"></i>
88+
</button>
89+
</form>
90+
}
91+
</td>
92+
</tr>
93+
</tbody>
94+
}
95+
</table>
96+
</div>
9597
}
9698
else
9799
{

0 commit comments

Comments
 (0)