From 7a6ab434bc34319f06818d12d3abaf9070630684 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Fri, 9 May 2014 10:00:14 -0700 Subject: [PATCH] update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text. Change-Id: I14129fe7657924e2037c103674e09322c4c31db8 --- .../templates-sdk-dyn/assets/css/default.css | 6 +- tools/droiddoc/templates-sdk-dyn/assets/js/docs.js | 6 + .../templates-sdk-dyn/components/masthead.cs | 489 +++++++-------------- tools/droiddoc/templates-sdk-dyn/customizations.cs | 99 +++++ tools/droiddoc/templates-sdk-dyn/head_tag.cs | 2 +- 5 files changed, 256 insertions(+), 346 deletions(-) diff --git a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css index b1c7dcffe..e26aec693 100644 --- a/tools/droiddoc/templates-sdk-dyn/assets/css/default.css +++ b/tools/droiddoc/templates-sdk-dyn/assets/css/default.css @@ -4156,7 +4156,6 @@ EndColorStr='#ececec'); } .logo a { - width:123px; float:left; } @@ -4169,12 +4168,13 @@ EndColorStr='#ececec'); } -#header-wrap .logo-wear { +#header-wrap .logo.wear-logo { width:220px; margin:0; + padding:0; margin-bottom:22px; } -#header-wrap .logo-wear img { +#header-wrap .logo.wear-logo img { padding:0 0 0 10px; } diff --git a/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js b/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js index 09d5f7a50..e6befe36d 100644 --- a/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk-dyn/assets/js/docs.js @@ -564,6 +564,12 @@ function buildBreadcrumbs() { } // Add the primary horizontal nav var $selectedFirstNav = $("div#header-wrap ul.nav-x a.selected").clone().removeClass("selected"); + // If there's no header nav item, use the logo link and title from alt text + if ($selectedFirstNav.length < 1) { + $selectedFirstNav = $("") + .attr('href', $("div#header .logo a").attr('href')) + .text($("div#header .logo img").attr('alt')); + } $breadcrumbUl.prepend($("
  • ").append($selectedFirstNav)); } diff --git a/tools/droiddoc/templates-sdk-dyn/components/masthead.cs b/tools/droiddoc/templates-sdk-dyn/components/masthead.cs index ac7646f28..d0ff64d05 100644 --- a/tools/droiddoc/templates-sdk-dyn/components/masthead.cs +++ b/tools/droiddoc/templates-sdk-dyn/components/masthead.cs @@ -4,220 +4,127 @@ -
    + +
    @@ -230,7 +137,7 @@ onkeyup="return search_changed(event, false, '')" /> ru-lang="Курсы" ko-lang="교육" ja-lang="トレーニング" - es-lang="Capacitación" + es-lang="Capacitación" >Training
  • ru-lang="Руководства по API" ko-lang="API 가이드" ja-lang="API ガイド" - es-lang="Guías de la API" + es-lang="Guías de la API" >API Guides
  • ru-lang="Справочник" ko-lang="참조문서" ja-lang="リファレンス" - es-lang="Referencia" + es-lang="Referencia" >Reference
  • - @@ -296,28 +202,25 @@ onkeyup="return search_changed(event, false, '')" /> Developer Console - - - - - - - ')" /> -
    -
    -
    - - Android Wear - -
    -
    - -

    Developer Preview

    - - - - -
    + - diff --git a/tools/droiddoc/templates-sdk-dyn/customizations.cs b/tools/droiddoc/templates-sdk-dyn/customizations.cs index ea8ae6636..27822d52f 100644 --- a/tools/droiddoc/templates-sdk-dyn/customizations.cs +++ b/tools/droiddoc/templates-sdk-dyn/customizations.cs @@ -398,6 +398,105 @@ def:default_left_nav() ?> + + + + + + + http://fonts.googleapis.com/css?family=Roboto+Condensed"> //fonts.googleapis.com/css?family=Roboto:light,regular,medium,thin,italic,mediumitalic,bold" title="roboto"> -- 2.11.0