Merge "remove left nav from any remaining sdk/ and tools/ pages. There are still some sdk/ pages but all tools/ pages are gone, so although we could just ignore such pages, better safe than sorry, so going to catch those too." into mnc-mr-docs
diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs
index 047b1be..52674ba 100644
--- a/tools/droiddoc/templates-sdk-dev/head_tag.cs
+++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs
@@ -5,11 +5,12 @@
if:devsite ?>
<meta name="top_category" value="<?cs
if:ndk ?>ndk<?cs
- elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples||preview) ?>develop<?cs
- elif:(go||libraries) ?>develop<?cs
+ elif:(guide||develop||training||reference||tools||sdk||google||reference.gms||reference.gcm||samples) ?>develop<?cs
+ elif:(topic||libraries) ?>develop<?cs
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 ?>
@@ -32,7 +33,7 @@
if:(samplesDocPage&&!samplesProjectIndex) ?> samples-docpage<?cs /if ?><?cs
else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(google||reference.gms||reference.gcm) ?>google<?cs
- elif:(go||libraries) ?><?cs
+ elif:(topic||libraries) ?><?cs
if:libraries ?>libraries<?cs
else ?>none<?cs set:dac_subcategory_set = #0 ?><?cs /if ?><?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?><?cs
@@ -68,7 +69,7 @@
elif:reference ?>/reference<?cs
elif:samples ?>/samples<?cs /if ?><?cs
elif:(google||reference.gms||reference.gcm) ?>/google<?cs
- elif:(go||libraries) ?>/go<?cs
+ elif:(topic||libraries) ?>/topic<?cs
if:libraries ?>/libraries<?cs /if ?><?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>/distribute<?cs
if:googleplay ?>/googleplay<?cs
diff --git a/tools/droiddoc/templates-sdk-dev/yaml_navtree.cs b/tools/droiddoc/templates-sdk-dev/yaml_navtree.cs
index b4a6406..e5a6404 100644
--- a/tools/droiddoc/templates-sdk-dev/yaml_navtree.cs
+++ b/tools/droiddoc/templates-sdk-dev/yaml_navtree.cs
@@ -8,7 +8,7 @@
each:page = docs.pages?><?cs
if:page.type == "package"?>
- title: <?cs var:page.label ?>
- path: <?cs var:page.link ?>
+ path: /<?cs var:page.link ?>
status_text: apilevel-<?cs var:page.apilevel ?><?cs
/if?><?cs
/each ?>