Updated to the latest Statiq Web with breakage fixes

This commit is contained in:
Dave Glick 2020-09-01 14:52:04 -04:00 committed by Patrik Svensson
parent a123806cd8
commit 65f0a085cc
3 changed files with 14 additions and 22 deletions

View File

@ -22,7 +22,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Statiq.Web" Version="1.0.0-alpha.9" /> <PackageReference Include="Statiq.Web" Version="1.0.0-beta.5" />
<PackageReference Include="NJsonSchema" Version="10.1.12" /> <PackageReference Include="NJsonSchema" Version="10.1.12" />
</ItemGroup> </ItemGroup>

View File

@ -52,7 +52,7 @@
{ {
@RenderSection(Constants.Sections.Splash, false) @RenderSection(Constants.Sections.Splash, false)
} }
@{ @{
string section = Document.Destination.Segments.Length > 1 ? Document.Destination.Segments[0].ToString() : null; string section = Document.Destination.Segments.Length > 1 ? Document.Destination.Segments[0].ToString() : null;
} }
@ -62,7 +62,7 @@
<div id="titlebar" class="py-4"> <div id="titlebar" class="py-4">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@{ @{
string titleBarClasses = Document.GetBool(Constants.NoSidebar) ? string.Empty : "offset-md-3 offset-lg-2"; string titleBarClasses = Document.GetBool(Constants.NoSidebar) ? string.Empty : "offset-md-3 offset-lg-2";
} }
<div class="@titleBarClasses px-3 px-md-0"> <div class="@titleBarClasses px-3 px-md-0">
@ -97,7 +97,7 @@
</div> </div>
</div> </div>
} }
<div class="flex-grow-1 d-flex flex-column bg-body"> <div class="flex-grow-1 d-flex flex-column bg-body">
@if (Document.GetBool(Constants.NoContainer)) @if (Document.GetBool(Constants.NoContainer))
{ {
@ -126,21 +126,22 @@
} }
else else
{ {
IDocument root = Outputs[nameof(Content)].First(x => x.Destination == section + "/index.html"); IDocument root = OutputPages[section + "/index.html"].First();
<div class="sidebar-nav-item @(Document.IdEquals(root) ? "active" : null)"> <div class="sidebar-nav-item @(Document.IdEquals(root) ? "active" : null)">
@Html.DocumentLink(root) @Html.DocumentLink(root)
</div> </div>
@foreach (IDocument document in root.GetChildren().OnlyVisible()) @foreach (IDocument document in OutputPages.GetChildrenOf(root).OnlyVisible())
{ {
<div class="sidebar-nav-item @(Document.IdEquals(document) ? "active" : null) @(document.HasChildren() ? "has-children" : null)"> DocumentList<IDocument> documentChildren = OutputPages.GetChildrenOf(document);
<div class="sidebar-nav-item @(Document.IdEquals(document) ? "active" : null) @(documentChildren.Any() ? "has-children" : null)">
@Html.DocumentLink(document) @Html.DocumentLink(document)
</div> </div>
@if (document.HasVisibleChildren()) @if (documentChildren.OnlyVisible().Any())
{ {
<div class="sidebar-nav-children @(Document.IdEquals(document) || document.GetChildren().Any(x => Document.IdEquals(x)) ? "active" : null)"> <div class="sidebar-nav-children @(Document.IdEquals(document) || documentChildren.Any(x => Document.IdEquals(x)) ? "active" : null)">
@foreach (IDocument child in document.GetChildren().OnlyVisible()) @foreach (IDocument child in documentChildren.OnlyVisible())
{ {
<div class="sidebar-nav-child @(Document.IdEquals(child) ? "active" : null)"> <div class="sidebar-nav-child @(Document.IdEquals(child) ? "active" : null)">
@Html.DocumentLink(child) @Html.DocumentLink(child)
@ -195,7 +196,7 @@
}, },
startOnLoad: false, startOnLoad: false,
cloneCssStyles: false cloneCssStyles: false
}); });
mermaid.init(undefined, ".mermaid"); mermaid.init(undefined, ".mermaid");
// Remove the max-width setting that Mermaid sets // Remove the max-width setting that Mermaid sets
@ -214,13 +215,13 @@
center: true, center: true,
maxZoom: 20, maxZoom: 20,
zoomScaleSensitivity: 0.6 zoomScaleSensitivity: 0.6
}); });
// Do the reset once right away to fit the diagram // Do the reset once right away to fit the diagram
panZoom.resize(); panZoom.resize();
panZoom.fit(); panZoom.fit();
panZoom.center(); panZoom.center();
$(window).resize(function(){ $(window).resize(function(){
panZoom.resize(); panZoom.resize();
panZoom.fit(); panZoom.fit();

View File

@ -11,15 +11,6 @@ namespace Docs
return document?.GetString(Constants.Description, string.Empty) ?? string.Empty; return document?.GetString(Constants.Description, string.Empty) ?? string.Empty;
} }
public static bool HasVisibleChildren(this IDocument document)
{
if (document != null)
{
return document.HasChildren() && document.GetChildren().Any(x => x.IsVisible());
}
return false;
}
public static bool IsVisible(this IDocument document) public static bool IsVisible(this IDocument document)
{ {
return !document.GetBool(Constants.Hidden, false); return !document.GetBool(Constants.Hidden, false);