Adding book metadata to doc head, fix tabs for content build,
fix for reference page double footer.
Change-Id: I8e721c60e21203b599779e31f48336d450a53fa3
diff --git a/tools/droiddoc/templates-sdk-dev/class.cs b/tools/droiddoc/templates-sdk-dev/class.cs
index e519bcd..335a68c 100644
--- a/tools/droiddoc/templates-sdk-dev/class.cs
+++ b/tools/droiddoc/templates-sdk-dev/class.cs
@@ -611,7 +611,9 @@
<!-- ========= END OF CLASS DATA ========= -->
</div><!-- end jd-content -->
+<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
<?cs include:"trailer.cs" ?>
+<?cs /if ?>
</body>
</html>
diff --git a/tools/droiddoc/templates-sdk-dev/classes.cs b/tools/droiddoc/templates-sdk-dev/classes.cs
index 48be3ef..2793db3 100644
--- a/tools/droiddoc/templates-sdk-dev/classes.cs
+++ b/tools/droiddoc/templates-sdk-dev/classes.cs
@@ -36,7 +36,9 @@
</table>
<?cs /each ?>
+<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
<?cs include:"trailer.cs" ?>
+<?cs /if ?>
</body>
</html>
diff --git a/tools/droiddoc/templates-sdk-dev/docpage.cs b/tools/droiddoc/templates-sdk-dev/docpage.cs
index ab5fb40..3d17d37 100644
--- a/tools/droiddoc/templates-sdk-dev/docpage.cs
+++ b/tools/droiddoc/templates-sdk-dev/docpage.cs
@@ -171,6 +171,20 @@
<?cs /if ?>
<?cs /if ?><?cs # end if design ?>
+ <?cs if devsite ?>
+ <?cs if:tab1 ?>
+ <div id="title-tabs-wrapper">
+ <ul id="title-tabs">
+ <li class="selected"><a href="<?cs var:tab1.link ?>"><?cs var:tab1 ?></a></li>
+ <?cs if:tab2 ?>
+ <li><a href="<?cs var:tab2.link ?>"><?cs var:tab2 ?></a></li><?cs /if ?>
+ <?cs if:tab3 ?>
+ <li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?>
+ </ul>
+ </div><!-- end tab-wrapper -->
+ <?cs /if ?>
+ <?cs /if ?>
+
<?cs # THIS IS THE MAIN DOC CONTENT ?>
<div id="jd-content">
<div class="jd-descr" itemprop="articleBody">
diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs
index 97343bd..4088a57 100644
--- a/tools/droiddoc/templates-sdk-dev/head_tag.cs
+++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs
@@ -9,15 +9,17 @@
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>distribute<?cs
elif:(design||vision||material||patterns||devices||designdownloads) ?>design<?cs
elif:(about||versions||wear||tv||auto) ?>about<?cs
+ elif:preview ?>preview<?cs
else ?>none<?cs
/if ?>" />
+ <?cs set:dac_subcategory_set = #1 ?>
<meta name="subcategory" value="<?cs
if:ndk ?><?cs
if:guide ?>guide<?cs
elif:samples ?>samples<?cs
elif:reference ?>reference<?cs
elif:downloads ?>downloads<?cs
- else ?>none<?cs /if ?><?cs
+ else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
else ?><?cs
if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs
if:guide ?>guide<?cs
@@ -28,7 +30,7 @@
elif:tools ?>tools<?cs
elif:sdk ?>sdk<?cs
elif:samples ?>samples<?cs
- else ?>none<?cs /if ?><?cs
+ else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(google||reference.gms||reference.gcm) ?>google<?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?><?cs
if:googleplay ?>googleplay<?cs
@@ -39,15 +41,46 @@
elif:disttools ?>disttools<?cs
elif:stories ?>stories<?cs
elif:analyze ?>analyze<?cs
- else ?>none<?cs /if ?><?cs
+ else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(about||versions||wear||tv||auto) ?>about<?cs
+ elif:preview ?>preview<?cs
elif:design ?>design<?cs
elif:walkthru ?>walkthru<?cs
- else ?>none<?cs /if ?><?cs
+ else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
/if ?>" />
<?cs if:nonavpage ?>
- <meta name="hidetoc" value='True' />
+ <meta name="hide_toc" value='True' />
+ <?cs elif: !nonavpage && dac_subcategory_set ?>
+ <meta name="book_path" value="<?cs
+ if:ndk ?>/ndk<?cs
+ if:guide ?>/guides<?cs
+ elif:samples ?>/samples<?cs
+ elif:reference ?>/reference<?cs
+ elif:downloads ?>/downloads<?cs /if ?><?cs
+ else ?><?cs
+ if:(guide||develop||training||reference||tools||sdk||samples) ?><?cs
+ if:guide ?>/guide<?cs
+ elif:training ?>/training<?cs
+ elif:reference ?>/reference<?cs
+ elif:tools ?>/tools<?cs
+ elif:sdk ?>/tools<?cs
+ elif:samples ?>/samples<?cs /if ?><?cs
+ elif:(google||reference.gms||reference.gcm) ?>/google<?cs
+ elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>/distribute<?cs
+ if:googleplay ?>/googleplay<?cs
+ elif:essentials ?>/essentials<?cs
+ elif:users ?>/users<?cs
+ elif:engage ?>/engage<?cs
+ elif:monetize ?>/monetize<?cs
+ elif:disttools ?>/disttools<?cs
+ elif:stories ?>/stories<?cs
+ elif:analyze ?>/analyze<?cs /if ?><?cs
+ elif:(about||versions||wear||tv||auto) ?>/about<?cs
+ elif:preview ?>/preview<?cs
+ elif:design ?>/design<?cs
+ elif:walkthru ?>/walkthru<?cs /if ?><?cs
+ /if ?>/_book.yaml" />
<?cs /if ?>
<?cs if:page.tags && page.tags != "" ?>
diff --git a/tools/droiddoc/templates-sdk-dev/package.cs b/tools/droiddoc/templates-sdk-dev/package.cs
index a5f3057..460a67b 100644
--- a/tools/droiddoc/templates-sdk-dev/package.cs
+++ b/tools/droiddoc/templates-sdk-dev/package.cs
@@ -31,7 +31,9 @@
<?cs call:class_table("Errors", package.errors) ?>
</div><!-- end apilevel -->
+<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
<?cs include:"trailer.cs" ?>
+<?cs /if ?>
</body>
</html>
diff --git a/tools/droiddoc/templates-sdk-dev/packages.cs b/tools/droiddoc/templates-sdk-dev/packages.cs
index 5ffd4ce..4db2ea9 100644
--- a/tools/droiddoc/templates-sdk-dev/packages.cs
+++ b/tools/droiddoc/templates-sdk-dev/packages.cs
@@ -21,7 +21,9 @@
<?cs /each ?>
</table>
+<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
<?cs include:"trailer.cs" ?>
+<?cs /if ?>
</body>
</html>
diff --git a/tools/droiddoc/templates-sdk-dev/sample.cs b/tools/droiddoc/templates-sdk-dev/sample.cs
index 3c713b6..2c5b9d2 100644
--- a/tools/droiddoc/templates-sdk-dev/sample.cs
+++ b/tools/droiddoc/templates-sdk-dev/sample.cs
@@ -25,7 +25,7 @@
<div id="pathCrumb">
<?cs each:item = parentdirs ?>
<?cs if:LinkifyPathCrumb
- ?><a href="<?cs var:toroot ?><?cs var:item.Link ?>"><?cs var:item.Name ?></a> /
+ ?><a href="<?cs var:toroot ?><?cs var:item.Link ?>"><?cs var:item.Name ?></a> /
<?cs else
?><?cs var:item.Name ?> / <?cs /if ?>
<?cs /each ?>
@@ -130,16 +130,10 @@
</div> <!-- end jd-content -->
-<?cs include:"footer.cs" ?>
-
-<?cs include:"trailer.cs" ?>
+ <?cs if:!devsite ?>
+ <?cs include:"footer.cs" ?>
+ <?cs include:"trailer.cs" ?>
+ <?cs /if ?>
</body>
</html>
-
-
-
-
-
-
-
