summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-10-15 19:17:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-15 19:17:43 +0000
commit093283a070f02e07cb6f365d9e0926ca19e5fed6 (patch)
treedc00cb216a062a3e17ef03dfc2fbabeb2439409e /tools
parentb0d324aadd90abc3b91c97af418c3d27af364925 (diff)
parent820e226d5dc63589dec0263d3639526addb5dbaa (diff)
downloadbuild-093283a070f02e07cb6f365d9e0926ca19e5fed6.zip
build-093283a070f02e07cb6f365d9e0926ca19e5fed6.tar.gz
build-093283a070f02e07cb6f365d9e0926ca19e5fed6.tar.bz2
am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
* commit '820e226d5dc63589dec0263d3639526addb5dbaa': add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
Diffstat (limited to 'tools')
-rw-r--r--tools/droiddoc/templates-sdk/components/masthead.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index c880eee..bb3c722 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -6,7 +6,7 @@
<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
<!-- Header -->
<div id="header-wrapper">
- <div id="header">
+ <div id="header"><?cs call:butter_bar() ?>
<div class="wrap" id="header-wrap">
<div class="col-3 logo">
<a href="<?cs var:toroot ?>index.html">
@@ -261,7 +261,7 @@
<!-- Header -->
<div id="header-wrapper">
- <div id="header">
+ <div id="header"><?cs call:butter_bar() ?>
<div class="wrap" id="header-wrap">
<div class="col_3 logo landing-logo" style="width:240px">
<a href="<?cs var:toroot ?>preview/index.html">
@@ -299,3 +299,16 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div>
<?cs
/def ?>
+
+
+<?cs # (UN)COMMENT THE INSIDE OF THIS METHOD TO TOGGLE VISIBILITY ?>
+<?cs def:butter_bar() ?>
+ <div style="height:20px"><!-- spacer to bump header down --></div>
+ <div id="butterbar-wrapper">
+ <div id="butterbar">
+ <a href="http://googleblog.blogspot.com/" id="butterbar-message">
+ The Android 5.0 SDK will be available on October 17th!
+ </a>
+ </div>
+ </div>
+<?cs /def ?> \ No newline at end of file