docs: update template files with those from the templates-ds directory

Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
This commit is contained in:
Scott Main
2013-01-29 13:34:17 -08:00
parent 015d616af8
commit e05e6f99b3
16 changed files with 2815 additions and 37 deletions

View File

@@ -3785,7 +3785,8 @@ EndColorStr='#ececec');
-transition-timing-function:ease; -transition-timing-function:ease;
} }
.morehover:hover { .morehover:hover,
.morehover.hover {
opacity:1; opacity:1;
height:385px; height:385px;
width:268px; width:268px;

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?> <body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?> <body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs

View File

@@ -62,11 +62,13 @@
<li class="active"><a>Android Developers</a></li> <li class="active"><a>Android Developers</a></li>
<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>
<!-- <div class="header">Support</div>
<ul> <?cs ############ TODO: Remove when we're happy with Devsite ############# ?>
<li><a href="<?cs var:toroot ?>support.html">Developer Support</a></li> <?cs # Use differenc lang switcher for devsite and gae server ?>
</ul> --> <?cs if:devsite ?>
<div class="header">Languages</div> <div class="header">Language</div>
<?cs elif:android.whichdoc == "online" ?>
<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)">
<option value="en">English</option> <option value="en">English</option>
@@ -83,6 +85,10 @@
loadLangPref(); loadLangPref();
//--> //-->
</script> </script>
<?cs /if ?>
<?cs # End of devsite vs. gae version of lang switcher ?>
<br class="clearfix" /> <br class="clearfix" />
</div> </div>
<div class="bottom"></div> <div class="bottom"></div>

View File

@@ -363,6 +363,8 @@ def:custom_footerlinks() ?>
def:custom_buildinfo() ?><?cs def:custom_buildinfo() ?><?cs
if:!google ?> if:!google ?>
Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash; <?cs Android <?cs var:sdk.version ?>&nbsp;r<?cs var:sdk.rel.id ?> &mdash; <?cs
/if ?><?cs var:page.now ?> /if ?>
<script src="<?cs var:toroot ?>timestamp.js" type="text/javascript"></script>
<script>document.write(BUILD_TIMESTAMP)</script>
<?cs /def ?> <?cs /def ?>

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <?cs if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?> <body class="gc-documentation <?cs if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?>
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs if:guide ?> guide<?cs /if ?><?cs <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs if:guide ?> guide<?cs /if ?><?cs

View File

@@ -1,6 +1,6 @@
<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>> <div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>>
<?cs if:reference||guide ?> <?cs if:reference ?>
<div id="copyright"> <div id="copyright">
<?cs call:custom_copyright() ?> <?cs call:custom_copyright() ?>
</div> </div>

View File

@@ -22,7 +22,12 @@ type="text/css">
<!-- JAVASCRIPT --> <!-- JAVASCRIPT -->
<script src="<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>//www.google.com/jsapi" type="text/javascript"></script> <script src="<?cs if:android.whichdoc != 'online' ?>http:<?cs /if ?>//www.google.com/jsapi" type="text/javascript"></script>
<script src="<?cs var:toroot ?>assets/js/global-libraries-combined.js" type="text/javascript"></script> <?cs
if:devsite
?><script src="//android-dot-devsite.googleplex.com/_static/js/android_3p-bundle.js" type="text/javascript"></script><?cs
else
?><script src="<?cs var:toroot ?>assets/js/android_3p-bundle.js" type="text/javascript"></script><?cs
/if ?>
<script type="text/javascript"> <script type="text/javascript">
var toRoot = "<?cs var:toroot ?>"; var toRoot = "<?cs var:toroot ?>";
<?cs if:devsite ?> <?cs if:devsite ?>

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <body class="gc-documentation
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?> <body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?> <body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs <?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs

View File

@@ -1,7 +1,7 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<?cs set:resources="true" ?> <?cs set:resources="true" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?> <?cs include:"head_tag.cs" ?>
<?cs include:"header.cs" ?> <?cs include:"header.cs" ?>
<body class="gc-documentation"> <body class="gc-documentation">

View File

@@ -1,6 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<html> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs if:sdk.redirect ?> <?cs if:sdk.redirect ?>
<head> <head>
<title>Redirecting...</title> <title>Redirecting...</title>

View File

@@ -0,0 +1 @@
var BUILD_TIMESTAMP = "<?cs var:page.now ?>";

View File

@@ -42,7 +42,4 @@ $(".feed").dacTabbedList({
}); });
</script> </script>
<?cs /if ?> <?cs /if ?>
<script type="text/javascript">
init(); /* initialize android-developer-docs.js */
</script>