diff options
| author | 2009-07-15 16:37:21 -0700 | |
|---|---|---|
| committer | 2009-07-15 16:37:21 -0700 | |
| commit | d8cfce0ddf954340d5f5587f72509ca685b5bc1a (patch) | |
| tree | 0802ba36d7406ff3abd2482c662ce1cd7db3a59d | |
| parent | 3ba448c7f08e3055ed7958777f848dc3f29a1ef4 (diff) | |
AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
BUG=1790234
Automated import of CL 150536
| -rw-r--r-- | tools/droiddoc/src/DocFile.java | 2 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/droiddoc/src/DocFile.java b/tools/droiddoc/src/DocFile.java index 0c3d112a21..990133061d 100644 --- a/tools/droiddoc/src/DocFile.java +++ b/tools/droiddoc/src/DocFile.java @@ -129,7 +129,7 @@ public class DocFile } else { if (outfile.indexOf("sdk/") != -1) { hdf.setValue("sdk", "true"); - if (outfile.indexOf("index.html") != -1) { + if ((outfile.indexOf("index.html") != -1) || (outfile.indexOf("features.html") != -1)) { ClearPage.write(hdf, "sdkpage.cs", outfile); } else { ClearPage.write(hdf, "docpage.cs", outfile); diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs index 7a5a96bd73..d5c9ffc8b0 100644 --- a/tools/droiddoc/templates-sdk/sdkpage.cs +++ b/tools/droiddoc/templates-sdk/sdkpage.cs @@ -4,7 +4,9 @@ <?cs if:sdk.redirect ?> <head> <title>Redirecting...</title> - <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html"> + <meta http-equiv="refresh" content="0;url=<?cs var:toroot ?>sdk/<?cs + if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>"<?cs + else ?><?cs var:sdk.current ?>/index.html<?cs /if ?>" <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" /> </head> <?cs else ?> @@ -17,12 +19,14 @@ <?cs call:sdk_nav() ?> <?cs if:sdk.redirect ?> + <div class="g-unit"> <div id="jd-content"> <p>Redirecting to - <a href="/sdk/<?cs var:sdk.current ?>/index.html"> - /sdk/<?cs var:sdk.current ?>/index.html - </a></p> + <a href="<?cs var:toroot ?>sdk/<?cs + if:sdk.redirect.path ?><?cs var:sdk.redirect.path ?>">/sdk/<?cs var:sdk.redirect.path ?><?cs + else ?><?cs var:sdk.current ?>/index.html">/sdk/<?cs var:sdk.current ?>/index.html<?cs /if ?> + </a> ...</p> <?cs else ?> <div class="g-unit" id="doc-content" > <div id="jd-header" class="guide-header" > |