From 47ebeef2d68736ca170b627bb2cc294c4571ddb6 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Fri, 2 Nov 2018 11:16:47 +0300
Subject: [PATCH] Fix version text.

---
 .../Volo/Docs/DocsAppConsts.cs                  |  2 +-
 .../Volo.Docs.Web/Pages/Documents/Index.cshtml  |  2 +-
 .../Pages/Documents/Index.cshtml.cs             |  2 +-
 .../Pages/Documents/Project/Index.cshtml        |  4 ++--
 .../Pages/Documents/Project/Index.cshtml.cs     | 17 +++++++++++------
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs
index 4a4820e040..c18a40759f 100644
--- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs
@@ -2,6 +2,6 @@
 {
     public class DocsAppConsts
     {
-        public static string LatestVersion = "latest";
+        public static string Latest = "latest";
     }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml
index abda1a4a89..59d2ae9e1b 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml
@@ -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>
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs
index c02b4b6a9f..97a2c85747 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs
+++ b/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
                 {
                     projectName = listResult.Items[0].ShortName,
-                    version = DocsAppConsts.LatestVersion,
+                    version = DocsAppConsts.Latest,
                     documentName = listResult.Items[0].DefaultDocumentName
                 });
             }
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index 4e66bee56b..b58e571473 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -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"
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
index 84c5e14928..59f0524308 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
@@ -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;
         }