From e21bed28acdd21f6000d1de30538839085ffa890 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Fri, 2 May 2014 15:14:04 -0700 Subject: [PATCH] Merge changes from templates-sdk to templates-sdk-dyn. Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f --- .../templates-sdk-dyn/assets/css/default.css | 44 ++++- .../assets/css/fullscreen.css | 16 +- .../assets/images/dac_logo@2x.png | Bin 0 -> 2497 bytes .../templates-sdk-dyn/components/masthead.cs | 151 +++++++++++++++++- .../templates-sdk-dyn/customizations.cs | 22 +++ tools/droiddoc/templates-sdk-dyn/docpage.cs | 2 +- tools/droiddoc/templates-sdk-dyn/head_tag.cs | 19 ++- tools/droiddoc/templates-sdk-dyn/sample.cs | 2 +- tools/droiddoc/templates-sdk-dyn/sdkpage.cs | 62 +++---- 9 files changed, 260 insertions(+), 58 deletions(-) create mode 100644 tools/droiddoc/templates-sdk-dyn/assets/images/dac_logo@2x.png diff --git a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css index e7ab40fe5..b1c7dcffe 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 1093eae35..53d9a6462 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 new file mode 100644 index 0000000000000000000000000000000000000000..0f2784ddbaf8473b22ad64993f9dc32eb95486f1 GIT binary patch literal 2497 zcmV;y2|o6TP)c{2zSmPQU8!s`|SAs=uncviRP`A|ti}F9rUR z@%$5kTY#AjxNFnc(^4Q~mpW!ta3`PlrErt04@Fn1e z9BChc*O1p*$3?+lOwSds0AB%K>(Pc=fQJEZ1Wvd}7>w{O_I;YDzXDzXd^yE6UIbnZ z{GM#P0eCML2ZIq_*fK=*ptkK@;M>5bQ(Q-mh`$N!Yug_a=Fk~~!6?ube*|4-3fX#p z2b@W99T~g+Ktv$q4Lj4;AJ6lM$3bsQmJq)NQXB5?Ey!e9r-Ys6f<7z+Q;4)@Ln(E;x08h$QozG!QWzs zEW{uKXwXu(;7>K-urY9mWH8p8u-^iH7|5nC1EtdhHXM(Y0$%`j@qY&6pb@s5Q6`sC z-h|s<$NtoxBAPn-O(2_o#lLb@*pniPc}p9f7g0#;AJ6G^vA<~ZRO8`>zKcJ_WmE80{Lv_M4}aPh%AK9R6OyR-C~oy|9lr?3dxE4O6g7t{7Wq z**;BliB}`VUF9moD7!1paDyB~YarWN_azQ>@*o(B=?}t%w5KLkBP%1}C;sizexKKB z5HBw&no_G&Dk@*blgY$e^yLuNX=ZUtv=WZ1qWI+tA6G;)KfX_Xw_?tlAk%~z+jvgj zvprcr)7nnb+K$^g4jxYf@2Blxe;);!#lEz8(J!vLSiRV?Izr4{JoF=KS&RZG>x{Y&_F&d{gtV&!U*2T2lCzrW|%o-8dOO{+&* zuR8H|J8GhwWeNTt!Tv#(LSR=sJBA4bs4C99 zrO!6N3O&XOq)(PnbFpi}Z6Zx8rnUBAkE?sTOhi3rNo!16R(eiSzjekU9(6r+@126n zhT7GPu}d$XIv!`s7ddx)fjr1N+{Z2tXaUYUJRBA@H=3dwv(M&+cMG(~<=$(g@+M)9 zJiJ;C$BrG3X;{QqL|!a74z^V-nJ0&Fjd6k>!3v=7sGZdstR|^co6V)6T;73;I;=d%9*12T_`qim#TR_Jn!#*|$AO z!p=KUWRTO2VZgFUi&+tkqN_FSol2!LBwdXGy5TJBlC;kHwvouTNMsb#Z?wg<8!_%> z5%#z|)XH35A@U+=OhL8W$}QjTL4eTrtv1XW=3-&zN8QjujY%a~@R*iuvPu=VjV;11 z${rDuR#_1;FI*lHDy&r%tCMz`Sk5gFxa?zl89e*hu>Wrnt%VMaUBbNXdRK{_{&j7z zMjvePi6LIQuJsRFmcDh-_7s(tkGay-66A$5r0XqPXDMQ!oaCZn>unIXmpHcRleVvl z=&PEc@f+|p!}ga-QXWkr>XBvO#&-oW#kAw5kQQx^&$JpI-QBvyg9w=yd4w)oaWw}( zio2Ru*zz^Pj|0CI(N{Va#dN=jdAo?d|U`>BP!S45xiIZZ_0yS`^iZn(nlz&n5^ z0#6sw8(#jIvZ(3w$DXC7?2>}?Eu5Y>aIt`J7zirL9$#s-9quDdE8DaPJ9J*?P$S_% zyam?@DtiNFz+a-Akb>%yR&p+;a;s^QODQX(YpdOGaKl5`lQ%8(8snsq>Z;@Q+6mVS znHM?+nulTqxZf(KpLyKDRoI^d6wt>d6tt``D@4>Y!afQtx6g{z1q5+#TB)H2uxK3 z#rH0DIqq!WRuR36tVqaF?+bvRyBvJiruQ=^1R2=J$`aSNqb{I&1+ix9$^!K zhji)bw99FKT_mJES>Ji43)|*R<$X`tw94jyg)ez$n^Ex0vvBYg&N&$EDI%@m8Ymn2 zhLl3my5-P3z$< z8Nc4aMZkzb(kwql0m7CGMC788XUMiazy}P+%7DBKI@2$A%9Uihr=0=%3)>l`f|{Mh z2q81y*00000 LNkvXXu0mjfyXC>& literal 0 HcmV?d00001 diff --git a/tools/droiddoc/templates-sdk-dyn/components/masthead.cs b/tools/droiddoc/templates-sdk-dyn/components/masthead.cs index 763990a07..ac7646f28 100644 --- a/tools/droiddoc/templates-sdk-dyn/components/masthead.cs +++ b/tools/droiddoc/templates-sdk-dyn/components/masthead.cs @@ -1,4 +1,7 @@ + + +
@@ -6,7 +9,9 @@
- + + + + + +
+
+
+ + Android Wear + +
+
+ +

