Browse Source

Fix version text.

pull/570/head
Halil ibrahim Kalkan 8 years ago
parent
commit
47ebeef2d6
  1. 2
      modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs
  2. 2
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml
  3. 2
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs
  4. 4
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
  5. 17
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

2
modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs

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

2
modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml

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

2
modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs

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

4
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

@ -48,7 +48,7 @@
<nav class="navbar navbar-logo"> <nav class="navbar navbar-logo">
@if (!projectDisplayName.IsNullOrWhiteSpace()) @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> @projectDisplayName<br>
<strong class="display-block"> <strong class="display-block">
@L["Documents"] @L["Documents"]
@ -106,7 +106,7 @@
else else
{ {
<ul root-node="@Model.Navigation.RootNode" <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-name="@Model.ProjectName"
project-format="@Model.ProjectFormat" project-format="@Model.ProjectFormat"
selected-document-name="@Model.DocumentNameWithExtension" selected-document-name="@Model.DocumentNameWithExtension"

17
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

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

Loading…
Cancel
Save