Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad1ddbda00e0fcc713672f6e63acdf44, reversing
changes made to e09b2c16e32cee89d6b5ac29fe5a905b76872179.
diff --git a/tools/droiddoc/templates-sdk-dev/docpage.cs b/tools/droiddoc/templates-sdk-dev/docpage.cs
index 3d17d37..83b1199 100644
--- a/tools/droiddoc/templates-sdk-dev/docpage.cs
+++ b/tools/droiddoc/templates-sdk-dev/docpage.cs
@@ -4,63 +4,46 @@
<?cs include:"head_tag.cs" ?>
<body 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
+if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs
+ if:(guide||develop||training||reference||tools||sdk||samples) ?>develop<?cs
if:guide ?> guide<?cs /if ?><?cs
if:samples ?> samples<?cs /if ?><?cs
- if:reference ?> reference<?cs /if ?><?cs
- if:downloads ?> downloads<?cs /if ?><?cs
- else ?><?cs
- if:(guide||develop||training||reference||tools||sdk||google||samples) ?>develop<?cs
- if:guide ?> guide<?cs /if ?><?cs
- if:samples ?> samples<?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
- if:users ?> users<?cs /if ?><?cs
- if:engage ?> engage<?cs /if ?><?cs
- if:monetize ?> monetize<?cs /if ?><?cs
- if:disttools ?> disttools<?cs /if ?><?cs
- if:stories ?> stories<?cs /if ?><?cs
- if:analyze ?> analyze<?cs /if ?><?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
+ elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories)
+ ?>distribute<?cs
+ if:googleplay ?> googleplay<?cs /if ?><?cs
+ if:essentials ?> essentials<?cs /if ?><?cs
+ if:users ?> users<?cs /if ?><?cs
+ if:engage ?> engage<?cs /if ?><?cs
+ if:monetize ?> monetize<?cs /if ?><?cs
+ if:disttools ?> disttools<?cs /if ?><?cs
+ if:stories ?> stories<?cs /if ?><?cs
+ elif:(about||wear||tv||auto) ?>about<?cs
+ elif:design ?>design<?cs
+/if ?><?cs
+if:page.trainingcourse ?> trainingcourse<?cs
/if ?>" itemscope itemtype="http://schema.org/Article"><?cs
include:"header.cs" ?>
-<?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs
-# header logic for docs that provide previous/next buttons ?>
- <?cs if:(header.hide||devsite) ?>
+<div <?cs
+ if:fullpage
+ ?>class="fullpage"<?cs
+ elif:(design||tools||about||sdk||googleplay||essentials||users||monetize||disttools) && !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 ?>">
+ <div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>">
+ <div class="layout-content-col <?cs if:training ?>span-7<?cs else ?>span-9<?cs /if ?>">
<?cs if:header.justLinks ?>
- <?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 else ?><h1 itemprop="name"><?cs var:page.title ?></h1>
<?cs /if ?>
+ </div>
<?cs if:training ?>
- <div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement">
+ <div class="training-nav-top layout-content-col span-5" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="prev-page-link hide"
zh-tw-lang="上一堂課"
zh-cn-lang="上一课"
@@ -87,7 +70,7 @@
>Get started</a>
</div>
<?cs elif:!page.trainingcourse ?>
- <?cs # <div class="paging-linkss" itemscope itemtype="http://schema.org/SiteNavigationElement">
+ <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement">
<a href="#" class="prev-page-link hide"
zh-tw-lang="上一堂課"
zh-cn-lang="上一课"
@@ -104,7 +87,7 @@
ja-lang="次へ"
es-lang="Siguiente"
>Next</a>
- </div> ?>
+ </div>
<?cs /if ?><?cs # end if training ?>
</div>
<?cs /if ?><?cs # end if header.hide ?>
@@ -129,34 +112,25 @@
</style>
<?cs /if ?>
- <?cs if:(!fullpage && !header.hide && !devsite) ?>
+ <?cs if:(!fullpage && !header.hide) ?>
<?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">
+ <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 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>
@@ -171,63 +145,21 @@
<?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">
- <?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 ?>
-
<?cs call:tag_list(root.descr) ?>
</div>
- <?cs if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse
- && !footer.hide && !devsite?>
<div class="content-footer <?cs
- if:fullpage ?>wrap<?cs /if ?>"
+ if:fullpage ?>wrap<?cs
+ else ?>layout-content-row<?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>
+ <?cs if:!fullscreen ?>
+ <div class="paging-links layout-content-col col-10">
+ <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?>
<a href="#" class="next-page-link hide"
zh-tw-lang="下一堂課"
zh-cn-lang="下一课"
@@ -235,8 +167,7 @@
ko-lang="다음"
ja-lang="次へ"
es-lang="Siguiente"
- ><span class="page-link-caption">Next</span>
- </a>
+ >Next</a>
<a href="#" class="start-class-link hide"
zh-tw-lang="開始上課"
zh-cn-lang="开始"
@@ -245,18 +176,31 @@
ja-lang="開始する"
es-lang="Empezar"
>Get started</a>
- <a href="#" class="next-class-link hide">
- <span class="page-link-caption">Next class</span>
- </a>
- </div>
+ <a href="#" class="next-class-link hide">Next class</a>
+ <?cs /if ?>
+ </div>
+ <div class="layout-content-col plus-container col-2" >
+ <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?>
+ <div class="g-plusone" data-size="medium"></div>
+ <?cs /if ?>
+ </div>
+ <?cs /if ?>
</div>
- <?cs /if ?>
</div> <!-- end jd-content -->
-<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
+</div><!-- end doc-content -->
+
<?cs include:"trailer.cs" ?>
-<?cs /if ?>
+ <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_lists_unified.js?v=9" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_extras.js?v=11" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_collections.js?v=12" type="text/javascript"></script>
+ <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script>
+
</body>
</html>
+
+
+