am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '52948fcf8ccdad1f4ba91d63ece2022e2d807aff':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index df18ae5..52bff2a 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -437,9 +437,9 @@
.training-nav-top a {
display:block;
float:left;
- width:108px;
+ width:122px;
height:28px;
- padding: 8px 15px;
+ padding: 8px;
line-height:28px;
text-align:center;
border:1px solid #DADADA;
@@ -448,7 +448,7 @@
.training-nav-top a.next-page-link {
border-left:0;
- width:109px;
+ width:123px;
}
.training-nav-top a.disabled,
@@ -1625,6 +1625,7 @@
border-left:4px solid #99CC00;
float:right;
padding:0 0 0 10px;
+ margin:0 0 1em 20px;
}
.sidebox h2,
@@ -1824,7 +1825,7 @@
Code Style
*/
pre {
- margin: 1em 0;
+ margin:0 0 1em 0;
padding: 1em;
overflow: auto;
border: solid 1px #ddd;
@@ -2229,11 +2230,17 @@
}
p.table-caption {
- margin: 0 0 4px 0; /* matches default table left-margin */
+ margin: 0 0 4px 0;
font-size:13px;
color:#666;
}
+p.code-caption {
+ margin: 0 0 4px 0;
+ font: 13px/1.5 'courier new', courier, monospace;
+ color:#666;
+}
+
div.note,
div.caution,
div.warning {
@@ -2247,15 +2254,15 @@
border-left: 4px solid;
}
-p.note {
+p.note, div.note {
border-color: #258AAF;
}
-p.caution {
+p.caution, div.caution {
border-color: #FF8800;
}
-p.warning {
+p.warning, div.warning {
border-color: #ff4443;
}
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index d7ebbef..d18c490 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -28,7 +28,7 @@
$('.scroll-pane').jScrollPane( {verticalGutter:0} );
// add HRs below all H2s (except for a few other h2 variants)
- $('h2').not('#qv h2').not('#tb h2').not('#devdoc-nav h2').css({marginBottom:0}).after('<hr/>');
+ $('h2').not('#qv h2').not('#tb h2').not('.sidebox h2').not('#devdoc-nav h2').css({marginBottom:0}).after('<hr/>');
// set search's onkeyup handler here so we can show suggestions
// even while search results are visible
@@ -979,36 +979,18 @@
}
-function changeTabLang(lang) {
- var nodes = $("#header-tabs").find("."+lang);
- for (i=0; i < nodes.length; i++) { // for each node in this language
- var node = $(nodes[i]);
- node.siblings().css("display","none"); // hide all siblings
- if (node.not(":empty").length != 0) { //if this languages node has a translation, show it
- node.css("display","inline");
- } else { //otherwise, show English instead
- node.css("display","none");
- node.siblings().filter(".en").css("display","inline");
- }
- }
-}
-
function changeNavLang(lang) {
- var nodes = $("#devdoc-nav").find("."+lang);
- for (i=0; i < nodes.length; i++) { // for each node in this language
- var node = $(nodes[i]);
- node.siblings().css("display","none"); // hide all siblings
- if (node.not(":empty").length != 0) { // if this languages node has a translation, show it
- node.css("display","inline");
- } else { // otherwise, show English instead
- node.css("display","none");
- node.siblings().filter(".en").css("display","inline");
+ var $links = $("#devdoc-nav,#header,#nav-x,.training-nav-top,.content-footer").find("a["+lang+"-lang]");
+ $links.each(function(i){ // for each link with a translation
+ var $link = $(this);
+ if (lang != "en") { // No need to worry about English, because a language change invokes new request
+ // put the desired language from the attribute as the text
+ $link.text($link.attr(lang+"-lang"))
}
- }
+ });
}
function changeDocLang(lang) {
- changeTabLang(lang);
changeNavLang(lang);
}
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 51759bc..d98af85 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -8,16 +8,38 @@
</a>
<div class="btn-quicknav" id="btn-quicknav">
<a href="#" class="arrow-inactive">Quicknav</a>
- <a href="#" class="arrow-active">Quicknav</a>
+ <a href="#" class="arrow-active">Quicknav</a>
</div>
</div>
<ul class="nav-x col-9">
- <li class="design"><a href="<?cs var:toroot ?>design/index.html" <?cs
- if:design ?>class="selected"<?cs /if ?> >Design</a></li>
+ <li class="design">
+ <a href="<?cs var:toroot ?>design/index.html" <?cs
+ if:design ?>class="selected"<?cs /if ?>
+ zh-TW-lang="設計"
+ zh-CN-lang="设计"
+ ru-lang="Проектирование"
+ ko-lang="디자인"
+ ja-lang="設計"
+ es-lang="Diseñar"
+ >Design</a></li>
<li class="develop"><a href="<?cs var:toroot ?>develop/index.html" <?cs
- if:training || guide || reference || tools || develop ?>class="selected"<?cs /if ?> >Develop</a></li>
+ if:training || guide || reference || tools || develop ?>class="selected"<?cs /if ?>
+ zh-TW-lang="開發"
+ zh-CN-lang="开发"
+ ru-lang="Разработка"
+ ko-lang="개발"
+ ja-lang="開発"
+ es-lang="Desarrollar"
+ >Develop</a></li>
<li class="distribute last"><a href="<?cs var:toroot ?>distribute/index.html" <?cs
- if:distribute ?>class="selected"<?cs /if ?> >Distribute</a></li>
+ if:distribute ?>class="selected"<?cs /if ?>
+ zh-TW-lang="發佈"
+ zh-CN-lang="分发"
+ ru-lang="Распространение"
+ ko-lang="배포"
+ ja-lang="配布"
+ es-lang="Distribuir"
+ >Distribute</a></li>
</ul>
<!-- New Search -->
@@ -52,9 +74,9 @@
<option value="ja">日本語</option>
<option value="ko">한국어</option>
<option value="ru">Русский</option>
- <option value="zh-CN">中文 (中国)
- </option>
- </select>
+ <option value="zh-CN">中文 (中国)</option>
+ <option value="zh-TW">中文 (台灣)</option>
+ </select>
</div>
<script type="text/javascript">
<!--
@@ -105,10 +127,38 @@
</li>
<li class="develop">
<ul>
- <li><a href="<?cs var:toroot ?>training/index.html">Android Training</a></li>
- <li><a href="<?cs var:toroot ?>guide/components/index.html">API Guides</a></li>
- <li><a href="<?cs var:toroot ?>reference/packages.html">Reference</a></li>
- <li><a href="<?cs var:toroot ?>tools/index.html">Tools</a>
+ <li><a href="<?cs var:toroot ?>training/index.html"
+ zh-TW-lang="訓練課程"
+ zh-CN-lang="培训"
+ ru-lang="Курсы"
+ ko-lang="교육"
+ ja-lang="トレーニング"
+ es-lang="Capacitación"
+ >Training</a></li>
+ <li><a href="<?cs var:toroot ?>guide/components/index.html"
+ zh-TW-lang="API 指南"
+ zh-CN-lang="API 指南"
+ ru-lang="Руководства по API"
+ ko-lang="API 가이드"
+ ja-lang="API ガイド"
+ es-lang="Guías de la API"
+ >API Guides</a></li>
+ <li><a href="<?cs var:toroot ?>reference/packages.html"
+ zh-TW-lang="參考資源"
+ zh-CN-lang="参考"
+ ru-lang="Справочник"
+ ko-lang="참조문서"
+ ja-lang="リファレンス"
+ es-lang="Referencia"
+ >Reference</a></li>
+ <li><a href="<?cs var:toroot ?>tools/index.html"
+ zh-TW-lang="相關工具"
+ zh-CN-lang="工具"
+ ru-lang="Инструменты"
+ ko-lang="도구"
+ ja-lang="ツール"
+ es-lang="Herramientas"
+ >Tools</a>
<ul><li><a href="<?cs var:toroot ?>sdk/index.html">Get the
SDK</a></li></ul>
</li>
@@ -145,15 +195,42 @@
<div class="wrap">
<ul class="nav-x col-9 develop" style="width:75%">
<li><a href="<?cs var:toroot ?>training/index.html" <?cs
- if:training ?>class="selected"<?cs /if ?> >Android Training</a></li>
- <li><a href="<?cs var:toroot ?>guide/components/index.html" <?cs
- if:guide ?>class="selected"<?cs /if ?> >API Guides</a></li>
+ if:training ?>class="selected"<?cs /if ?>
+ zh-TW-lang="訓練課程"
+ zh-CN-lang="培训"
+ ru-lang="Курсы"
+ ko-lang="교육"
+ ja-lang="トレーニング"
+ es-lang="Capacitación"
+ >Training</a></li>
+ <li><a href="<?cs var:toroot ?>guide/components/index.html" <?cs
+ if:guide ?>class="selected"<?cs /if ?>
+ zh-TW-lang="API 指南"
+ zh-CN-lang="API 指南"
+ ru-lang="Руководства по API"
+ ko-lang="API 가이드"
+ ja-lang="API ガイド"
+ es-lang="Guías de la API"
+ >API Guides</a></li>
<li><a href="<?cs var:toroot ?>reference/packages.html" <?cs
- if:reference ?>class="selected"<?cs /if ?> >Reference</a></li>
+ if:reference ?>class="selected"<?cs /if ?>
+ zh-TW-lang="參考資源"
+ zh-CN-lang="参考"
+ ru-lang="Справочник"
+ ko-lang="참조문서"
+ ja-lang="リファレンス"
+ es-lang="Referencia"
+ >Reference</a></li>
<li><a href="<?cs var:toroot ?>tools/index.html" <?cs
- if:tools ?>class="selected"<?cs /if ?> >Tools</a></li>
+ if:tools ?>class="selected"<?cs /if ?>
+ zh-TW-lang="相關工具"
+ zh-CN-lang="工具"
+ ru-lang="Инструменты"
+ ko-lang="도구"
+ ja-lang="ツール"
+ es-lang="Herramientas"
+ >Tools</a></li>
</ul>
- <!-- <a class="button-secondary download-sdk">Download the SDK</a> -->
</div>
</div>
diff --git a/tools/droiddoc/templates-sdk/customizations.cs b/tools/droiddoc/templates-sdk/customizations.cs
index 186a8b6..4ce01d7 100644
--- a/tools/droiddoc/templates-sdk/customizations.cs
+++ b/tools/droiddoc/templates-sdk/customizations.cs
@@ -297,7 +297,12 @@
call:about_nav() ?><?cs
else ?><?cs
call:default_left_nav() ?><?cs
- /if ?><?cs
+ /if ?>
+ <script>
+ $(document).ready(function() {
+ changeDocLang(getLangPref());
+ });
+ </script><?cs
/def ?>
<?cs # appears at the bottom of every page ?><?cs
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index 79a96b1..63abceb 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -27,15 +27,57 @@
</div>
<?cs if:training ?>
<div class="training-nav-top layout-content-col span-5" itemscope itemtype="http://schema.org/SiteNavigationElement">
- <a href="#" class="prev-page-link hide">Previous</a>
- <a href="#" class="next-page-link hide">Next</a>
- <a href="#" class="start-class-link hide">Get started</a>
- <a href="#" class="start-course-link hide">First class</a>
+ <a href="#" class="prev-page-link hide"
+ zh-TW-lang="上一堂課"
+ zh-CN-lang="上一课"
+ ru-lang="Предыдущий"
+ ko-lang="이전"
+ ja-lang="前へ"
+ es-lang="Anterior"
+ >Previous</a>
+ <a href="#" class="next-page-link hide"
+ zh-TW-lang="下一堂課"
+ zh-CN-lang="下一课"
+ ru-lang="Следующий"
+ ko-lang="다음"
+ ja-lang="次へ"
+ 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>
+ <a href="#" class="start-course-link hide"
+ zh-TW-lang="第一堂課"
+ zh-CN-lang="第一课"
+ ru-lang="Первый урок"
+ ko-lang="첫 번째 강의"
+ ja-lang="最初のクラス"
+ es-lang="Primera clase"
+ >First class</a>
</div>
<?cs else ?>
<div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement">
- <a href="#" class="prev-page-link hide">Previous</a>
- <a href="#" class="next-page-link hide">Next</a>
+ <a href="#" class="prev-page-link hide"
+ zh-TW-lang="上一堂課"
+ zh-CN-lang="上一课"
+ ru-lang="Предыдущий"
+ ko-lang="이전"
+ ja-lang="前へ"
+ es-lang="Anterior"
+ >Previous</a>
+ <a href="#" class="next-page-link hide"
+ zh-TW-lang="下一堂課"
+ zh-CN-lang="下一课"
+ ru-lang="Следующий"
+ ko-lang="다음"
+ ja-lang="次へ"
+ es-lang="Siguiente"
+ >Next</a>
</div>
<?cs /if ?><?cs # end if training ?>
</div>
@@ -87,8 +129,22 @@
<?cs if:!fullscreen ?>
<div class="paging-links layout-content-col col-4">
<?cs if:(design||training||guide||walkthru) && !page.landing && !footer.hide ?>
- <a href="#" class="prev-page-link hide">Previous</a>
- <a href="#" class="next-page-link hide">Next</a>
+ <a href="#" class="prev-page-link hide"
+ zh-TW-lang="上一堂課"
+ zh-CN-lang="上一课"
+ ru-lang="Предыдущий"
+ ko-lang="이전"
+ ja-lang="前へ"
+ es-lang="Anterior"
+ >Previous</a>
+ <a href="#" class="next-page-link hide"
+ zh-TW-lang="下一堂課"
+ zh-CN-lang="下一课"
+ ru-lang="Следующий"
+ ko-lang="다음"
+ ja-lang="次へ"
+ es-lang="Siguiente"
+ >Next</a>
<?cs /if ?>
</div>
<?cs /if ?>
diff --git a/tools/droiddoc/templates-sdk/header_tabs.cs b/tools/droiddoc/templates-sdk/header_tabs.cs
index 41e6f18..38c9da8 100644
--- a/tools/droiddoc/templates-sdk/header_tabs.cs
+++ b/tools/droiddoc/templates-sdk/header_tabs.cs
@@ -1,50 +1,2 @@
<!-- CURRENTLY NOT USED... ALL TABS ARE IN masthead.cs -->
-
-<ul id="header-tabs" class="<?cs
- if:reference ?>reference<?cs
- elif:guide ?>guide<?cs
- elif:sdk ?>sdk<?cs
- elif:home ?>home<?cs
- elif:resources ?>resources<?cs
- elif:training ?>training<?cs
- elif:tools ?>tools<?cs
- elif:videos ?>videos<?cs /if ?>">
-
- <li id="sdk-link"><a href="<?cs var:toroot ?>design/index.html">
- <span class="en">Design</span>
- </a></li>
- <li id="sdk-link"><a href="<?cs var:toroot ?>develop/index.html">
- <span class="en">Develop</span>
- </a></li>
- <li id="sdk-link"><a href="<?cs var:toroot ?>distribute/index.html">
- <span class="en">Distribute</span>
- </a></li>
-</ul>
-
-
-
-
-
-
-
-
-<!--
- <li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html" onClick="return loadLast('guide')">
- <?cs if:!sdk.redirect ?>
- <span class="en">Guide</span>
- <span style="display:none" class="de">Handbuch</span>
- <span style="display:none" class="es">Guía</span>
- <span style="display:none" class="fr">Guide</span>
- <span style="display:none" class="it">Guida</span>
- <span style="display:none" class="ja">開発ガイド</span>
- <span style="display:none" class="zh-CN">开发人员指南</span>
- <span style="display:none" class="zh-TW">開發指南</span>
- <?cs /if ?>
- </a></li>
--->
-
-
-
-
-</ul>