StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1b8b0cfe: am 79088780: am 8d92d9ef: am 01a2545b: docs: update templates to remove global content for devsite builds

Browse Source 
* commit '1b8b0cfee98c8d2779dc740707b547846734053f':
  docs: update templates to remove global content for devsite builds
This commit is contained in:
Scott Main
2013-03-21 18:33:53 -07:00
committed by Android Git Automerger
parent 04f2797309 1b8b0cfee9
commit 159de1de00
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/droiddoc/templates-sdk/assets/js/docs.js
View File

@@ -142,6 +142,9 @@ $(document).ready(function() {
} }
} }
// Need a copy of the pagePath before it gets changed in the next block;
// it's needed to perform proper tab highlighting in offline docs (see rootDir below)
var pagePathOriginal = pagePath;
if (SITE_ROOT.match(/\.\.\//) || SITE_ROOT == '') { if (SITE_ROOT.match(/\.\.\//) || SITE_ROOT == '') {
// If running locally, SITE_ROOT will be a relative path, so account for that by // If running locally, SITE_ROOT will be a relative path, so account for that by
// finding the relative URL to this page. This will allow us to find links on the page // finding the relative URL to this page. This will allow us to find links on the page
@@ -169,9 +172,8 @@ $(document).ready(function() {
// highlight Develop tab // highlight Develop tab
} else if ($("body").hasClass("develop") || $("body").hasClass("google")) { } else if ($("body").hasClass("develop") || $("body").hasClass("google")) {
$("#header li.develop a").addClass("selected"); $("#header li.develop a").addClass("selected");
// In Develop docs, also highlight appropriate sub-tab // In Develop docs, also highlight appropriate sub-tab
var rootDir = pagePath.substring(1,pagePath.indexOf('/', 1)); var rootDir = pagePathOriginal.substring(1,pagePathOriginal.indexOf('/', 1));
if (rootDir == "training") { if (rootDir == "training") {
$("#nav-x li.training a").addClass("selected"); $("#nav-x li.training a").addClass("selected");
} else if (rootDir == "guide") { } else if (rootDir == "guide") {

16
tools/droiddoc/templates-sdk/components/masthead.cs
View File

@@ -1,4 +1,6 @@
<?cs def:custom_masthead() ?> <?cs def:custom_masthead() ?>
<a name="top"></a>
<?cs if:!devsite ?><?cs # leave out the global header for devsite; it's in devsite template ?>
<!-- Header --> <!-- Header -->
<div id="header"> <div id="header">
<div class="wrap" id="header-wrap"> <div class="wrap" id="header-wrap">
@@ -60,11 +62,8 @@
<li><a href="http://source.android.com">Android Open Source Project</a></li> <li><a href="http://source.android.com">Android Open Source Project</a></li>
</ul> </ul>
<?cs ############ TODO: Remove when we're happy with Devsite ############# ?> <?cs # Include language switcher only in online docs ?>
<?cs # Use differenc lang switcher for devsite and gae server ?> <?cs if:android.whichdoc == "online" ?>
<?cs if:devsite ?>
<div class="header">Language</div>
<?cs elif:android.whichdoc == "online" ?>
<div class="header">Language</div> <div class="header">Language</div>
<div id="language" class="locales"> <div id="language" class="locales">
<select name="language" onChange="changeLangPref(this.value, true)"> <select name="language" onChange="changeLangPref(this.value, true)">
@@ -83,7 +82,7 @@
//--> //-->
</script> </script>
<?cs /if ?> <?cs /if ?>
<?cs # End of devsite vs. gae version of lang switcher ?> <?cs # End of lang switcher ?>
<br class="clearfix" /> <br class="clearfix" />
@@ -194,7 +193,6 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
</div> </div>
<?cs if:training || guide || reference || tools || develop || google ?> <?cs if:training || guide || reference || tools || develop || google ?>
<!-- Secondary x-nav --> <!-- Secondary x-nav -->
<div id="nav-x"> <div id="nav-x">
@@ -241,5 +239,9 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
</div> </div>
<!-- /Sendondary x-nav --> <!-- /Sendondary x-nav -->
<?cs /if ?> <?cs /if ?>
<?cs /if ?>
<?cs # end if/else !devsite ?>
<?cs <?cs
/def ?> /def ?>

1
tools/droiddoc/templates-sdk/docpage.cs
View File

@@ -9,7 +9,6 @@
elif:distribute ?>distribute<?cs elif:distribute ?>distribute<?cs
/if ?><?cs /if ?><?cs
if:page.trainingcourse ?> trainingcourse<?cs /if ?>" itemscope itemtype="http://schema.org/Article"> if:page.trainingcourse ?> trainingcourse<?cs /if ?>" itemscope itemtype="http://schema.org/Article">
<a name="top"></a>
<?cs include:"header.cs" ?> <?cs include:"header.cs" ?>
<div <?cs if:fullpage <div <?cs if:fullpage

20
tools/droiddoc/templates-sdk/head_tag.cs
View File

@@ -1,4 +1,18 @@
<head> <head>
<?cs ####### If building devsite, add some meta data needed for when generating the top nav ######### ?>
<?cs
if:devsite ?><?cs
if:guide||develop||training||reference||tools||sdk||google
?><meta name="top_category" value="develop" /><?cs
elif:google
?><meta name="top_category" value="google" /><?cs
elif:reference && !(reference.gms || reference.gcm)
?><meta name="top_category" value="css-fullscreen" /><?cs
/if ?>
<?cs
/if
?><?cs # END if/else devsite ?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?cs if:page.metaDescription ?> <?cs if:page.metaDescription ?>
<meta name="Description" content="<?cs var:page.metaDescription ?>"> <meta name="Description" content="<?cs var:page.metaDescription ?>">
@@ -30,11 +44,7 @@ else
/if ?> /if ?>
<script type="text/javascript"> <script type="text/javascript">
var toRoot = "<?cs var:toroot ?>"; var toRoot = "<?cs var:toroot ?>";
<?cs if:devsite ?> var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
var devsite = true;
<?cs else ?>
var devsite = false;
<?cs /if ?>
</script> </script>
<script src="<?cs var:toroot ?>assets/js/docs.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>assets/js/docs.js" type="text/javascript"></script>
<?cs if:reference.gms || reference.gcm || google?> <?cs if:reference.gms || reference.gcm || google?>