am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2

* commit 'de43d71bee336874a756545468d9adcf5e96e421':
  docs: adjust what's visible for online and offline docs
This commit is contained in:
Scott Main
2011-05-27 10:49:33 -07:00
committed by Android Git Automerger
2 changed files with 18 additions and 9 deletions

View File

@@ -31,6 +31,16 @@ installer for help with the initial setup.)</li>
<li>Explore the contents of the Android SDK (optional).</li>
</ol>
<p>To get started, download the appropriate package from the table above, then read the guide to <a
href="installing.html">Installing the SDK</a>.</p>
<p class="online-message">To get started, download the appropriate package from the table above,
then read the guide to <a href="installing.html">Installing the SDK</a>.</p>
<!-- non-inline style and based on only one selector so that
it can be overriden by the sdkpage.cs template -->
<style type="text/css">
.offline-message { display:none; }
</style>
<p class="offline-message">For more information about how to set up your
development environment, read the guide to <a href="installing.html">Installing the SDK</a>.</p>
</div>

View File

@@ -1,6 +1,5 @@
<?cs if:!sdk.redirect ?>
<ul><?cs
if:android.whichdoc == "online" ?>
<ul>
<li>
<h2>
<span class="en">Android SDK Starter Package</span>
@@ -12,7 +11,8 @@
<span style="display:none" class="zh-CN"> SDK </span>
<span style="display:none" class="zh-TW"> SDK </span>
</h2>
<ul>
<ul><?cs
if:android.whichdoc == "online" ?>
<li><a href="<?cs var:toroot ?>sdk/index.html">
<span class="en">Download</span>
<span style="display:none" class="de">Herunterladen</span>
@@ -22,7 +22,8 @@
<span style="display:none" class="ja"></span>
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
</a></li>
</a></li><?cs
/if ?>
<li><a href="<?cs var:toroot ?>sdk/installing.html">
<span class="en">Installing the SDK</span>
<span style="display:none" class="de">Installieren</span>
@@ -33,10 +34,8 @@
<span style="display:none" class="zh-CN"></span>
<span style="display:none" class="zh-TW"></span>
</a></li>
</ul>
</li>
<?cs /if ?><?cs
</li><?cs
if:sdk.preview ?>
<li><h2>Android 3.0 Preview SDK</h2>
<ul>