Merge all of templates-sdk-dev into templates-sdk.
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.
Change-Id: I276695969e02fcf718370564e84b077a9d43725e
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index d41adaa..e8a5ba3 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -1,10 +1,10 @@
-<?cs include:"doctype.cs" ?>
-<?cs include:"macros.cs" ?>
-<html<?cs if:devsite ?> devsite<?cs /if ?>>
+<?cs if:!devsite ?><?cs
+ include:"doctype.cs" ?><?cs /if ?><?cs
+ include:"macros.cs" ?><html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?>
-<body class="gc-documentation
-
-<?cs # add document classes for navigation header selection (and other stuff) ?>
+<body<?cs
+if:!devsite ?> class="gc-documentation<?cs
+# add document classes for navigation header selection (and other stuff) ?>
<?cs
if:(google || reference.gms || reference.gcm) ?>google <?cs /if ?><?cs
if:ndk ?>ndk<?cs
@@ -13,10 +13,9 @@
if:reference ?> reference<?cs /if ?><?cs
if:downloads ?> downloads<?cs /if ?><?cs
else ?><?cs
- if:(guide||develop||training||reference||tools||sdk||google||samples||preview) ?>develop<?cs
+ if:(guide||develop||training||reference||tools||sdk||google||samples) ?>develop<?cs
if:guide ?> guide<?cs /if ?><?cs
if:samples ?> samples<?cs /if ?><?cs
- if:preview ?> preview<?cs /if ?><?cs
elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories||analyze) ?>distribute<?cs
if:googleplay ?> googleplay<?cs /if ?><?cs
if:essentials ?> essentials<?cs /if ?><?cs
@@ -26,29 +25,42 @@
if:disttools ?> disttools<?cs /if ?><?cs
if:stories ?> stories<?cs /if ?><?cs
if:analyze ?> analyze<?cs /if ?><?cs
- elif:(about||wear||tv||auto) ?>about<?cs
- elif:design ?>design<?cs
+ elif:(design||vision||material||patterns||devices||designdownloads) ?> design<?cs
+ if:vision ?> vision<?cs /if ?><?cs
+ if:material ?> material<?cs /if ?><?cs
+ if:patterns ?> patterns<?cs /if ?><?cs
+ if:devices ?> devices<?cs /if ?><?cs
+ if:designdownloads ?> designdownloads<?cs /if ?><?cs
+ elif:(about||versions||wear||tv||auto) ?> about<?cs
+ if:versions ?> versions<?cs /if ?><?cs
+ if:wear ?> wear<?cs /if ?><?cs
+ if:tv ?> tv<?cs /if ?><?cs
+ if:auto ?> auto<?cs /if ?><?cs
+ elif:(preview) ?> preview<?cs
/if ?><?cs
if:page.trainingcourse ?> trainingcourse<?cs /if ?><?cs
-/if ?>" itemscope itemtype="http://schema.org/Article"><?cs
-include:"header.cs" ?>
+ /if ?>" itemscope itemtype="http://schema.org/Article"><?cs
+/if ?>><?cs
+include:"header.cs" ?><?cs
-<div <?cs
- if:fullpage
- ?>class="fullpage"<?cs
- elif:(design||tools||about||sdk||googleplay||essentials||users||engage||monetize||disttools||stories) && !nonavpage
- ?>class="col-13" id="doc-col"<?cs
- elif:!nonavpage
- ?>class="col-12" id="doc-col"<?cs /if ?> >
-
-<?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="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
+if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs
+# header logic for docs that provide previous/next buttons ?><?cs
+ if:(header.hide||devsite) ?><?cs
+ else ?>
+ <div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
<?cs if:header.justLinks ?>
- <?cs else ?><h1 itemprop="name"><?cs var:page.title ?></h1>
- <?cs /if ?>
- <?cs if:training ?>
+ <?cs else ?>
+ <ul class="dac-header-crumbs">
+ <?cs # More <li> elements added here with javascript ?>
+ </ul>
+
+ <!-- Breadcrumb Setup -->
+ <script>$('.dac-nav-list').dacCurrentPage().dacCrumbs();</script>
+
+ <h1 itemprop="name"><?cs var:page.title ?>
+ </h1><?cs
+ /if ?><?cs
+ if:training ?>
<div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="prev-page-link hide"
zh-tw-lang="上一堂課"
@@ -74,9 +86,9 @@
ja-lang="開始する"
es-lang="Empezar"
>Get started</a>
- </div>
- <?cs elif:!page.trainingcourse ?>
- <div class="paging-links" itemscope itemtype="http://schema.org/SiteNavigationElement">
+ </div><?cs
+ elif:!page.trainingcourse ?>
+ <?cs # <div class="paging-linkss" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="prev-page-link hide"
zh-tw-lang="上一堂課"
zh-cn-lang="上一课"
@@ -93,12 +105,12 @@
ja-lang="次へ"
es-lang="Siguiente"
>Next</a>
- </div>
- <?cs /if ?><?cs # end if training ?>
+ </div> ?><?cs
+ /if ?><?cs # end if training ?>
</div>
- <?cs /if ?><?cs # end if header.hide ?>
+ <?cs /if ?><?cs # end if header.hide ?><?cs
-<?cs elif:samplesProjectIndex ?>
+elif:samplesProjectIndex ?>
<div id="api-info-block">
<div class="sum-details-links">
Overview
@@ -108,18 +120,9 @@
</div><!-- end breadcurmb block -->
<h1 itemprop="name"><?cs var:projectDir ?></h1>
-<?cs else ?>
- <?cs if:training ?>
-<?cs # horrible horrible hack to move TOC up when the next/prev links are not there ?>
-<style>
- #tb-wrapper {
- margin-top:6px;
- }
-</style>
- <?cs /if ?>
-
- <?cs if:(!fullpage && !header.hide) ?>
- <?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?>
+<?cs else ?><?cs
+ if:(!fullpage && !header.hide && !devsite) ?><?cs
+ if:page.landing ?><?cs # header logic for docs that are landing pages ?>
<div class="landing-banner">
<?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?>
<div class="cols">
@@ -137,8 +140,15 @@
</div>
<?cs /if ?>
</div>
- <?cs else ?>
- <?cs if:tab1 ?><div id="title-tabs-wrapper"><?cs /if ?>
+ <?cs else ?><?cs
+ if:tab1 ?><div id="title-tabs-wrapper"><?cs /if ?>
+ <ul class="dac-header-crumbs">
+ <?cs # More <li> elements added here with javascript ?>
+ </ul>
+
+ <!-- Breadcrumb Setup -->
+ <p><script>$('.dac-nav-list').dacCurrentPage().dacCrumbs();</script></p>
+
<h1 itemprop="name" <?cs if:tab1 ?>class="with-title-tabs"<?cs /if ?>><?cs var:page.title ?></h1><?cs
if:tab1 ?><ul id="title-tabs">
<li class="selected"><a href="<?cs var:tab1.link ?>"><?cs var:tab1 ?></a></li>
@@ -148,24 +158,73 @@
<li><a href="<?cs var:tab3.link ?>"><?cs var:tab3 ?></a></li><?cs /if ?>
</ul>
<?cs /if ?>
- <?cs if:tab1 ?></div><!-- end tab-wrapper --><?cs /if ?>
- <?cs /if ?>
- <?cs /if ?>
-<?cs /if ?><?cs # end if design ?>
+ <?cs if:tab1 ?></div><!-- end tab-wrapper --><?cs /if ?><?cs
+ /if ?><?cs
+ /if ?><?cs
+/if ?><?cs # end if design ?><?cs
- <?cs # THIS IS THE MAIN DOC CONTENT ?>
+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 ?><?cs
+ if:!devsite ?>
<div id="jd-content">
+ <div class="jd-descr" itemprop="articleBody"><?cs
+ /if ?><?cs
+ if:(!fullpage && !header.hide && devsite) ?><?cs
+ if:page.landing ?><?cs # header logic for docs that are landing pages ?>
+ <div class="landing-banner">
+ <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?>
+ <div class="cols">
+ <div class="col-6">
+ <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" />
+ </div>
+ <div class="col-6">
+ <?cs /if ?>
+ <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1>
+ <p itemprop="description"><?cs var:page.landing.intro ?></p>
+ <p><a class="next-page-link topic-start-link"></a></p><?cs
+ if:page.landing.image ?>
+ </div>
+ </div><?cs
+ /if ?>
+ </div><?cs
+ /if ?><?cs
+ /if ?>
- <div class="jd-descr" itemprop="articleBody">
- <?cs call:tag_list(root.descr) ?>
- </div>
+<?cs call:tag_list(root.descr) ?><?cs
- <?cs if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?>
+if:!devsite ?>
+ </div><!-- end jd-descr --><?cs
+/if ?><?cs
+
+if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse
+ && !footer.hide && !devsite?>
<div class="content-footer <?cs
if:fullpage ?>wrap<?cs /if ?>"
itemscope itemtype="http://schema.org/SiteNavigationElement">
<div class="paging-links">
+ <a href="#" class="prev-page-link hide"
+ zh-tw-lang="上一堂課"
+ zh-cn-lang="上一课"
+ ru-lang="Предыдущий"
+ ko-lang="이전"
+ ja-lang="前へ"
+ es-lang="Anterior"
+ ><span class="page-link-caption">Previous</span>
+ </a>
<a href="#" class="next-page-link hide"
zh-tw-lang="下一堂課"
zh-cn-lang="下一课"
@@ -173,7 +232,8 @@
ko-lang="다음"
ja-lang="次へ"
es-lang="Siguiente"
- >Next</a>
+ ><span class="page-link-caption">Next</span>
+ </a>
<a href="#" class="start-class-link hide"
zh-tw-lang="開始上課"
zh-cn-lang="开始"
@@ -182,22 +242,20 @@
ja-lang="開始する"
es-lang="Empezar"
>Get started</a>
- <a href="#" class="next-class-link hide">Next class</a>
+ <a href="#" class="next-class-link hide">
+ <span class="page-link-caption">Next class</span>
+ </a>
</div>
- </div>
- <?cs /if ?>
+ </div><?cs
+ /if ?><?cs
+if:!devsite ?>
+ </div> <!-- end jd-content --><?cs
+/if ?><?cs
- </div> <!-- end jd-content -->
-
+if:!devsite ?>
<?cs include:"footer.cs" ?>
-</div><!-- end doc-content -->
-
<?cs include:"trailer.cs" ?>
- <script src="https://developer.android.com/ytblogger_lists_unified.js?v=19" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_lists_unified.js?v=19" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_extras.js?v=19" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_collections.js?v=19" type="text/javascript"></script>
- <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=19" type="text/javascript"></script>
+<?cs /if ?>
</body>
</html>