Browse Source

The default version made as latest.

pull/457/head
Alper Ebicoglu 8 years ago
parent
commit
3cdf4d8f3a
  1. 11
      modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsAppConsts.cs
  2. 2
      modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/VersionInfo.cs
  3. 9
      modules/docs/src/Volo.Docs.Web/DocsWebConsts.cs
  4. 2
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml
  5. 2
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs
  6. 3
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
  7. 66
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

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

@ -0,0 +1,11 @@
using Volo.Docs.Projects;
namespace Volo.Docs
{
public class DocsAppConsts
{
public static string LatestVersion = "latest";
public static VersionInfo DefaultVersion = new VersionInfo(LatestVersion, LatestVersion);
}
}

2
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/VersionInfo.cs → modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/VersionInfo.cs

@ -1,4 +1,4 @@
namespace Volo.Docs.Pages.Documents.Project namespace Volo.Docs.Projects
{ {
public class VersionInfo public class VersionInfo
{ {

9
modules/docs/src/Volo.Docs.Web/DocsWebConsts.cs

@ -1,9 +0,0 @@
using Volo.Docs.Pages.Documents.Project;
namespace Volo.Docs
{
public class DocsWebConsts
{
public static VersionInfo DefaultVersion = new VersionInfo("Unstable", "master"); //can be *latest* as well.
}
}

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

@ -30,7 +30,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="@DocsWebConsts.DefaultVersion.Version"> asp-route-version="@DocsAppConsts.DefaultVersion.Version">
@project.Name @project.Name
</a> </a>
</h3> </h3>

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

@ -27,7 +27,7 @@ namespace Volo.Docs.Pages.Documents
return RedirectToPage("./Project/Index", new return RedirectToPage("./Project/Index", new
{ {
projectName = project.ShortName, projectName = project.ShortName,
version = DocsWebConsts.DefaultVersion.Version, version = DocsAppConsts.DefaultVersion.Version,
documentName = project.DefaultDocumentName documentName = project.DefaultDocumentName
}); });
} }

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

@ -1,5 +1,6 @@
@page @page
@using Volo.Abp.AspNetCore.Mvc.UI.Theming @using Volo.Abp.AspNetCore.Mvc.UI.Theming
@using Volo.Docs
@using Volo.Docs.Pages.Documents.Project @using Volo.Docs.Pages.Documents.Project
@inject IThemeManager ThemeManager @inject IThemeManager ThemeManager
@model IndexModel @model IndexModel
@ -90,7 +91,7 @@
} }
<ul root-node="@Model.Navigation.RootNode" <ul root-node="@Model.Navigation.RootNode"
version="@(Model.Version.IsNullOrEmpty() ? "latest" : Model.Version)" version="@(Model.LatestVersionInfo.IsSelected ? DocsAppConsts.LatestVersion : 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"

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

@ -50,6 +50,19 @@ namespace Volo.Docs.Pages.Documents.Project
_projectAppService = projectAppService; _projectAppService = projectAppService;
} }
public VersionInfo LatestVersionInfo
{
get
{
var latestVersion = Versions.First();
latestVersion.DisplayText = $"{latestVersion.Version} - " + DocsAppConsts.LatestVersion;
latestVersion.Version = latestVersion.Version;
return latestVersion;
}
}
public async Task OnGet() public async Task OnGet()
{ {
var projectDto = await _projectAppService.FindByShortNameAsync(ProjectName); var projectDto = await _projectAppService.FindByShortNameAsync(ProjectName);
@ -63,30 +76,29 @@ namespace Volo.Docs.Pages.Documents.Project
Versions = versions.Select(v => new VersionInfo(v, v)).ToList(); Versions = versions.Select(v => new VersionInfo(v, v)).ToList();
AddDefaultVersionIfNotContains(); //VersionInfo latestVersion = Versions.First();
//latestVersion.DisplayText = $"{latestVersion.Version} - " + DocsAppConsts.LatestVersion;
var latestVersion = Versions.Count == 1 ? Versions[0] : Versions[1]; //latestVersion.Version = latestVersion.Version;
latestVersion.DisplayText = $"{latestVersion.Version} - latest";
latestVersion.Version = latestVersion.Version;
var versionFromUrl = Versions.FirstOrDefault(v => v.Version == Version);
if (versionFromUrl != null) if (string.Equals(Version, DocsAppConsts.LatestVersion, StringComparison.InvariantCultureIgnoreCase))
{ {
versionFromUrl.IsSelected = true; LatestVersionInfo.IsSelected = true;
} Version = LatestVersionInfo.Version;
else if (string.Equals(Version, "latest", StringComparison.InvariantCultureIgnoreCase))
{
latestVersion.IsSelected = true;
} }
else else
{ {
Versions.First().IsSelected = true; var versionFromUrl = Versions.FirstOrDefault(v => v.Version == Version);
} if (versionFromUrl != null)
{
if (Version == null) versionFromUrl.IsSelected = true;
{ Version = versionFromUrl.Version;
Version = Versions.Single(x => x.IsSelected).Version; }
else
{
Versions.First().IsSelected = true;
Version = Versions.First().Version;
}
} }
Document = await _documentAppService.GetByNameAsync(ProjectName, DocumentNameWithExtension, Version, true); Document = await _documentAppService.GetByNameAsync(ProjectName, DocumentNameWithExtension, Version, true);
@ -101,20 +113,6 @@ namespace Volo.Docs.Pages.Documents.Project
Navigation = await _documentAppService.GetNavigationDocumentAsync(ProjectName, Version, false); Navigation = await _documentAppService.GetNavigationDocumentAsync(ProjectName, Version, false);
Navigation.ConvertItems(); Navigation.ConvertItems();
} }
private void AddDefaultVersionIfNotContains()
{
if (DocsWebConsts.DefaultVersion == null)
{
return;
}
if (Versions.Contains(DocsWebConsts.DefaultVersion))
{
return;
}
Versions.Insert(0, DocsWebConsts.DefaultVersion);
}
} }
} }
Loading…
Cancel
Save