fixes #520

modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.Designer.cs

@@ -0,0 +1,68 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.DocsTestApp.EntityFrameworkCore;
+
+namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations
+{
+    [DbContext(typeof(DocsTestAppDbContext))]
+    [Migration("20181030125213_Added_Project_MinimumVersion")]
+    partial class Added_Project_MinimumVersion
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Volo.Docs.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("DefaultDocumentName")
+                        .IsRequired()
+                        .HasMaxLength(128);
+
+                    b.Property<string>("DocumentStoreType");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Format");
+
+                    b.Property<string>("GoogleCustomSearchId");
+
+                    b.Property<string>("LatestVersionBranchName")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("MainWebsiteUrl");
+
+                    b.Property<string>("MinimumVersion");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128);
+
+                    b.Property<string>("NavigationDocumentName")
+                        .IsRequired()
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ShortName")
+                        .IsRequired()
+                        .HasMaxLength(32);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocsProjects");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/20181030125213_Added_Project_MinimumVersion.cs

@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations
+{
+    public partial class Added_Project_MinimumVersion : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "LatestVersionBranchName",
+                table: "DocsProjects",
+                maxLength: 128,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MinimumVersion",
+                table: "DocsProjects",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LatestVersionBranchName",
+                table: "DocsProjects");
+
+            migrationBuilder.DropColumn(
+                name: "MinimumVersion",
+                table: "DocsProjects");
+        }
+    }
+}

modules/docs/app/Volo.DocsTestApp.EntityFrameworkCore/Migrations/DocsTestAppDbContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "2.1.3-rtm-32065")
+                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128)
                 .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
@@ -37,8 +37,13 @@ namespace Volo.DocsTestApp.EntityFrameworkCore.Migrations
 
                     b.Property<string>("GoogleCustomSearchId");
 
+                    b.Property<string>("LatestVersionBranchName")
+                        .HasMaxLength(128);
+
                     b.Property<string>("MainWebsiteUrl");
 
+                    b.Property<string>("MinimumVersion");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(128);

modules/docs/src/Volo.Docs.Web/Areas/Documents/Helpers/TagHelpers/TreeTagHelper.cs

@@ -90,7 +90,7 @@ namespace Volo.Docs.Areas.Documents.Helpers.TagHelpers
 
         private string GetLeafNode(NavigationNode node, string content)
         {
-            var anchorCss = node.Path.IsNullOrEmpty() ? "tree-toggle" : "";
+            var textCss = node.Path.IsNullOrEmpty() ? "tree-toggle" : "";
             var isNodeSelected = node.IsSelected(SelectedDocumentName);
             var listItemCss = node.HasChildItems ? "nav-header" : "last-link";
             if (isNodeSelected)
@@ -101,16 +101,16 @@ namespace Volo.Docs.Areas.Documents.Helpers.TagHelpers
             string listInnerItem;
             if (node.Path.IsNullOrEmpty() && node.IsLeaf)
             {
-                listInnerItem = string.Format(ListItemSpan, anchorCss, node.Text.IsNullOrEmpty() ? "?" : node.Text);
+                listInnerItem = string.Format(ListItemSpan, textCss, node.Text.IsNullOrEmpty() ? "?" : node.Text);
             }
             else
             {
-                listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path, node.HasChildItems), anchorCss, node.Text.IsNullOrEmpty() ? "?" : node.Text);
+                listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path, node.HasChildItems), textCss, node.Text.IsNullOrEmpty() ? "?" : node.Text);
             }
 
             return string.Format(LiItemTemplateWithLink,
                 listItemCss,
-                node.HasChildItems ? "chevron-right" : "long-arrow-right",
+                node.HasChildItems ? "chevron-right" : "long-arrow-right " + (node.Path.IsNullOrEmpty() ?  "no-link" : "has-link"),
                 listInnerItem,
                 content);
         }

modules/docs/src/Volo.Docs.Web/Pages/Documents/_docs.css

@@ -109,7 +109,11 @@
               left: 2px;
               top: 11px;
               color: #aaa;
