Fix version text.

pull/570/head
Halil ibrahim Kalkan 7 years ago
parent 059bf5793b
commit 47ebeef2d6

@ -2,6 +2,6 @@
{
public class DocsAppConsts
{
public static string LatestVersion = "latest";
public static string Latest = "latest";
}
}

@ -33,7 +33,7 @@
<h3>
<a asp-page="./Project/Index"
asp-route-projectName="@project.ShortName"
asp-route-version="@DocsAppConsts.LatestVersion">
asp-route-version="@DocsAppConsts.Latest">
@project.Name
</a>
</h3>

@ -26,7 +26,7 @@ namespace Volo.Docs.Pages.Documents
return RedirectToPage("./Project/Index", new
{
projectName = listResult.Items[0].ShortName,
version = DocsAppConsts.LatestVersion,
version = DocsAppConsts.Latest,
documentName = listResult.Items[0].DefaultDocumentName
});
}

@ -48,7 +48,7 @@
<nav class="navbar navbar-logo">
@if (!projectDisplayName.IsNullOrWhiteSpace())
{
<a class="navbar-brand w-100" href="@Model.CreateLink(Model.GetSpecificVersionOrLatest())">
<a class="navbar-brand w-100" href="@Model.CreateLink(Model.LatestVersionInfo, Model.GetSpecificVersionOrLatest())">
@projectDisplayName<br>
<strong class="display-block">
@L["Documents"]
@ -106,7 +106,7 @@
else
{
<ul root-node="@Model.Navigation.RootNode"
version="@(Model.LatestVersionInfo.IsSelected ? DocsAppConsts.LatestVersion : Model.Version)"
version="@(Model.LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Model.Version)"
project-name="@Model.ProjectName"
project-format="@Model.ProjectFormat"
selected-document-name="@Model.DocumentNameWithExtension"

@ -101,7 +101,7 @@ namespace Volo.Docs.Pages.Documents.Project
LatestVersionInfo = GetLatestVersion();
if (string.Equals(Version, DocsAppConsts.LatestVersion, StringComparison.OrdinalIgnoreCase))
if (string.Equals(Version, DocsAppConsts.Latest, StringComparison.OrdinalIgnoreCase))
{
LatestVersionInfo.IsSelected = true;
Version = LatestVersionInfo.Version;
@ -124,13 +124,18 @@ namespace Volo.Docs.Pages.Documents.Project
VersionSelectItems = Versions.Select(v => new SelectListItem
{
Text = v.DisplayText,
Value = CreateLink(v.Version, DocumentName),
Value = CreateLink(LatestVersionInfo, v.Version, DocumentName),
Selected = v.IsSelected
}).ToList();
}
public string CreateLink(string version, string documentName = null)
public string CreateLink(VersionInfo latestVersion, string version, string documentName = null)
{
if (latestVersion.Version == version)
{
version = DocsAppConsts.Latest;
}
var link = "/documents/" + ProjectName + "/" + version;
if (documentName != null)
@ -145,7 +150,7 @@ namespace Volo.Docs.Pages.Documents.Project
{
var latestVersion = Versions.First();
latestVersion.DisplayText = $"{latestVersion.Version} - " + DocsAppConsts.LatestVersion;
latestVersion.DisplayText = $"{latestVersion.DisplayText} ({DocsAppConsts.Latest})";
latestVersion.Version = latestVersion.Version;
return latestVersion;
@ -155,11 +160,11 @@ namespace Volo.Docs.Pages.Documents.Project
{
if (Document?.Version == null)
{
return DocsAppConsts.LatestVersion;
return DocsAppConsts.Latest;
}
return Document.Version == LatestVersionInfo.Version ?
DocsAppConsts.LatestVersion :
DocsAppConsts.Latest :
Document.Version;
}

Loading…
Cancel
Save