diff options
| author | 2016-04-18 12:55:17 -0400 | |
|---|---|---|
| committer | 2016-04-18 18:19:48 +0000 | |
| commit | 01febb96753b08b019fb3cf53b37e4e309fbb293 (patch) | |
| tree | 14d297429c4f6af1c417bef7aec988028c173656 | |
| parent | 848295aea9bfd679c1d3aa157130c1480ee2025d (diff) | |
Fix for double header and footer on ndk download pages: b/27950742
https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
Fix for html code in page title and h1 tag: b/28237039
https://android-dot-devsite.googleplex.com/guide/topics/manifest/manifest-element.html
Change-Id: Idc9ba0a1ba33d1b89b7dbfd3d620d0e587c57459
| -rw-r--r-- | tools/droiddoc/templates-sdk-dev/head_tag.cs | 2 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sdk-dev/sdkpage.cs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs index 4088a57334..bd119430a5 100644 --- a/tools/droiddoc/templates-sdk-dev/head_tag.cs +++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs @@ -127,7 +127,7 @@ <title><?cs if:devsite ?><?cs if:page.title ?><?cs - var:page.title ?><?cs + var:html_strip(page.title) ?><?cs else ?>Android Developers<?cs /if ?><?cs else ?><?cs diff --git a/tools/droiddoc/templates-sdk-dev/sdkpage.cs b/tools/droiddoc/templates-sdk-dev/sdkpage.cs index fb45e48596..b0c4d39472 100644 --- a/tools/droiddoc/templates-sdk-dev/sdkpage.cs +++ b/tools/droiddoc/templates-sdk-dev/sdkpage.cs @@ -46,7 +46,7 @@ # ?> -<?cs if:header.hide ?><?cs else ?> +<?cs if:(header.hide||devsite)?><?cs else ?> <h1 itemprop="name"><?cs var:page.title ?></h1> <?cs /if ?> <div id="jd-content" itemprop="description"> @@ -574,7 +574,7 @@ tools release notes</a>.</p> </div><!-- end jd-content --> -<?cs if:!sdk.redirect ?> +<?cs if:!sdk.redirect && !devsite ?> <?cs include:"footer.cs" ?> <?cs /if ?> @@ -599,6 +599,3 @@ document.write('<iframe src="https://2507573.fls.doubleclick.net/activityi;src=2 <!-- End of Tag --> </body> </html> - - - |