diff options
author | Scott Main <smain@google.com> | 2010-06-24 18:11:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-24 18:11:52 -0700 |
commit | fe75781ee9b51bc1266f5e9d002637c53cd3c92c (patch) | |
tree | 461e8c13556ce03910f9c04944cd7815b20a9d02 /tools | |
parent | 665828875b25db458c0b47885850c1d7a11140df (diff) | |
parent | 81b68ad95d6a8ecb8a44ad453d336dff3a059488 (diff) | |
download | build-fe75781ee9b51bc1266f5e9d002637c53cd3c92c.zip build-fe75781ee9b51bc1266f5e9d002637c53cd3c92c.tar.gz build-fe75781ee9b51bc1266f5e9d002637c53cd3c92c.tar.bz2 |
am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp
* commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488':
docs: show the download message on the SDK homepage because we no longer
Diffstat (limited to 'tools')
-rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 23 | ||||
-rw-r--r-- | tools/droiddoc/templates/assets/android-developer-docs.css | 4 |
2 files changed, 22 insertions, 5 deletions
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index 0823db4..a062af3 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -151,6 +151,7 @@ computer. </p> </a> </div> ?> + <p>Welcome Developers! If you are new to the Android SDK, please read the <a href="#quickstart">Quick Start</a>, below, for an overview of how to install and set up the SDK. </p> @@ -169,7 +170,8 @@ to get the components, rather than downloading a new SDK package.</p> <tr> <td>Windows</td> <td> - <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.win_download ?>"><?cs var:sdk.win_download ?></a> + <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.win_download +?>"><?cs var:sdk.win_download ?></a> </td> <td><?cs var:sdk.win_bytes ?> bytes</td> <td><?cs var:sdk.win_checksum ?></td> @@ -177,7 +179,8 @@ to get the components, rather than downloading a new SDK package.</p> <tr class="alt-color"> <td>Mac OS X (intel)</td> <td> - <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.mac_download ?>"><?cs var:sdk.mac_download ?></a> + <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.mac_download +?>"><?cs var:sdk.mac_download ?></a> </td> <td><?cs var:sdk.mac_bytes ?> bytes</td> <td><?cs var:sdk.mac_checksum ?></td> @@ -185,7 +188,8 @@ to get the components, rather than downloading a new SDK package.</p> <tr> <td>Linux (i386)</td> <td> - <a href="<?cs var:toroot ?>sdk/download.html?v=<?cs var:sdk.linux_download ?>"><?cs var:sdk.linux_download ?></a> + <a onclick="onDownload(this)" href="http://dl.google.com/android/<?cs var:sdk.linux_download +?>"><?cs var:sdk.linux_download ?></a> </td> <td><?cs var:sdk.linux_bytes ?> bytes</td> <td><?cs var:sdk.linux_checksum ?></td> @@ -202,6 +206,19 @@ to get the components, rather than downloading a new SDK package.</p> <?cs /if ?> </table> + +<div id="next-steps" style="display:none"> + <p><b>Your download of <em><span id="filename"></span></em> has begun!</b></p> +</div> + +<script type="text/javascript"> +function onDownload(link) { + $(link).parent().parent().children().css('background', '#fff'); + $("#filename").text($(link).html()); + $("#next-steps").show(); +} +</script> + <?cs /if ?> <?cs /if ?> <?cs /if ?> diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css index a3bab76..da39a4a 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.css +++ b/tools/droiddoc/templates/assets/android-developer-docs.css @@ -813,8 +813,8 @@ p.img-caption { div.figure { float:right; clear:right; - margin:1em 0 0 3em; - padding:0; + margin:1em 0 0 0; + padding:0 0 0 3em; background-color:#fff; /* width must be defined w/ an inline style matching the image width */ } |