Merge pull request #2053 from wilzbach/add-version-to-prerelease

andralex · web-flow · commit 422f566a9b9c · 2018-01-04T15:19:38.000-05:00
Remove version switcher for Ddox navigation bar + show upcoming version in the Ddoc navbar
diff --git a/dpl-docs/views/layout.dt b/dpl-docs/views/layout.dt
@@ -146,12 +146,6 @@ html(lang='en-US')
           span.smallprint
             - if( haveVersion )
               | version #{version_name}
-              br
-              a(href='#{root_dir}library-prerelease/index.html') switch to pre-release version
-            - else
-              | pre-release version
-              br
-              a(href='#{root_dir}library/index.html') switch to latest release version
         p
           a(href="#{root_dir}#{ddox_dir}index.html") overview
         ul
diff --git a/std_navbar-prerelease.ddoc b/std_navbar-prerelease.ddoc
@@ -2,7 +2,7 @@ SUBNAV=
 $(SUBNAV_TEMPLATE
     $(DIVC head,
         $(H2 Library Reference)
-        $(P $(SPANC smallprint, pre-release version $(SPANC separator, $(BR))
+        $(P $(SPANC smallprint, version $(LATEST) (prerelease) $(SPANC separator, $(BR))
             )
         )
         $(P $(LINK2 index.html, overview))

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ SUBNAV=`
`2`	`2`	`$(SUBNAV_TEMPLATE`
`3`	`3`	`$(DIVC head,`
`4`	`4`	`$(H2 Library Reference)`
`5`		`- $(P $(SPANC smallprint, pre-release version $(SPANC separator, $(BR))`
	`5`	`+ $(P $(SPANC smallprint, version $(LATEST) (prerelease) $(SPANC separator, $(BR))`
`6`	`6`	`)`
`7`	`7`	`)`
`8`	`8`	`$(P $(LINK2 index.html, overview))`