Developer Preview

+ + +
+
+
+
+
+
+
+
Links
+ +
Android Sites
+ + + + +
Language
+
+ +
+ + + + + +
+
+
+
+ + + +
+
+
    +
+
+
+ +
+
 
+
+
    +
+
+
+
+
+
+
+
+
+
    +
+
+
+
    +
+
+
+ +
+ + + +
+
+ + + + + +
+ + + + diff --git a/tools/droiddoc/templates-sdk-dyn/customizations.cs b/tools/droiddoc/templates-sdk-dyn/customizations.cs index 2e2f2e6a2..ea8ae6636 100644 --- a/tools/droiddoc/templates-sdk-dyn/customizations.cs +++ b/tools/droiddoc/templates-sdk-dyn/customizations.cs @@ -270,6 +270,26 @@ def:about_nav() ?> + + +
+
+
+ + + + +
+
+ + + @@ -416,6 +436,8 @@ def:custom_left_nav() ?> - + diff --git a/tools/droiddoc/templates-sdk-dyn/head_tag.cs b/tools/droiddoc/templates-sdk-dyn/head_tag.cs index 70ad760b9..1b6f50d7e 100644 --- a/tools/droiddoc/templates-sdk-dyn/head_tag.cs +++ b/tools/droiddoc/templates-sdk-dyn/head_tag.cs @@ -15,13 +15,13 @@ ?> - + - <?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 684e28443..c6f28f818 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 d98146ad1..95f6596f3 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 ?>