From c3103dee1cc73210cdb1e8673ef91c3897a1fd25 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 15 Oct 2020 13:53:58 +0300 Subject: [PATCH] show (preview) for the preview versions on the docs version list resolves https://github.com/abpframework/abp/issues/5562 --- .../Volo/Docs/Localization/Domain/en.json | 5 +++-- .../Volo/Docs/Localization/Domain/tr.json | 3 ++- .../Pages/Documents/Project/Index.cshtml.cs | 15 +++++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json index 67227c506a..4a9ac08ebb 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json @@ -13,7 +13,7 @@ "ClearCacheConfirmationMessage": "Are you sure to clear all caches for project \"{0}\"", "ReIndexAllProjects": "ReIndex all projects", "ReIndexProject": "ReIndex project", - "ReIndexProjectConfirmationMessage":"Are you sure to reindex for project \"{0}\"", + "ReIndexProjectConfirmationMessage": "Are you sure to reindex for project \"{0}\"", "SuccessfullyReIndexProject": "Successfully reindex for project \"{0}\"", "ReIndexAllProjectConfirmationMessage": "Are you sure to reindex all project?", "SuccessfullyReIndexAllProject": "Successfully reindex for all projects", @@ -33,6 +33,7 @@ "Upd": "Upd", "NewExplanation": "Created in the last two weeks.", "UpdatedExplanation": "Updated in the last two weeks.", - "Volo.Docs.Domain:010002": "ShortName {ShortName} already exists." + "Volo.Docs.Domain:010002": "ShortName {ShortName} already exists.", + "Preview": "preview" } } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json index f41a049932..5d7b9a61ed 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json @@ -33,6 +33,7 @@ "Upd": "Günc", "NewExplanation": "Son iki hafta içinde oluşturuldu.", "UpdatedExplanation": "Son iki hafta içinde güncellendi.", - "Volo.Docs.Domain:010002": "ShortName {ShortName} zaten var." + "Volo.Docs.Domain:010002": "ShortName {ShortName} zaten var.", + "Preview": "ön izleme" } } \ No newline at end of file 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 9b7daa596a..a52027bb11 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 @@ -18,6 +18,7 @@ using Volo.Docs.HtmlConverting; using Volo.Docs.Models; using Volo.Docs.Projects; using Volo.Docs.GitHub.Documents.Version; +using Volo.Docs.Localization; namespace Volo.Docs.Pages.Documents.Project { @@ -99,6 +100,8 @@ namespace Volo.Docs.Pages.Documents.Project _documentSectionRenderer = documentSectionRenderer; _versionHelper = versionHelper; _uiOptions = options.Value; + + LocalizationResourceType = typeof(DocsResource); } public virtual async Task OnGetAsync() @@ -312,11 +315,15 @@ namespace Volo.Docs.Pages.Documents.Project { var LatestVersionBranchNameWithoutPrefix = RemoveVersionPrefix(Project.LatestVersionBranchName); - var latest = versions.FirstOrDefault(v=> v.Version == LatestVersionBranchNameWithoutPrefix); - - if (latest != null) + foreach (var version in versions) { - return latest; + if (version.Version == LatestVersionBranchNameWithoutPrefix) + { + return version; + } + + version.DisplayText = $"{version.DisplayText} ({L["Preview"].Value})"; + } }