diff --git a/dpl-docs/dub.selections.json b/dpl-docs/dub.selections.json
index 40f28fb8c7..7a2de20721 100644
--- a/dpl-docs/dub.selections.json
+++ b/dpl-docs/dub.selections.json
@@ -1,7 +1,11 @@
{
"fileVersion": 1,
"versions": {
- "ddox": "0.15.18",
+ "botan": "1.12.9",
+ "botan-math": "1.0.3",
+ "ddox": "0.16.0",
+ "diet-ng": "1.1.0",
+ "eventcore": "0.8.20",
"experimental_allocator": "2.70.0-b1",
"hyphenate": "1.1.1",
"libasync": "0.8.3",
@@ -9,6 +13,9 @@
"libev": "5.0.0+4.04",
"libevent": "2.0.2+2.0.16",
"memutils": "0.4.9",
- "vibe-d": "0.7.31"
+ "openssl": "1.1.5+1.0.1g",
+ "taggedalgebraic": "0.10.7",
+ "vibe-core": "1.2.0",
+ "vibe-d": "0.7.32"
}
}
diff --git a/dpl-docs/views/ddox.inc.module-tree.dt b/dpl-docs/views/ddox.inc.module-tree.dt
index faf7aa5fb3..672be20cfa 100644
--- a/dpl-docs/views/ddox.inc.module-tree.dt
+++ b/dpl-docs/views/ddox.inc.module-tree.dt
@@ -1,11 +1,5 @@
- 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, Module pack_mod)
- string pack_class = "expand-container";
- foreach(i, p; pack.packages)
diff --git a/dpl-docs/views/ddox.layout.dt b/dpl-docs/views/ddox.layout.dt
index 84d71f946c..27f5b5001d 100644
--- a/dpl-docs/views/ddox.layout.dt
+++ b/dpl-docs/views/ddox.layout.dt
@@ -5,6 +5,7 @@ block title
block ddox.title
block navigation
+ include ddox.inc.utils
include ddox.inc.module-tree
block body
diff --git a/dpl-docs/views/ddox.overview.dt b/dpl-docs/views/ddox.overview.dt
index 07d650ff4a..ea482f6f2c 100644
--- a/dpl-docs/views/ddox.overview.dt
+++ b/dpl-docs/views/ddox.overview.dt
@@ -8,6 +8,7 @@ block ddox.title
block ddox.members
+ - import std.conv : to;
- void moduleInfoRec(Package pack)
- foreach( p; pack.packages )
- moduleInfoRec(p);
@@ -16,7 +17,7 @@ block ddox.members
tr
td
a(href="#{info.linkTo(m)}")
- code!= m.qualifiedName.replace(".", ".")
+ code!= m.qualifiedName.to!string.replace(".", ".")
td
- if( m.docGroup )
|!= info.formatDoc(m.docGroup, 0, sec => sec == "$Short")
@@ -27,7 +28,7 @@ block ddox.members
- foreach( m; pack.modules )
- if (m.qualifiedName.startsWith(prefix))
a(href="#{info.linkTo(m)}")
- code!= m.qualifiedName.replace(".", ".")
+ code!= m.qualifiedName.to!string.replace(".", ".")
table
col.caption
diff --git a/dpl-docs/views/inc.disqus.dt b/dpl-docs/views/inc.disqus.dt
index 592033b91b..b40a6cda9c 100644
--- a/dpl-docs/views/inc.disqus.dt
+++ b/dpl-docs/views/inc.disqus.dt
@@ -1,8 +1,9 @@
div#disqus_thread
+- import std.conv : to;
script(language="javascript").
var disqus_shortname = 'vibe-d'; // required: replace example with your forum shortname
var disqus_developer = 1;
- var disqus_identifier = #{"\\\"phobos-" ~ info.node.qualifiedName ~ "\\\""};
+ var disqus_identifier = #{"\\\"phobos-" ~ info.node.qualifiedName.to!string ~ "\\\""};
/* * * DON'T EDIT BELOW THIS LINE * * */
diff --git a/dpl-docs/views/layout.dt b/dpl-docs/views/layout.dt
index 96f53d69cb..d033ea6a70 100644
--- a/dpl-docs/views/layout.dt
+++ b/dpl-docs/views/layout.dt
@@ -1,6 +1,7 @@
!!! 5
html(lang='en-US')
- import std.datetime : Clock;
+ - import std.array : replace;
- auto year = Clock.currTime.year;
//
| Copyright (c) 1999-$#{year} by the D Language Foundation
@@ -51,7 +52,7 @@ html(lang='en-US')
span Documentation
ul
li
- a(href="#{root_dir}spec/spec.html")Language Reference
+ a(href="#{root_dir}spec/spec.html") Language Reference
li
a(href="#{root_dir}phobos/index.html") Library Reference
li