Patch 2: some fixes to the developer-docs stylesheet....
Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary
Squashed commit of the following:
commit 8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date: Mon Jul 27 09:33:45 2009 -0700
remove the toggle selector from the header.
this will be added in a later change with the rest of the toggle script
commit 2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date: Fri Jul 24 16:29:21 2009 -0700
Implement API Level styles.
This changes the way we show the API Level for a given package/class/member.
It also provides hooks in the document to allow us to restyle items
based on a user-selected API Level (show/hide available items).
More changes to provide the toggling feature will come soon.
commit efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date: Mon Jul 27 09:33:45 2009 -0700
remove the toggle selector from the header.
this will be added in a later change with the rest of the toggle script
commit 3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date: Fri Jul 24 16:29:21 2009 -0700
Implement API Level styles.
This changes the way we show the API Level for a given package/class/member.
It also provides hooks in the document to allow us to restyle items
based on a user-selected API Level (show/hide available items).
More changes to provide the toggling feature will come soon.
diff --git a/tools/droiddoc/templates/macros.cs b/tools/droiddoc/templates/macros.cs
index 1ca2f8b..9f0e5ac 100644
--- a/tools/droiddoc/templates/macros.cs
+++ b/tools/droiddoc/templates/macros.cs
@@ -115,11 +115,9 @@
/if ?>
<?cs /def ?>
-<?cs # print the Since: section ?><?cs
+<?cs # print the API Level ?><?cs
def:since_tags(obj) ?>
- <div class="jd-tagdata">
- <h5 class="jd-tagtitle">Since <?cs var:obj.since ?></h5>
- </div>
+ Since: API Level <?cs var:obj.since ?>
<?cs /def ?>
<?cs # Print the long-form description for something.
@@ -170,8 +168,7 @@
</table>
</div><?cs
/if ?><?cs
- call:see_also_tags(obj.seeAlso) ?><?cs
- call:since_tags(obj) ?><?cs
+ call:see_also_tags(obj.seeAlso) ?><?cs
/def ?>
<?cs # A table of links to classes with descriptions, as in a package file or the nested classes ?><?cs
@@ -179,7 +176,7 @@
set:count = #1 ?>
<table class="jd-sumtable-expando"><?cs
each:cl=classes ?>
- <tr <?cs if:count % #2 ?>class="alt-color"<?cs /if ?> >
+ <tr class="<?cs if:count % #2 ?>alt-color<?cs /if ?> api apilevel-<?cs var:cl.type.since ?>" >
<td class="jd-linkcol"><?cs call:type_link(cl.type) ?></td>
<td class="jd-descrcol" width="100%"><?cs call:short_descr(cl) ?> </td>
</tr><?cs set:count = count + #1 ?><?cs
@@ -187,32 +184,39 @@
</table><?cs
/def ?>
-<?cs # A list of links to classes, for use in the side navigation of packages ?><?cs
+<?cs # A list of links to classes, for use in the side navigation of classes when viewing a package (panel nav) ?><?cs
def:class_link_list(label, classes) ?><?cs
if:subcount(classes) ?>
<li><h2><?cs var:label ?></h2>
<ul><?cs
each:cl=classes ?>
- <li><?cs call:type_link(cl.type) ?></li><?cs
+ <li class="api apilevel-<?cs var:cl.type.since ?>"><?cs call:type_link(cl.type) ?></li><?cs
/each ?>
</ul>
</li><?cs
/if ?><?cs
/def ?>
-<?cs # A list of links to classes, for use in the side navigation of classes ?><?cs
+<?cs # A list of links to classes, for use in the side navigation of classes when viewing a class (panel nav) ?><?cs
def:list(label, classes) ?><?cs
if:subcount(classes) ?>
<li><h2><?cs var:label ?></h2>
<ul><?cs
each:cl=classes ?>
- <li <?cs if:class.name == cl.label?>class="selected"<?cs /if ?>><?cs call:type_link(cl) ?></li><?cs
+ <li class="<?cs if:class.name == cl.label?>selected<?cs /if ?> api apilevel-<?cs var:cl.since ?>"><?cs call:type_link(cl) ?></li><?cs
/each ?>
</ul>
</li><?cs
/if ?><?cs
/def ?>
+<?cs # A list of links to packages, for use in the side navigation of packages (panel nav) ?><?cs
+def:package_link_list(packages) ?><?cs
+ each:pkg=packages ?>
+ <li class="<?cs if:(class.package.name == pkg.name) || (package.name == pkg.name)?>selected<?cs /if ?> api apilevel-<?cs var:pkg.since ?>"><?cs call:package_link(pkg) ?></li><?cs
+ /each ?><?cs
+/def ?>
+
<?cs # An expando trigger ?><?cs
def:expando_trigger(id, default) ?>
<a href="#" onclick="return toggleInherited(this, null)" id="<?cs var:id ?>" class="jd-expando-trigger closed"