am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.

* commit 'd9bc3eda8f8af202071023ffb93aaee96653dc92':
  docs: Added SDK version to the ADT bundles download path in the CS template.
This commit is contained in:
Ricardo Cervera 2014-03-25 20:36:42 +00:00 committed by Android Git Automerger
commit 816979cc42

View file

@ -11,7 +11,7 @@
<?cs else ?> <?cs else ?>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<?cs /if ?> <?cs /if ?>
<body class="gc-documentation <body class="gc-documentation
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
elif:design ?>design<?cs elif:design ?>design<?cs
elif:distribute ?>distribute<?cs elif:distribute ?>distribute<?cs
@ -107,7 +107,7 @@
</td> </td>
<td><?cs var:ndk.win64_bytes ?></td> <td><?cs var:ndk.win64_bytes ?></td>
<td><?cs var:ndk.win64_checksum ?></td> <td><?cs var:ndk.win64_checksum ?></td>
</tr> </tr>
<!-- <tr> <!-- <tr>
<td> <td>
<a onClick="return onDownload(this)" <a onClick="return onDownload(this)"
@ -199,12 +199,12 @@
<td><?cs var:ndk.debug_info_checksum ?></td> <td><?cs var:ndk.debug_info_checksum ?></td>
</tr> </tr>
</table> </table>
<?cs ######## HERE IS THE JD DOC CONTENT ######### ?> <?cs ######## HERE IS THE JD DOC CONTENT ######### ?>
<?cs call:tag_list(root.descr) ?> <?cs call:tag_list(root.descr) ?>
<script> <script>
function onDownload(link) { function onDownload(link) {
@ -229,13 +229,13 @@
function onDownloadNdkForRealz(link) { function onDownloadNdkForRealz(link) {
if ($("input#agree").is(':checked')) { if ($("input#agree").is(':checked')) {
$("#tos").fadeOut('slow'); $("#tos").fadeOut('slow');
$('html, body').animate({ $('html, body').animate({
scrollTop: $("#Installing").offset().top scrollTop: $("#Installing").offset().top
}, 800, function() { }, 800, function() {
$("#Installing").click(); $("#Installing").click();
}); });
return true; return true;
} else { } else {
$("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200, $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200,
@ -254,7 +254,7 @@
</script> </script>
<?cs else ?> <?cs else ?>
<?cs # end if NDK ... <?cs # end if NDK ...
# #
# #
# #
@ -281,11 +281,11 @@
<h4><a href='' class="expandable" <h4><a href='' class="expandable"
onclick="toggleExpandable(this,'.pax');hideExpandable('.myide,.reqs');return false;" onclick="toggleExpandable(this,'.pax');hideExpandable('.myide,.reqs');return false;"
>DOWNLOAD FOR OTHER PLATFORMS</a></h4> >DOWNLOAD FOR OTHER PLATFORMS</a></h4>
<div class="pax col-13 online" style="display:none;margin:0;"> <div class="pax col-13 online" style="display:none;margin:0;">
<p class="table-caption"><strong>ADT Bundle</strong></p> <p class="table-caption"><strong>ADT Bundle</strong></p>
<table class="download"> <table class="download">
<tr> <tr>
@ -298,7 +298,7 @@
<td>Windows 32-bit</td> <td>Windows 32-bit</td>
<td> <td>
<a onClick="return onDownload(this)" id="win-bundle32" <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>
<td><?cs var:sdk.win32_bundle_bytes ?> bytes</td> <td><?cs var:sdk.win32_bundle_bytes ?> bytes</td>
<td><?cs var:sdk.win32_bundle_checksum ?></td> <td><?cs var:sdk.win32_bundle_checksum ?></td>
@ -307,7 +307,7 @@
<td>Windows 64-bit</td> <td>Windows 64-bit</td>
<td> <td>
<a onClick="return onDownload(this)" id="win-bundle64" <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>
<td><?cs var:sdk.win64_bundle_bytes ?> bytes</td> <td><?cs var:sdk.win64_bundle_bytes ?> bytes</td>
<td><?cs var:sdk.win64_bundle_checksum ?></td> <td><?cs var:sdk.win64_bundle_checksum ?></td>
@ -316,7 +316,7 @@
<td><nobr>Mac OS X 64-bit</nobr></td> <td><nobr>Mac OS X 64-bit</nobr></td>
<td> <td>
<a onClick="return onDownload(this)" id="mac-bundle64" <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>
<td><?cs var:sdk.mac64_bundle_bytes ?> bytes</td> <td><?cs var:sdk.mac64_bundle_bytes ?> bytes</td>
<td><?cs var:sdk.mac64_bundle_checksum ?></td> <td><?cs var:sdk.mac64_bundle_checksum ?></td>
@ -325,7 +325,7 @@
<td>Linux 32-bit</td> <td>Linux 32-bit</td>
<td> <td>
<a onClick="return onDownload(this)" id="linux-bundle32" <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>
<td><?cs var:sdk.linux32_bundle_bytes ?> bytes</td> <td><?cs var:sdk.linux32_bundle_bytes ?> bytes</td>
<td><?cs var:sdk.linux32_bundle_checksum ?></td> <td><?cs var:sdk.linux32_bundle_checksum ?></td>
@ -334,7 +334,7 @@
<td>Linux 64-bit</td> <td>Linux 64-bit</td>
<td> <td>
<a onClick="return onDownload(this)" id="linux-bundle64" <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>
<td><?cs var:sdk.linux64_bundle_bytes ?> bytes</td> <td><?cs var:sdk.linux64_bundle_bytes ?> bytes</td>
<td><?cs var:sdk.linux64_bundle_checksum ?></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 --> </div><!-- end col-13 for lower-half content -->
<script> <script>
if (location.hash == "#Requirements") { if (location.hash == "#Requirements") {
$('.reqs').show(); $('.reqs').show();
@ -440,17 +440,17 @@ var:sdk.linux_download
} else { } else {
$('.pax').show(); $('.pax').show();
} }
function onDownload(link, button, bundle) { function onDownload(link, button, bundle) {
/* set text for download button */ /* set text for download button */
if (button) { if (button) {
$("#downloadForRealz").html($(link).text()); $("#downloadForRealz").html($(link).text());
} else { } else {
$("#downloadForRealz").html("Download " + $(link).text()); $("#downloadForRealz").html("Download " + $(link).text());
} }
/* if it's a bundle, show the 32/64-bit picker */ /* if it's a bundle, show the 32/64-bit picker */
if (bundle) { if (bundle) {
$("#downloadForRealz").attr('bundle','true'); $("#downloadForRealz").attr('bundle','true');
@ -482,7 +482,7 @@ var:sdk.linux_download
function onAgreeChecked() { function onAgreeChecked() {
/* verify that the TOS is agreed and a bit version is chosen */ /* verify that the TOS is agreed and a bit version is chosen */
if ($("input#agree").is(":checked") && $("#bitpicker input:checked").length) { if ($("input#agree").is(":checked") && $("#bitpicker input:checked").length) {
/* if downloading the bundle */ /* if downloading the bundle */
if ($("#downloadForRealz").attr('bundle')) { if ($("#downloadForRealz").attr('bundle')) {
/* construct the name of the link we want based on the bit version */ /* 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 */ /* set the real url for download */
$("a#downloadForRealz").attr("href", $(linkId).attr("href")); $("a#downloadForRealz").attr("href", $(linkId).attr("href"));
} }
/* reveal the download button */ /* reveal the download button */
$("a#downloadForRealz").removeClass('disabled'); $("a#downloadForRealz").removeClass('disabled');
} else { } 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 <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. Android 3.0 release, to give you a head-start on developing applications for it.
</p> </p>
<p>See the <a <p>See the <a
href="<?cs var:toroot ?>sdk/preview/start.html">Getting Started</a> document for more information 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> about how to set up the preview SDK and get started.</p>
<style type="text/css"> <style type="text/css">
.non-preview { display:none; } .non-preview { display:none; }
</style> </style>
<?cs else ?><?cs # it's normal offline docs ?> <?cs else ?><?cs # it's normal offline docs ?>
<?cs ######## HERE IS THE JD DOC CONTENT FOR OFFLINE ######### ?> <?cs ######## HERE IS THE JD DOC CONTENT FOR OFFLINE ######### ?>
<?cs call:tag_list(root.descr) ?> <?cs call:tag_list(root.descr) ?>
<style type="text/css"> <style type="text/css">
body .offline { display:block; } body .offline { display:block; }
body .online { display:none; } body .online { display:none; }
</style> </style>
<script> <script>
$('.reqs').show(); $('.reqs').show();
</script> </script>
<?cs /if ?> <?cs /if ?>
<?cs /if ?> <?cs # end if/else online ?> <?cs /if ?> <?cs # end if/else online ?>
<?cs /if ?> <?cs # end if/else NDK ?> <?cs /if ?> <?cs # end if/else NDK ?>
<?cs /if ?> <?cs # end if/else redirect ?> <?cs /if ?> <?cs # end if/else redirect ?>