-              cursor: pointer; }
+              cursor: default; }
+              .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li .plus-icon .fa-long-arrow-right.no-link {
+                color: #555; }
+              .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li .plus-icon .fa-chevron-right {
+                cursor: pointer; }
             .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li ul {
               padding: 0; }
               .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li ul li a {
@@ -282,7 +286,11 @@
         left: 2px;
         top: 11px;
         color: #aaa;
-        cursor: pointer; }
+        cursor: default; }
+        .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li a .plus-icon .fa-long-arrow-right.no-link {
+          color: #555; }
+        .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li a .plus-icon .fa-chevron-right {
+          cursor: pointer; }
         .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li a .plus-icon.last-link {
           top: 11px; }
     .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li span.tree-toggle {

modules/docs/src/Volo.Docs.Web/Pages/Documents/_docs.scss

@@ -156,7 +156,17 @@ body {
                             left: 2px;
                             top: 11px;
                             color: #aaa;
-                            cursor: pointer;
+                            cursor: default;
+
+                            .fa-long-arrow-right {
+                                &.no-link {
+                                    color: #555;
+                                }
+                            }
+
+                            .fa-chevron-right {
+                                cursor: pointer;
+                            }
                         }
 
                         ul {
@@ -474,7 +484,17 @@ body {
                                         left: 2px;
                                         top: 11px;
                                         color: #aaa;
-                                        cursor: pointer;
+                                        cursor: default;
+
+                                        .fa-long-arrow-right {
+                                            &.no-link {
+                                                color: #555;
+                                            }
+                                        }
+
+                                        .fa-chevron-right {
+                                            cursor: pointer;
+                                        }
 
                                         &.last-link {
                                             top: 11px;

modules/docs/src/Volo.Docs.Web/Pages/Documents/vs.css

@@ -109,7 +109,11 @@
               left: 2px;
               top: 11px;
               color: #aaa;
-              cursor: pointer; }
+              cursor: default; }
+              .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li .plus-icon .fa-long-arrow-right.no-link {
+                color: #555; }
+              .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li .plus-icon .fa-chevron-right {
+                cursor: pointer; }
             .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li ul {
               padding: 0; }
               .docs-page .docs-sidebar .docs-sidebar-wrapper .docs-tree-list ul li ul li a {
@@ -282,7 +286,11 @@
         left: 2px;
         top: 11px;
         color: #aaa;
-        cursor: pointer; }
+        cursor: default; }
+        .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li a .plus-icon .fa-long-arrow-right.no-link {
+          color: #555; }
+        .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li a .plus-icon .fa-chevron-right {
+          cursor: pointer; }
         .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li a .plus-icon.last-link {
           top: 11px; }
     .docs-page .docs-sidebar.dark-sidebar .docs-sidebar-wrapper .docs-tree-list ul li span.tree-toggle {

modules/docs/src/Volo.Docs.Web/Pages/Documents/vs.js

@@ -2,9 +2,21 @@ $('li:not(.last-link) a.tree-toggle').click(function () {
     $(this).parent().children('ul.tree').toggle(100);
     $(this).closest("li").toggleClass("selected-tree");
 });
-$('li:not(.last-link) span.plus-icon').click(function () {
+$('li:not(.last-link) span.plus-icon i.fa-chevron-right').click(function () {
-    $(this).parent().children('ul.tree').toggle(100);
+
-    $(this).closest("li").toggleClass("selected-tree");
+    //var hasLink = $(this).parent().find("a").length > 0;
+    //if (!hasLink) {
+    //    return;
+    //}
+
+    ////if ($(this).find("i.fa-long-arrow-right").length > 0) {
+    ////    return;
+    ////}
+
+    var $element = $(this).parent();
+
+    $element.parent().children('ul.tree').toggle(100);
+    $element.closest("li").toggleClass("selected-tree");
 });
 
 $(document).ready(function () {
@@ -27,14 +39,14 @@ $(document).ready(function () {
             scrollTop: 0
         }, 500);
         return false;
-    }); 
+    });
-     
+
 });
 
 $(document).ready(function () {
     var navSelector = '#docs-sticky-index';
     var $myNav = $(navSelector);
-    Toc.init($myNav); 
+    Toc.init($myNav);
     $('body').scrollspy({
         target: $myNav
     });
@@ -83,17 +95,17 @@ $('.open-dmenu').on("click", function () {
 
 
 
-    window.Toc.helpers.createNavList = function() {
+    window.Toc.helpers.createNavList = function () {
         return $('<ul class="nav nav-pills flex-column"></ul>');
     };
 
-    window.Toc.helpers.createChildNavList = function($parent) {
+    window.Toc.helpers.createChildNavList = function ($parent) {
         var $childList = this.createNavList();
         $parent.append($childList);
         return $childList;
     };
 
-    window.Toc.helpers.generateNavEl = function(anchor, text) {
+    window.Toc.helpers.generateNavEl = function (anchor, text) {
         var $a = $('<a class="nav-link"></a>');
         $a.attr('href', '#' + anchor);
         $a.text(text);

modules/docs/src/Volo.Docs.Web/Pages/Documents/vs.scss

@@ -1,4 +1,6 @@
 @import "_docs.scss";  
 @media (max-width: 767px) { 
     @import "_responsive.scss"; 
+
+
 }

modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

@@ -41,7 +41,6 @@
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
     <None Remove="Pages\Documents\Project\vs.js" />
-    <None Remove="Pages\Documents\vs.min.css" />
     <None Include="compilerconfig.json" />
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>