diff options
author | Dirk Dougherty <ddougherty@google.com> | 2014-05-02 15:14:04 -0700 |
---|---|---|
committer | Dirk Dougherty <ddougherty@google.com> | 2014-05-02 15:44:20 -0700 |
commit | e21bed28acdd21f6000d1de30538839085ffa890 (patch) | |
tree | e9622116379694b9d026b15c056e7babd697569a | |
parent | 613b251b7b4b54507561ee52811c72fcd2ba731d (diff) | |
download | build-e21bed28acdd21f6000d1de30538839085ffa890.zip build-e21bed28acdd21f6000d1de30538839085ffa890.tar.gz build-e21bed28acdd21f6000d1de30538839085ffa890.tar.bz2 |
Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/assets/css/default.css | 44 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/assets/css/fullscreen.css | 16 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/assets/images/dac_logo@2x.png | bin | 0 -> 2497 bytes | |||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/components/masthead.cs | 151 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/customizations.cs | 22 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/docpage.cs | 2 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/head_tag.cs | 19 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/sample.cs | 2 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk-dyn/sdkpage.cs | 62 |
9 files changed, 260 insertions, 58 deletions
diff --git a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css index e7ab40f..b1c7dcf 100644 --- a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css +++ b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css @@ -359,6 +359,19 @@ video.with-shadow { #nav li span.tree-list-subtitle:after { content: '—'; } + #nav li span.tree-list-subtitle.package { + padding-top:15px; + cursor:default; + } + #nav li span.tree-list-subtitle.package:before { + content: ''; + } + #nav li span.tree-list-subtitle.package:after { + content: ''; + } + #nav li ul.tree-list-children.classes { + padding-left:10px; + } #nav li ul { display:none; overflow: hidden; @@ -529,9 +542,9 @@ video.with-shadow { width:262px; } - .paging-links a.start-class-link { - width:100%; - text-align:right; + .paging-links a.start-class-link { + width:100%; + text-align:right; } /* list of classes on course landing page */ @@ -1516,11 +1529,12 @@ Header, Login, Nav-X, Search .develop a.selected { color: #F80; } - .distribute a.selected { color: #9C0; } + + .nav-x li { display: inline; margin-right: 45px; @@ -1631,8 +1645,6 @@ Header, Login, Nav-X, Search .search-dropdown li a:hover h6, .search-dropdown li a:hover .desc { color: #33b5e5 } - - /* -------------------------------------------------------------------------- Buttons */ @@ -1902,6 +1914,7 @@ EndColorStr='#ececec'); .sidebox h5 { font-weight:bold; margin:0 0 10px; + line-height: 16px; } .sidebox * { @@ -4155,6 +4168,16 @@ EndColorStr='#ececec'); padding-right:10px; } + +#header-wrap .logo-wear { + width:220px; + margin:0; + margin-bottom:22px; +} +#header-wrap .logo-wear img { + padding:0 0 0 10px; +} + .search { height:25px; margin-top: -3px; @@ -4967,16 +4990,22 @@ a.download-sdk { .landing-docs a { color:#333 !important; } + .landing-docs a:hover, .landing-docs a:hover * { color:#7AA1B0 !important } + .landing-docs .normal-links a { color:#258aaf !important; } + .plusone { float:right; } + + + .next-docs { border-top:1px solid #ccc; margin:40px 0 0; @@ -4990,13 +5019,14 @@ a.download-sdk { .next-docs div:last-child { margin-right:0; } + .next-docs h2 { font-size:14px; line-height:21px; 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-dyn/assets/css/fullscreen.css b/tools/droiddoc/templates-sdk-dyn/assets/css/fullscreen.css index 1093eae..53d9a64 100644 --- a/tools/droiddoc/templates-sdk-dyn/assets/css/fullscreen.css +++ b/tools/droiddoc/templates-sdk-dyn/assets/css/fullscreen.css @@ -15,16 +15,16 @@ @media screen, projection, print { .full { - padding: 2.5em 0; - border-top: solid 1px #ddd; - border-bottom: solid 1px #ddd; - background: #f7f7f7; + padding: 2.5em 0; + border-top: solid 1px #ddd; + border-bottom: solid 1px #ddd; + background: #f7f7f7; } .wrap { - margin: 0 auto; - width: 100%; - min-width:600px; - clear: both; + margin: 0 auto; + width: 100%; + min-width:600px; + clear: both; } .cols { height: 1%; diff --git a/tools/droiddoc/templates-sdk-dyn/assets/images/dac_logo@2x.png b/tools/droiddoc/templates-sdk-dyn/assets/images/dac_logo@2x.png Binary files differnew file mode 100644 index 0000000..0f2784d --- /dev/null +++ b/tools/droiddoc/templates-sdk-dyn/assets/images/dac_logo@2x.png diff --git a/tools/droiddoc/templates-sdk-dyn/components/masthead.cs b/tools/droiddoc/templates-sdk-dyn/components/masthead.cs index 763990a..ac7646f 100644 --- a/tools/droiddoc/templates-sdk-dyn/components/masthead.cs +++ b/tools/droiddoc/templates-sdk-dyn/components/masthead.cs @@ -1,4 +1,7 @@ <?cs def:custom_masthead() ?> +<?cs if:wear ?> + <?cs call:wear_masthead() ?> +<?cs else ?> <a name="top"></a> <?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?> <!-- Header --><div id="header-wrapper"> @@ -6,7 +9,9 @@ <div class="wrap" id="header-wrap"> <div class="col-3 logo"> <a href="<?cs var:toroot ?>index.html"> - <img src="<?cs var:toroot ?>assets/images/dac_logo.png" width="123" height="25" alt="Android Developers" /> + <img src="<?cs var:toroot ?>assets/images/dac_logo.png" + srcset="<?cs var:toroot ?>assets/images/dac_logo@2x.png 2x" + width="123" height="25" alt="Android Developers" /> </a> <div class="btn-quicknav" id="btn-quicknav"> <a href="#" class="arrow-inactive">Quicknav</a> @@ -314,5 +319,147 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> </div> </div> -<?cs /if ?><?cs # end if/else !devsite ?><?cs +<?cs /if ?><?cs # end if/else !devsite ?> +<?cs /if ?><?cs # end if/else wear ?><?cs +/def ?> + +<?cs def:wear_masthead() ?> +<a name="top"></a> + +<!-- Header --><div id="header-wrapper"> + <div class="wrap" id="header-wrap"> + <div class="col_3 logo-wear"> + <a href="<?cs var:toroot ?>wear/index.html"> + <img src="<?cs var:toroot ?>wear/images/android-wear.png" height="16" alt="Android Wear" /> + </a> + </div> + </div> + + <div class="col-8" style="margin:0"><h1 style="margin:1px 0 0 20px;padding:0;line-height:16px; + color:#666;font-weight:100;font-size:24px;">Developer Preview</h1></div> + + <!-- New Search --> + <div class="menu-container"> + <div class="moremenu"> + <div id="more-btn"></div> + </div> + <div class="morehover" id="moremenu"> + <div class="top"></div> + <div class="mid"> + <div class="header">Links</div> + <ul> + <li><a href="https://play.google.com/apps/publish/">Google Play Developer Console</a></li> + <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li> + <li><a href="<?cs var:toroot ?>about/index.html">About Android</a></li> + </ul> + <div class="header">Android Sites</div> + <ul> + <li><a href="http://www.android.com">Android.com</a></li> + <li class="active"><a>Android Developers</a></li> + <li><a href="http://source.android.com">Android Open Source Project</a></li> + </ul> + + <?cs # Include language switcher only in online docs ?> + <?cs if:android.whichdoc == "online" ?> + <div class="header">Language</div> + <div id="language" class="locales"> + <select name="language" onChange="changeLangPref(this.value, true)"> + <option value="en">English</option> + <option value="es">Español</option> + <option value="ja">日本語</option> + <option value="ko">한국어</option> + <option value="ru">Русский</option> + <option value="zh-cn">中文 (中国)</option> + <option value="zh-tw">中文 (台灣)</option> + </select> + </div> + <script type="text/javascript"> + <!-- + loadLangPref(); + //--> + </script> + <?cs /if ?> + <?cs # End of lang switcher ?> + + + <br class="clearfix" /> + </div><!-- end mid --> + <div class="bottom"></div> + </div><!-- end morehover --> + + <div class="search" id="search-container"> + <div class="search-inner"> + <div id="search-btn"></div> + <div class="left"></div> + <form onsubmit="return submit_search()"> + <input id="search_autocomplete" type="text" value="" autocomplete="off" name="q" +onfocus="search_focus_changed(this, true)" onblur="search_focus_changed(this, false)" +onkeydown="return search_changed(event, true, '<?cs var:toroot ?>')" +onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> + </form> + <div class="right"></div> + <a class="close hide">close</a> + <div class="left"></div> + <div class="right"></div> + </div> + </div><!-- end search --> + + <div class="search_filtered_wrapper reference"> + <div class="suggest-card reference no-display"> + <ul class="search_filtered"> + </ul> + </div> + </div> + + <div class="search_filtered_wrapper docs"> + <div class="suggest-card dummy no-display"> </div> + <div class="suggest-card develop no-display"> + <ul class="search_filtered"> + </ul> + <div class="child-card guides no-display"> + </div> + <div class="child-card training no-display"> + </div> + <div class="child-card samples no-display"> + </div> + </div> + <div class="suggest-card design no-display"> + <ul class="search_filtered"> + </ul> + </div> + <div class="suggest-card distribute no-display"> + <ul class="search_filtered"> + </ul> + </div> + </div><!-- end search_filtered_wrapper --> + + </div> + <!-- end menu_container --> + + + </div><!-- end header-wrap --> + </div> + <!-- /Header --> + + + <div id="searchResults" class="wrap" style="display:none;"> + <h2 id="searchTitle">Results</h2> + <div id="leftSearchControl" class="search-control">Loading...</div> + </div> + +</div> <!--end headerwrap --> + +<div id="sticky-header"> + <div> + <a class="logo" href="#top"></a> + <a class="top" href="#top"></a> + <ul class="breadcrumb"> + <?cs # More <li> elements added here with javascript ?> + <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs + /if ?> + </ul> + </div> +</div> + + <?cs /def ?> diff --git a/tools/droiddoc/templates-sdk-dyn/customizations.cs b/tools/droiddoc/templates-sdk-dyn/customizations.cs index 2e2f2e6..ea8ae66 100644 --- a/tools/droiddoc/templates-sdk-dyn/customizations.cs +++ b/tools/droiddoc/templates-sdk-dyn/customizations.cs @@ -270,6 +270,26 @@ def:about_nav() ?> </script> <?cs /def ?> + +<?cs +def:wear_nav() ?> + <div class="wrap clearfix" id="body-content"> + <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div id="devdoc-nav" class="scroll-pane"> + +<?cs + include:"../../../../frameworks/base/docs/html/wear/wear_toc.cs" ?> + + + </div> + </div> <!-- end side-nav --> + <script> + $(document).ready(function() { + scrollIntoView("devdoc-nav"); + }); + </script> +<?cs /def ?> + <?cs # The default side navigation for the reference docs ?><?cs def:default_left_nav() ?> <?cs if:reference.gcm || reference.gms ?> @@ -416,6 +436,8 @@ def:custom_left_nav() ?><?cs call:about_nav() ?><?cs elif:distribute ?><?cs call:distribute_nav() ?><?cs + elif:wear ?><?cs + call:wear_nav() ?><?cs else ?><?cs call:default_left_nav() ?> <?cs /if ?><?cs diff --git a/tools/droiddoc/templates-sdk-dyn/docpage.cs b/tools/droiddoc/templates-sdk-dyn/docpage.cs index 745b19e..7eae405 100644 --- a/tools/droiddoc/templates-sdk-dyn/docpage.cs +++ b/tools/droiddoc/templates-sdk-dyn/docpage.cs @@ -215,7 +215,7 @@ document.write('<iframe src="https://2507573.fls.doubleclick.net/activityi;src=2 <?cs include:"trailer.cs" ?> - <script src="https://androiddevdocs-exp.appspot.com/ytblogger_lists_unified.js" type="text/javascript"></script> + <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>jd_lists_unified.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>jd_extras.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>jd_collections.js" type="text/javascript"></script> diff --git a/tools/droiddoc/templates-sdk-dyn/head_tag.cs b/tools/droiddoc/templates-sdk-dyn/head_tag.cs index 70ad760..1b6f50d 100644 --- a/tools/droiddoc/templates-sdk-dyn/head_tag.cs +++ b/tools/droiddoc/templates-sdk-dyn/head_tag.cs @@ -15,13 +15,13 @@ ?><?cs # END if/else devsite ?> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="viewport" content="width=device-width" /> +<meta name="viewport" content="width=<?cs + if:page.viewport_width ?><?cs + var:page.viewport_width ?><?cs + else ?>device-width<?cs /if ?>" /> <?cs if:page.metaDescription ?> <meta name="Description" content="<?cs var:page.metaDescription ?>"><?cs - /if ?><?cs - if:page.customHeadTag ?> -<?cs var:page.customHeadTag ?><?cs /if ?> <link rel="shortcut icon" type="image/x-icon" href="<?cs var:toroot ?>favicon.ico" /> <title><?cs @@ -38,9 +38,9 @@ if:android.whichdoc != 'online' ?>http:<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto"> - <link href="<?cs var:toroot ?>assets/css/default.css" rel="stylesheet" type="text/css"> -<?cs if:reference && !(reference.gms || reference.gcm) ?> + +<?cs if:reference && !(reference.gms || reference.gcm || wear) ?> <!-- FULLSCREEN STYLESHEET --> <link href="<?cs var:toroot ?>assets/css/fullscreen.css" rel="stylesheet" class="fullscreen" type="text/css"> @@ -53,7 +53,10 @@ if:devsite ?><script src="<?cs var:toroot ?>_static/js/android_3p-bundle.js" type="text/javascript"></script><?cs else ?><script src="<?cs var:toroot ?>assets/js/android_3p-bundle.js" type="text/javascript"></script><?cs -/if ?> +/if ?><?cs + if:page.customHeadTag ?> +<?cs var:page.customHeadTag ?><?cs + /if ?> <script type="text/javascript"> var toRoot = "<?cs var:toroot ?>"; var metaTags = [<?cs var:meta.tags ?>]; @@ -72,4 +75,4 @@ else var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script> -</head>
\ No newline at end of file +</head> diff --git a/tools/droiddoc/templates-sdk-dyn/sample.cs b/tools/droiddoc/templates-sdk-dyn/sample.cs index 684e284..c6f28f8 100644 --- a/tools/droiddoc/templates-sdk-dyn/sample.cs +++ b/tools/droiddoc/templates-sdk-dyn/sample.cs @@ -7,7 +7,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 ?> > <!-- start breadcrumb block --> diff --git a/tools/droiddoc/templates-sdk-dyn/sdkpage.cs b/tools/droiddoc/templates-sdk-dyn/sdkpage.cs index d98146a..95f6596 100644 --- a/tools/droiddoc/templates-sdk-dyn/sdkpage.cs +++ b/tools/droiddoc/templates-sdk-dyn/sdkpage.cs @@ -11,7 +11,7 @@ <?cs else ?> <?cs include:"head_tag.cs" ?> <?cs /if ?> -<body class="gc-documentation +<body class="gc-documentation <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs elif:design ?>design<?cs elif:distribute ?>distribute<?cs @@ -107,7 +107,7 @@ </td> <td><?cs var:ndk.win64_bytes ?></td> <td><?cs var:ndk.win64_checksum ?></td> - </tr> + </tr> <!-- <tr> <td> <a onClick="return onDownload(this)" @@ -199,12 +199,12 @@ <td><?cs var:ndk.debug_info_checksum ?></td> </tr> </table> - + <?cs ######## HERE IS THE JD DOC CONTENT ######### ?> <?cs call:tag_list(root.descr) ?> - + <script> function onDownload(link) { @@ -229,13 +229,13 @@ function onDownloadNdkForRealz(link) { if ($("input#agree").is(':checked')) { $("#tos").fadeOut('slow'); - + $('html, body').animate({ scrollTop: $("#Installing").offset().top }, 800, function() { $("#Installing").click(); }); - + return true; } else { $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200, @@ -254,7 +254,7 @@ </script> <?cs else ?> -<?cs # end if NDK ... +<?cs # end if NDK ... # # # @@ -281,11 +281,11 @@ <h4><a href='' class="expandable" onclick="toggleExpandable(this,'.pax');hideExpandable('.myide,.reqs');return false;" >DOWNLOAD FOR OTHER PLATFORMS</a></h4> - - + + <div class="pax col-13 online" style="display:none;margin:0;"> - + <p class="table-caption"><strong>ADT Bundle</strong></p> <table class="download"> <tr> @@ -298,7 +298,7 @@ <td>Windows 32-bit</td> <td> <a onClick="return onDownload(this)" id="win-bundle32" - href="http://dl.google.com/android/adt/<?cs var:sdk.win32_bundle_download ?>"><?cs var:sdk.win32_bundle_download ?></a> + href="http://dl.google.com/android/adt/<?cs var:sdk.version ?>/<?cs var:sdk.win32_bundle_download ?>"><?cs var:sdk.win32_bundle_download ?></a> </td> <td><?cs var:sdk.win32_bundle_bytes ?> bytes</td> <td><?cs var:sdk.win32_bundle_checksum ?></td> @@ -307,7 +307,7 @@ <td>Windows 64-bit</td> <td> <a onClick="return onDownload(this)" id="win-bundle64" - href="http://dl.google.com/android/adt/<?cs var:sdk.win64_bundle_download ?>"><?cs var:sdk.win64_bundle_download ?></a> + href="http://dl.google.com/android/adt/<?cs var:sdk.version ?>/<?cs var:sdk.win64_bundle_download ?>"><?cs var:sdk.win64_bundle_download ?></a> </td> <td><?cs var:sdk.win64_bundle_bytes ?> bytes</td> <td><?cs var:sdk.win64_bundle_checksum ?></td> @@ -316,7 +316,7 @@ <td><nobr>Mac OS X 64-bit</nobr></td> <td> <a onClick="return onDownload(this)" id="mac-bundle64" - href="http://dl.google.com/android/adt/<?cs var:sdk.mac64_bundle_download ?>"><?cs var:sdk.mac64_bundle_download ?></a> + href="http://dl.google.com/android/adt/<?cs var:sdk.version ?>/<?cs var:sdk.mac64_bundle_download ?>"><?cs var:sdk.mac64_bundle_download ?></a> </td> <td><?cs var:sdk.mac64_bundle_bytes ?> bytes</td> <td><?cs var:sdk.mac64_bundle_checksum ?></td> @@ -325,7 +325,7 @@ <td>Linux 32-bit</td> <td> <a onClick="return onDownload(this)" id="linux-bundle32" - href="http://dl.google.com/android/adt/<?cs var:sdk.linux32_bundle_download ?>"><?cs var:sdk.linux32_bundle_download ?></a> + href="http://dl.google.com/android/adt/<?cs var:sdk.version ?>/<?cs var:sdk.linux32_bundle_download ?>"><?cs var:sdk.linux32_bundle_download ?></a> </td> <td><?cs var:sdk.linux32_bundle_bytes ?> bytes</td> <td><?cs var:sdk.linux32_bundle_checksum ?></td> @@ -334,7 +334,7 @@ <td>Linux 64-bit</td> <td> <a onClick="return onDownload(this)" id="linux-bundle64" - href="http://dl.google.com/android/adt/<?cs var:sdk.linux64_bundle_download ?>"><?cs var:sdk.linux64_bundle_download ?></a> + href="http://dl.google.com/android/adt/<?cs var:sdk.version ?>/<?cs var:sdk.linux64_bundle_download ?>"><?cs var:sdk.linux64_bundle_download ?></a> </td> <td><?cs var:sdk.linux64_bundle_bytes ?> bytes</td> <td><?cs var:sdk.linux64_bundle_checksum ?></td> @@ -396,10 +396,10 @@ var:sdk.linux_download </div><!-- end col-13 for lower-half content --> - - - - + + + + <script> if (location.hash == "#Requirements") { $('.reqs').show(); @@ -440,17 +440,17 @@ var:sdk.linux_download } else { $('.pax').show(); } - - + + function onDownload(link, button, bundle) { - + /* set text for download button */ if (button) { $("#downloadForRealz").html($(link).text()); } else { $("#downloadForRealz").html("Download " + $(link).text()); } - + /* if it's a bundle, show the 32/64-bit picker */ if (bundle) { $("#downloadForRealz").attr('bundle','true'); @@ -482,7 +482,7 @@ var:sdk.linux_download function onAgreeChecked() { /* verify that the TOS is agreed and a bit version is chosen */ if ($("input#agree").is(":checked") && $("#bitpicker input:checked").length) { - + /* if downloading the bundle */ if ($("#downloadForRealz").attr('bundle')) { /* construct the name of the link we want based on the bit version */ @@ -490,7 +490,7 @@ var:sdk.linux_download /* set the real url for download */ $("a#downloadForRealz").attr("href", $(linkId).attr("href")); } - + /* reveal the download button */ $("a#downloadForRealz").removeClass('disabled'); } else { @@ -536,29 +536,29 @@ var:sdk.linux_download <p>Welcome developers! We are pleased to provide you with a preview SDK for the upcoming Android 3.0 release, to give you a head-start on developing applications for it. </p> - + <p>See the <a href="<?cs var:toroot ?>sdk/preview/start.html">Getting Started</a> document for more information about how to set up the preview SDK and get started.</p> <style type="text/css"> .non-preview { display:none; } </style> - + <?cs else ?><?cs # it's normal offline docs ?> - + <?cs ######## HERE IS THE JD DOC CONTENT FOR OFFLINE ######### ?> <?cs call:tag_list(root.descr) ?> <style type="text/css"> body .offline { display:block; } body .online { display:none; } - </style> + </style> <script> $('.reqs').show(); </script> <?cs /if ?> - + <?cs /if ?> <?cs # end if/else online ?> - + <?cs /if ?> <?cs # end if/else NDK ?> <?cs /if ?> <?cs # end if/else redirect ?> |