Fixed title and metadata in template. Also, removed references to mainUri for module.
diff --git a/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt b/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt
index 58bcd60..5a56b81 100644
--- a/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt
+++ b/core/src/main/kotlin/Formats/DacExtraOutlineServices.kt
@@ -14,7 +14,7 @@
uriProvider.containerUri(node).resolve("navtree_data.js")
override fun format(uri: URI, to: Appendable, node: DocumentationNode) {
- to.append("var NAVTREE_DATA = ").appendNavTree(node.members).append(";")
+ to.append("var NAVTREE_DATA_KT = ").appendNavTree(node.members).append(";")
}
private fun Appendable.appendNavTree(nodes: Iterable<DocumentationNode>): Appendable {
@@ -99,6 +99,7 @@
to.append("var ARCH_DATA = [\n")
var first = true
for (pageNode in pageNodes) {
+ if (pageNode.kind == NodeKind.Module) continue
if (!first) to.append(", \n")
first = false
to.append(" { " +
diff --git a/core/src/main/kotlin/Formats/DacHtmlFormat.kt b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
index b7c102b..4467375 100644
--- a/core/src/main/kotlin/Formats/DacHtmlFormat.kt
+++ b/core/src/main/kotlin/Formats/DacHtmlFormat.kt
@@ -23,11 +23,13 @@
attributes["devsite"] = "true"
head {
headContent()
- meta(name = "top_category") { attributes["value"] = "develop" }
- meta(name = "subcategory") { attributes["value"] = "reference" }
- meta(name = "hide_page_heading") { attributes["value"] = "true" }
- meta(name = "book_path") { attributes["value"] = "/$rootFile/_toc.yaml" }
- meta(name = "project_path") { attributes["value"] = "/${rootFile.parent}/_project.yaml" }
+ title {+when(page) {
+ is JavaLayoutHtmlFormatOutputBuilder.Page.ClassIndex -> "Class Index | Android Developers"
+ is JavaLayoutHtmlFormatOutputBuilder.Page.ClassPage -> page.node.nameWithOuterClass()
+ is JavaLayoutHtmlFormatOutputBuilder.Page.PackageIndex -> "Package Index | Android Developers"
+ is JavaLayoutHtmlFormatOutputBuilder.Page.PackagePage -> page.node.nameWithOuterClass()
+ }}
+ unsafe {+"{% setvar book_path %}/reference/android/arch/_book.yaml{% endsetvar %}\n{% include \"_shared/_reference-head-tags.html\" %}\n"}
}
body {
bodyContent()