Fix views

Author: wilzbach

dpl-docs/views/ddox.inc.module-tree.dt

@@ -1,32 +1,23 @@
 - import ddox.entities;
 
-- Module getPackageModule(Package pack)
-	- import std.algorithm : find;
-	- if (auto pp = cast(Package)pack.parent)
-		- return pp.lookup!Module(pack.name);
-	- return null;
+- void moduleNavTree(Package pack)
+	ul.tree-view
+		- foreach (i, p; pack.packages)
+			- auto subpackmod = getPackageModule(p);
+			- bool is_active = !pack.parent && !info.node.parent || p.isAncestorOf(info.node) || subpackmod && subpackmod.isAncestorOf(info.node) || subpackmod is info.node;
+			li.tree-view(class=is_active ? "" : "collapsed")
+				.package(class=info.node is subpackmod || subpackmod && subpackmod.isAncestorOf(info.node) ? "selected" : "")
+					- if (subpackmod)
+						a(href=info.linkTo(subpackmod))= subpackmod.name
+					- else
+						|= p !is info.rootPackage ? p.name : null
+				- moduleNavTree(p);
 
-- void moduleNavTree(Package pack, Module pack_mod)
-	- string pack_class = "expand-container";
-	- foreach(i, p; pack.packages)
-		- auto subpackmod = getPackageModule(p);
-		- bool is_active = p.isAncestorOf(info.node) || subpackmod && subpackmod.isAncestorOf(info.node) || subpackmod is info.node;
-		li(class=is_active ? pack_class ~ " open" : pack_class)
-			a.package(href="#", class="expand-toggle")
-				span= p !is info.rootPackage ? p.name : null
-			ul.tree-view
-				- moduleNavTree(p, subpackmod);
+		- foreach(m; pack.modules)
+			- if (pack.findChild!Package(m.name))
+				- continue;
+			li
+				.module(class=info.node is m || m.isAncestorOf(info.node) ? "selected" : "")
+					a(href=info.linkTo(m))= m.name
 
-	- if (pack_mod)
-		li
-			a.module(href="#{info.linkTo(pack_mod)}", class='#{info.node is pack_mod || pack_mod.isAncestorOf(info.node) ? "selected" : ""}')
-				span Package members
-
-	- foreach(m; pack.modules)
-		- if (pack.lookup!Package(m.name))
-			- continue;
-		li
-			a.module(href="#{info.linkTo(m)}", class='#{info.node is m || m.isAncestorOf(info.node) ? "selected" : ""}')
-				span= m.name
-
-- moduleNavTree(info.rootPackage, null);
+- moduleNavTree(info.rootPackage);

dpl-docs/views/ddox.layout.dt

@@ -5,7 +5,19 @@ block title
 	block ddox.title
 
 block navigation
-	include ddox.inc.module-tree
+	include ddox.inc.utils
+
+	- import ddox.settings : NavigationType;
+	- final switch( info.settings.navigationType )
+		- case NavigationType.moduleTree:
+			include ddox.inc.module-tree
+			- break;
+		- case NavigationType.moduleList:
+			include ddox.inc.module-list
+			- break;
+		- case NavigationType.declarationTree:
+			include ddox.inc.decl-tree
+			- break;
 
 block body
 	block ddox.description

dpl-docs/views/inc.disqus.dt

@@ -3,7 +3,7 @@ div#disqus_thread
 script(language="javascript").
     var disqus_shortname = 'vibe-d'; // required: replace example with your forum shortname
     var disqus_developer = 1;
-    var disqus_identifier = #{text("\\\"phobos-", info.node.qualifiedName.text, "\\\"")};
+    var disqus_identifier = #{text(`"phobos-`, info.node.qualifiedName.text, `"`)};
 
 
     /* * * DON'T EDIT BELOW THIS LINE * * */

dpl-docs/views/layout.dt

@@ -29,7 +29,6 @@ html(lang='en-US')
     link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
     link(rel='shortcut icon', href='#{root_dir}favicon.ico')
     script(src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js', type='text/javascript')
-    script(type="text/javascript", src="#{root_dir}js/ddox.js")
     meta(name='viewport', content='width=device-width, initial-scale=1.0, minimum-scale=0.1, maximum-scale=10.0')
 
   body.std(id='#{info.node.moduleName}')
@@ -137,8 +136,8 @@ html(lang='en-US')
                   button(type='submit')
                     i.fa.fa-search
                     span go
-              include ddox.inc.symbol-search.results
 
+            ul#symbolSearchResults.symbolList(style="display: none")
     .container
       .subnav-helper
       .subnav
@@ -160,6 +159,7 @@ html(lang='en-US')
       #content.hyphenate
         #tools
           div
+            - import ddox.entities : Declaration;
             - auto modname = info.node.moduleName;
             - string project = "dlang.org";
             - string path_prefix, line_suffix, filename;
@@ -231,6 +231,11 @@ html(lang='en-US')
     script(type='text/javascript', src='#{root_dir}js/run_examples.js')
     script(type='text/javascript', src='#{root_dir}js/dlang.js')
     script(type='text/javascript', src='#{root_dir}js/listanchors.js')
+    script(type="application/javascript", src="#{info.linkTo(null)}symbols.js")
+    - import vibe.data.json;
+    script(type="application/javascript").
+        var symbolSearchRootDir = #{Json(info.linkTo(null)).toString()};
+    script(type="text/javascript", src="#{root_dir}js/ddox.js")
     script(type='text/javascript').
       jQuery(document).ready(listanchors);
       setupDdox();