merge in ics-mr1-release history after reset to ics-mr1
diff --git a/res/assets/templates/designpage.cs b/res/assets/templates/designpage.cs
new file mode 100644
index 0000000..1dec41e
--- /dev/null
+++ b/res/assets/templates/designpage.cs
@@ -0,0 +1,23 @@
+<?cs include:"doctype.cs" ?>
+<?cs include:"macros.cs" ?>
+<html>
+<?cs include:"head_tag.cs" ?>
+<body class="gc-documentation">
+<a name="top"></a>
+<?cs call:custom_masthead() ?>
+
+<div id="body-content">
+<div id="doc-content" style="position:relative;">
+
+<?cs call:tag_list(root.descr) ?>
+
+<?cs include:"footer.cs" ?>
+</div><!-- end doc-content -->
+
+<?cs include:"trailer.cs" ?>
+
+</body>
+</html>
+
+
+
diff --git a/src/com/google/doclava/DocFile.java b/src/com/google/doclava/DocFile.java
index 700167a..4dd81bc 100644
--- a/src/com/google/doclava/DocFile.java
+++ b/src/com/google/doclava/DocFile.java
@@ -133,6 +133,9 @@
} else if ((outfile.indexOf("resources/") != -1) || (outfile.indexOf("training/") != -1)) {
hdf.setValue("resources", "true");
ClearPage.write(hdf, "docpage.cs", outfile);
+ } else if (outfile.indexOf("design/") != -1) {
+ hdf.setValue("design", "true");
+ ClearPage.write(hdf, "designpage.cs", outfile);
} else {
ClearPage.write(hdf, "nosidenavpage.cs", outfile);
}
