Added ability to add multiple next links (lagom#456)

Fixes lagom#437.
Empia · Feb 13, 2017 · 54ab27d · 54ab27d
1 parent 8319022
commit 54ab27d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 14 deletions.
diff --git a/docs/manual/java/gettingstarted/index.toc b/docs/manual/java/gettingstarted/index.toc
@@ -1,5 +1,5 @@
 Installation:Installing Lagom
-GettingStarted:Getting started with Lagom
-GettingStartedMaven:Getting started with Lagom in Maven
+GettingStarted:Getting started with Lagom;next=GettingStartedMaven,GettingStartedSbt
+GettingStartedMaven:Getting started with Lagom in Maven;next=IDEs
 GettingStartedSbt:Getting started with Lagom in Sbt
 IDEs:Import a Lagom build in your IDE
diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt
@@ -3,7 +3,7 @@ lazy val plugins = (project in file(".")).dependsOn(dev)
 lazy val dev = ProjectRef(Path.fileProperty("user.dir").getParentFile, "sbt-plugin")
 
 resolvers += Resolver.typesafeIvyRepo("releases")
-addSbtPlugin("com.lightbend.markdown" % "sbt-lightbend-markdown" % "1.4.2")
+addSbtPlugin("com.lightbend.markdown" % "sbt-lightbend-markdown" % "1.5.0")
 
 // Needed for bintray configuration code samples
 addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

diff --git a/docs/theme/src/main/public/all-styles-concat.css b/docs/theme/src/main/public/all-styles-concat.css
diff --git a/docs/theme/src/main/public/images/logos/lagom-icon-full-color.svg b/docs/theme/src/main/public/images/logos/lagom-icon-full-color.svg
diff --git a/docs/theme/src/main/public/images/logos/lagom-icon-reverse.svg b/docs/theme/src/main/public/images/logos/lagom-icon-reverse.svg
diff --git a/docs/theme/src/main/scala/lagom/LagomMarkdownTheme.scala b/docs/theme/src/main/scala/lagom/LagomMarkdownTheme.scala
@@ -9,7 +9,7 @@ object LagomMarkdownTheme extends MarkdownTheme {
     sidebar: Option[Html], breadcrumbs: Option[Html], apiDocs: Seq[(String, String)], sourceUrl: Option[String]): Html =
     html.documentation(projectName, title, home, content, sidebar, breadcrumbs, apiDocs, sourceUrl)
 
-  override def renderNextLink(toc: TocTree): Html = html.nextLink(toc)
+  override def renderNextLinks(nextLinks: List[TocTree]): Html = html.nextLinks(nextLinks)
 
   override def renderSidebar(hierarchy: List[Toc]): Html = html.sidebar(hierarchy)
 

diff --git a/docs/theme/src/main/twirl/lagom/nextLink.scala.html b/docs/theme/src/main/twirl/lagom/nextLink.scala.html
diff --git a/docs/theme/src/main/twirl/lagom/nextLinks.scala.html b/docs/theme/src/main/twirl/lagom/nextLinks.scala.html
@@ -0,0 +1,23 @@
+@*
+* Copyright (C) 2009-2017 Lightbend Inc. <https://www.lightbend.com>
+*@
+@(nextLinks: Seq[play.doc.TocTree])
+
+@if(nextLinks.nonEmpty) {
+    @if(nextLinks.tail.nonEmpty) {
+        <nav class="next-links">
+            <strong>Next:</strong>
+            <ul>
+            @for(link <- nextLinks) {
+                <li><a href="@{link.page}.html">@link.title</a></li>
+            }
+            </ul>
+        </nav>
+    } else {
+        @for(link <- nextLinks) {
+            <nav class="next-link">
+                <a href="@{link.page}.html"><strong>Next: </strong> @link.title</a>
+            </nav>
+        }
+    }
+}