Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""

This reverts commit bf234fdfba.
This commit is contained in:
Trevor Johns
2016-04-19 01:15:39 -07:00
parent 4b941608e9
commit 4ff8891dd2
260 changed files with 36791 additions and 8663 deletions

View File

@@ -1,50 +1,25 @@
<?cs include:"doctype.cs" ?>
<?cs # THIS CREATES A PACKAGE SUMMARY PAGE FROM EACH package.html FILES
# AND NAMES IT package-summary.html ?>
<?cs include:"macros.cs" ?>
<?cs include:"macros_override.cs" ?>
<?cs include:"doctype.cs" ?>
<html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs include:"head_tag.cs" ?>
<body class="gc-documentation <?cs if:(reference.gms || reference.gcm) ?>google<?cs /if ?>
<?cs if:(guide||develop||training||reference||tools||sdk) ?>develop<?cs
if:reference ?> reference<?cs
/if ?><?cs
elif:design ?>design<?cs
elif:distribute ?>distribute<?cs
/if ?>">
<div id="doc-api-level" class="<?cs var:package.since ?>" style="display:none"></div>
<a name="top"></a>
<?cs include:"body_tag.cs" ?>
<?cs include:"header.cs" ?>
<?cs include:"page_info.cs" ?>
<div class="api apilevel-<?cs var:package.since ?>" id="jd-content">
<div class="col-12" id="doc-col">
<div id="api-info-block">
<div class="api-level">
<?cs call:since_tags(package) ?>
<?cs call:federated_refs(package) ?>
</div>
</div>
<div id="jd-header">
package
<h1><?cs var:package.name ?></h1>
</div><!-- end header -->
<div id="naMessage"></div>
<div id="jd-content" class="api apilevel-<?cs var:package.since ?>">
<h1><?cs var:package.name ?></h1>
<?cs if:subcount(package.descr) ?>
<div class="jd-descr">
<?cs call:tag_list(package.descr) ?>
</div>
<?cs call:tag_list(package.descr) ?>
<?cs /if ?>
<?cs def:class_table(label, classes) ?>
<?cs if:subcount(classes) ?>
<h2><?cs var:label ?></h2>
<div class="jd-sumtable">
<?cs call:class_link_table(classes) ?>
</div>
<?cs /if ?>
<?cs /def ?>
@@ -55,11 +30,10 @@
<?cs call:class_table("Exceptions", package.exceptions) ?>
<?cs call:class_table("Errors", package.errors) ?>
</div><!-- end apilevel -->
<?cs if:!devsite ?>
<?cs include:"footer.cs" ?>
</div><!-- end jd-content -->
</div><!-- doc-content -->
<?cs include:"trailer.cs" ?>
<?cs /if ?>
</body>
</html>