diff options
author | Scott Main <smain@google.com> | 2014-01-29 20:07:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-29 20:07:13 +0000 |
commit | c9e142e62d60b39bb5bd3459358a16c00fc557f3 (patch) | |
tree | 4e4cdca5c384d845666542c22b145890bf15ec32 /tools/droiddoc | |
parent | bb94d790284161b9ccf2b0d4a42435ee232c34d5 (diff) | |
parent | 9ee0fae1e8da26a17547442376676b9bc4ff33d8 (diff) | |
download | build-c9e142e62d60b39bb5bd3459358a16c00fc557f3.zip build-c9e142e62d60b39bb5bd3459358a16c00fc557f3.tar.gz build-c9e142e62d60b39bb5bd3459358a16c00fc557f3.tar.bz2 |
Merge "add 'get started' link to the bottom of class home pages" into klp-docs
Diffstat (limited to 'tools/droiddoc')
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 7 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/docpage.cs | 40 |
2 files changed, 30 insertions, 17 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index 0cecca6..69418df 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -528,6 +528,11 @@ video.with-shadow { width:262px; } + .paging-links a.start-class-link { + width:100%; + text-align:right; + } + /* list of classes on course landing page */ ol.class-list { list-style:none; @@ -4902,7 +4907,7 @@ a.download-sdk { color:#555; text-transform:uppercase; border-bottom:none; - margin:0; + margin:0 0 1em; padding:5px 0 0; } diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs index ac40cd3..ea462c9 100644 --- a/tools/droiddoc/templates-sdk/docpage.cs +++ b/tools/droiddoc/templates-sdk/docpage.cs @@ -13,7 +13,7 @@ <div <?cs if:fullpage ?>class="fullpage"<?cs elif:design||tools||about||sdk||distribute -?>class="col-13" id="doc-col"<?cs else +?>class="col-13" id="doc-col"<?cs else ?>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 ?> @@ -33,7 +33,7 @@ ru-lang="Предыдущий" ko-lang="이전" ja-lang="前へ" - es-lang="Anterior" + es-lang="Anterior" >Previous</a> <a href="#" class="next-page-link hide" zh-tw-lang="下一堂課" @@ -41,7 +41,7 @@ ru-lang="Следующий" ko-lang="다음" ja-lang="次へ" - es-lang="Siguiente" + es-lang="Siguiente" >Next</a> <a href="#" class="start-class-link hide" zh-tw-lang="開始上課" @@ -49,7 +49,7 @@ ru-lang="Начало работы" ko-lang="시작하기" ja-lang="開始する" - es-lang="Empezar" + es-lang="Empezar" >Get started</a> </div> <?cs elif:!page.trainingcourse ?> @@ -60,7 +60,7 @@ ru-lang="Предыдущий" ko-lang="이전" ja-lang="前へ" - es-lang="Anterior" + es-lang="Anterior" >Previous</a> <a href="#" class="next-page-link hide" zh-tw-lang="下一堂課" @@ -68,7 +68,7 @@ ru-lang="Следующий" ko-lang="다음" ja-lang="次へ" - es-lang="Siguiente" + es-lang="Siguiente" >Next</a> </div> <?cs /if ?><?cs # end if training ?> @@ -95,7 +95,7 @@ <?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> @@ -124,14 +124,14 @@ <div class="jd-descr" itemprop="articleBody"> <?cs call:tag_list(root.descr) ?> </div> - - <div class="content-footer <?cs + + <div class="content-footer <?cs if:fullpage ?>wrap<?cs - else ?>layout-content-row<?cs /if ?>" + else ?>layout-content-row<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="layout-content-col <?cs - if:fullpage ?>col-16<?cs - elif:training||guide ?>col-8<?cs + <div class="layout-content-col <?cs + if:fullpage ?>col-16<?cs + elif:training||guide ?>col-8<?cs else ?>col-9<?cs /if ?>" style="padding-top:4px"> <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?> <div class="g-plusone" data-size="medium"></div> @@ -146,7 +146,7 @@ ru-lang="Предыдущий" ko-lang="이전" ja-lang="前へ" - es-lang="Anterior" + es-lang="Anterior" >Previous</a> <a href="#" class="next-page-link hide" zh-tw-lang="下一堂課" @@ -154,13 +154,21 @@ ru-lang="Следующий" ko-lang="다음" ja-lang="次へ" - es-lang="Siguiente" + es-lang="Siguiente" >Next</a> + <a href="#" class="start-class-link hide" + zh-tw-lang="開始上課" + zh-cn-lang="开始" + ru-lang="Начало работы" + ko-lang="시작하기" + ja-lang="開始する" + es-lang="Empezar" + >Get started</a> <?cs /if ?> </div> <?cs /if ?> </div> - + <?cs # for training classes, provide a different kind of link when the next page is a different class ?> <?cs if:training && !page.article ?> <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> |