Skip to content

Commit c8747f8

Browse files
author
Daniel Jacinto
authored
[TFM Display] Added tooltip/popover for badges. (#9020)
1 parent cf887bd commit c8747f8

5 files changed

Lines changed: 54 additions & 6 deletions

File tree

src/NuGetGallery/Scripts/gallery/common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
setTimeout(function () {
471471
popoverElement.popover('destroy');
472472
},
473-
1000);
473+
2000);
474474
});
475475
};
476476

src/NuGetGallery/Scripts/gallery/page-display-package.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,5 +186,6 @@
186186
}
187187

188188
$(".reserved-indicator").each(window.nuget.setPopovers);
189+
$(".framework-badge-asset").each(window.nuget.setPopovers);
189190
$(".package-warning-icon").each(window.nuget.setPopovers);
190191
});

src/NuGetGallery/Strings.Designer.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NuGetGallery/Strings.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,4 +1224,10 @@ The {1} Team</value>
12241224
<data name="ApiKeyOwnerLocked" xml:space="preserve">
12251225
<value>The specified API key is scoped to an owner that is locked. Please contact [email protected].</value>
12261226
</data>
1227+
<data name="SupportedFrameworks_EmptyVersionTooltip" xml:space="preserve">
1228+
<value>This package is compatible with all versions of this framework.</value>
1229+
</data>
1230+
<data name="SupportedFrameworks_Tooltip" xml:space="preserve">
1231+
<value>This package is compatible with this framework or higher.</value>
1232+
</data>
12271233
</root>
Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,44 @@
1-
@using NuGetGallery.Frameworks;
1+
@using String = NuGetGallery.Strings;
2+
@using NuGetGallery.Frameworks;
23
@model PackageFrameworkCompatibilityBadges
34

45
<div class="framework framework-badges">
56
@if (Model.Net != null)
67
{
7-
<span class="framework-badge-asset" tabindex="0">.NET @Model.Net.GetBadgeVersion()</span>
8+
<!-- .NET cannot be an empty version since the lowest version for this framework is "net5.0", if the package contains just "net" framework it will fall into .NET Framework badge instead.' -->
9+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_Tooltip">.NET @Model.Net.GetBadgeVersion()</span>
810
}
911
@if (Model.NetCore != null)
1012
{
11-
<span class="framework-badge-asset" tabindex="0">.NET Core @Model.NetCore.GetBadgeVersion()</span>
13+
if (Model.NetCore.GetBadgeVersion().IsEmpty())
14+
{
15+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_EmptyVersionTooltip">.NET Core</span>
16+
}
17+
else
18+
{
19+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_Tooltip">.NET Core @Model.NetCore.GetBadgeVersion()</span>
20+
}
1221
}
1322
@if (Model.NetStandard != null)
1423
{
15-
<span class="framework-badge-asset" tabindex="0">.NET Standard @Model.NetStandard.GetBadgeVersion()</span>
24+
if (Model.NetStandard.GetBadgeVersion().IsEmpty())
25+
{
26+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_EmptyVersionTooltip">.NET Standard</span>
27+
}
28+
else
29+
{
30+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_Tooltip">.NET Standard @Model.NetStandard.GetBadgeVersion()</span>
31+
}
1632
}
1733
@if (Model.NetFramework != null)
1834
{
19-
<span class="framework-badge-asset" tabindex="0">.NET Framework @Model.NetFramework.GetBadgeVersion()</span>
35+
if (Model.NetFramework.GetBadgeVersion().IsEmpty())
36+
{
37+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_EmptyVersionTooltip">.NET Framework</span>
38+
}
39+
else
40+
{
41+
<span class="framework-badge-asset" role="button" tabindex="0" data-content="@String.SupportedFrameworks_Tooltip">.NET Framework @Model.NetFramework.GetBadgeVersion()</span>
42+
}
2043
}
2144
</div>

0 commit comments

Comments
 (0)