diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2012-11-30 15:39:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-30 15:39:03 -0800 |
| commit | e0dceabdd8a4f56ebf7ae1429350d350bac6d812 (patch) | |
| tree | b5ec904493c9550376e067432d1c08ac266e6eef /tools | |
| parent | ac71b2b59bae525502ae0b7af93b5f3a9f569b47 (diff) | |
| parent | 18dca5d058ae277e85c64118ac9d18c7af482ad7 (diff) | |
| download | build-e0dceabdd8a4f56ebf7ae1429350d350bac6d812.zip build-e0dceabdd8a4f56ebf7ae1429350d350bac6d812.tar.gz build-e0dceabdd8a4f56ebf7ae1429350d350bac6d812.tar.bz2 | |
Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sdk/docpage.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs index 053738b..0e7c247 100644 --- a/tools/droiddoc/templates-sdk/docpage.cs +++ b/tools/droiddoc/templates-sdk/docpage.cs @@ -17,7 +17,7 @@ ?>class="col-13" id="doc-col"<?cs else ?>class="col-12" id="doc-col"<?cs /if ?> > -<?cs if:(design||training||walkthru) && !page.trainingcourse ?><?cs # header logic for docs that provide previous/next buttons ?> +<?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs # header logic for docs that provide previous/next buttons ?> <?cs if:header.hide ?> <?cs else ?> <div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> @@ -154,7 +154,7 @@ </div> <?cs # for training classes, provide a different kind of link when the next page is a different class ?> - <?cs if:training ?> + <?cs if:training && !page.article ?> <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="next-class-link hide">Next class: </a> </div> |