tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Docs: Add Security tab to top"

Browse source
This commit is contained in:
Clay Murphy 2015-11-03 23:45:56 +00:00 committed by Gerrit Code Review
commit e47d8b99a2
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/droiddoc/templates-sac/assets/css/default.css
View file

@ -1511,7 +1511,7 @@ Header, Login, Nav-X, Search
.devices a.selected { .devices a.selected {
color: #F80; color: #F80;
} }
.accessories a.selected { .security a.selected {
color: #9C0; color: #9C0;
} }
.compatibility a.selected { .compatibility a.selected {

8
tools/droiddoc/templates-sac/assets/js/docs.js
View file

@ -1871,9 +1871,9 @@ function loadSearchResults() {
devicesSearcher.setUserDefinedLabel("Devices"); devicesSearcher.setUserDefinedLabel("Devices");
devicesSearcher.setSiteRestriction("http://source.android.com/devices/"); devicesSearcher.setSiteRestriction("http://source.android.com/devices/");
accessoriesSearcher = new google.search.WebSearch(); securitySearcher = new google.search.WebSearch();
accessoriesSearcher.setUserDefinedLabel("Accessories"); securitySearcher.setUserDefinedLabel("Security");
accessoriesSearcher.setSiteRestriction("http://source.android.com/accessories/"); securitySearcher.setSiteRestriction("http://source.android.com/security/");
compatibilitySearcher = new google.search.WebSearch(); compatibilitySearcher = new google.search.WebSearch();
compatibilitySearcher.setUserDefinedLabel("Compatibility"); compatibilitySearcher.setUserDefinedLabel("Compatibility");
@ -1883,7 +1883,7 @@ function loadSearchResults() {
searchControl.addSearcher(sacSiteSearcher, searchOptions); searchControl.addSearcher(sacSiteSearcher, searchOptions);
searchControl.addSearcher(sourceSearcher, searchOptions); searchControl.addSearcher(sourceSearcher, searchOptions);
searchControl.addSearcher(devicesSearcher, searchOptions); searchControl.addSearcher(devicesSearcher, searchOptions);
searchControl.addSearcher(accessoriesSearcher, searchOptions); searchControl.addSearcher(securitySearcher, searchOptions);
searchControl.addSearcher(compatibilitySearcher, searchOptions); searchControl.addSearcher(compatibilitySearcher, searchOptions);

8
tools/droiddoc/templates-sac/components/masthead.cs
View file

@ -255,7 +255,7 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
<a href="<?cs var:toroot ?>index.html"> <a href="<?cs var:toroot ?>index.html">
<img src="<?cs var:toroot ?>assets/images/sac_logo.png" <img src="<?cs var:toroot ?>assets/images/sac_logo.png"
srcset="<?cs var:toroot ?>assets/images/sac_logo@2x.png 2x" srcset="<?cs var:toroot ?>assets/images/sac_logo@2x.png 2x"
width="123" height="25" alt="Android Developers" /> width="123" height="25" alt="Android Open Source Project" />
</a> </a>
</div> </div>
<ul class="nav-x col-9"> <ul class="nav-x col-9">
@ -266,9 +266,9 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
<li class="devices"><a href="<?cs var:toroot ?>devices/index.html" <?cs <li class="devices"><a href="<?cs var:toroot ?>devices/index.html" <?cs
if:devices ?>class="selected"<?cs /if ?> if:devices ?>class="selected"<?cs /if ?>
>Devices</a></li> >Devices</a></li>
<li class="accessories"><a href="<?cs var:toroot ?>accessories/index.html" <?cs <li class="security"><a href="<?cs var:toroot ?>security/index.html" <?cs
if:accessories ?>class="selected"<?cs /if ?> if:security ?>class="selected"<?cs /if ?>
>Accessories</a></li> >Security</a></li>
<li class="compatibility last"><a href="<?cs var:toroot ?>compatibility/index.html" <?cs <li class="compatibility last"><a href="<?cs var:toroot ?>compatibility/index.html" <?cs
if:compatibility ?>class="selected"<?cs /if ?> if:compatibility ?>class="selected"<?cs /if ?>
>Compatibility</a></li> >Compatibility</a></li>

8
tools/droiddoc/templates-sac/customizations.cs
View file

@ -382,8 +382,8 @@ def:sac_left_nav() ?>
<?cs call:compatibility_nav() ?> <?cs call:compatibility_nav() ?>
<?cs elif:source ?> <?cs elif:source ?>
<?cs call:source_nav() ?> <?cs call:source_nav() ?>
<?cs elif:accessories ?> <?cs elif:security ?>
<?cs call:accessories_nav() ?> <?cs call:security_nav() ?>
<?cs elif:reference ?> <?cs elif:reference ?>
<?cs call:default_left_nav() ?> <?cs call:default_left_nav() ?>
<?cs /if ?> <?cs /if ?>
@ -450,14 +450,14 @@ def:source_nav() ?>
<?cs /def ?> <?cs /def ?>
<?cs <?cs
def:accessories_nav() ?> def:security_nav() ?>
<div class="wrap clearfix" id="body-content"> <div class="wrap clearfix" id="body-content">
<div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
<div id="devdoc-nav" class="scroll-pane"> <div id="devdoc-nav" class="scroll-pane">
<a class="totop" href="#top" data-g-event="left-nav-top">to top</a> <a class="totop" href="#top" data-g-event="left-nav-top">to top</a>
<?cs <?cs
include:"../../../../docs/source.android.com/src/accessories/accessories_toc.cs" ?> include:"../../../../docs/source.android.com/src/security/security_toc.cs" ?>
</div> </div>
</div> <!-- end side-nav --> </div> <!-- end side-nav -->