Docs layout now allows to have submenus

47degrees · Sep 27, 2016 · 3e54c79 · 3e54c79
1 parent bc68340
commit 3e54c79
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,5 +7,6 @@ resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
 addSbtPlugin("com.typesafe.sbt"                    % "sbt-ghpages"     % "0.5.4")
 libraryDependencies <+= sbtVersion("org.scala-sbt" % "scripted-plugin" % _)
 // Plugin inception dependency to be able to generate the sbt-microsites' microsite
-addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.2.4")
+resolvers += Resolver.sonatypeRepo("snapshots")
+addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.2.5-SNAPSHOT")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
diff --git a/src/main/resources/_sass/_colors.scss b/src/main/resources/_sass/_colors.scss
@@ -93,6 +93,7 @@ body.docs {
 			}
 			&.active {
 				border-left: 3px solid $brand-primary;
+				color: #fff;
 			}
 		}
 	}

diff --git a/src/main/resources/_sass/_docs.scss b/src/main/resources/_sass/_docs.scss
@@ -154,9 +154,6 @@
             }
         }
     }
-    ul.sub_section {
-        display: none;
-    }
     .active {
         display: block;
     }

diff --git a/src/main/scala/microsites/layouts/DocsLayout.scala b/src/main/scala/microsites/layouts/DocsLayout.scala
@@ -37,18 +37,7 @@ class DocsLayout(config: MicrositeSettings) extends Layout(config) {
   def sideBarAndContent: TypedTag[String] = {
     val text = s"${config.name} ${config.description}"
     div(id := "wrapper",
-      div(id := "sidebar-wrapper",
-        ul(id := "sidebar", cls := "sidebar-nav",
-          li(cls := "sidebar-brand",
-            a(href := "{{ site.baseurl }}/", cls := "brand",
-              div(cls := "brand-wrapper", style := "background:url('{{site.baseurl}}/img/sidebar_brand.png') no-repeat", span(config.name))
-            )
-          ),
-          "{% assign items = site.pages | sort: 'weight' %} {% for x in items %} {% if x.section == page.section %}",
-          li(a(href := "{{ site.baseurl }}{{x.url}}", cls := "{% if x.title == page.title %} active {% endif %}", "{{x.title}}")),
-          "{% endif %} {% endfor %}"
-        )
-      ),
+      div(id := "sidebar-wrapper", buildSidebar),
       div(id := "page-content-wrapper",
         div(cls := "nav",
           div(cls := "container-fluid",
@@ -87,6 +76,27 @@ class DocsLayout(config: MicrositeSettings) extends Layout(config) {
     )
   }
 
+  def buildSidebar: TypedTag[String] = {
+    val baseUrl = s"${config.micrositeDocumentationUrl}"
+    ul(id := "sidebar", cls := "sidebar-nav",
+      li(cls := "sidebar-brand",
+        a(href := "{{ site.baseurl }}/", cls := "brand",
+          div(cls := "brand-wrapper", style := "background:url('{{site.baseurl}}/img/sidebar_brand.png') no-repeat", span(config.name))
+        )
+      ),
+      "{% assign items = site.data.menu.options %} {% for x in items %} ",
+      li(
+        a(href := s"$baseUrl{{x.url}}", cls := "{% if x.title == page.title %} active {% endif %}", "{{x.title}}"),
+      "{% if x.nested_options %} ",
+      ul(cls := "sub_section",
+        "{% for sub in x.nested_options %} ",
+        li(a(href := s"$baseUrl{{sub.url}}", cls := "{% if sub.title == page.title %} active {% endif %}", "{{sub.title}}")),
+        "{% endfor %}"
+      ),
+      "{% endif %} {% endfor %}"
+    ))
+  }
+
   def scriptsDocs: List[TypedTag[String]] = scripts ++
     List(script(src := "{{ site.baseurl }}/js/main.js"))
 }
diff --git a/src/test/scala/microsites/util/Arbitraries.scala b/src/test/scala/microsites/util/Arbitraries.scala
@@ -53,6 +53,7 @@ trait Arbitraries {
       highlightTheme            ← Arbitrary.arbitrary[String]
       micrositeImgDirectory     ← Arbitrary.arbitrary[File]
       micrositeCssDirectory     ← Arbitrary.arbitrary[File]
+      micrositeDataDirectory    ← Arbitrary.arbitrary[File]
       micrositeExtraMdFiles     ← markdownMapArbitrary.arbitrary
       micrositeBaseUrl          ← Arbitrary.arbitrary[String]
       micrositeDocumentationUrl ← Arbitrary.arbitrary[String]
@@ -68,6 +69,7 @@ trait Arbitraries {
                         highlightTheme,
                         micrositeImgDirectory,
                         micrositeCssDirectory,
+                        micrositeDataDirectory,
                         micrositeExtraMdFiles,
                         micrositeBaseUrl,
                         micrositeDocumentationUrl,