Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a6812d authored by smain@google.com's avatar smain@google.com Committed by Android (Google) Code Review
Browse files

Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev

parents e20af003 6040ffa1

tools/droiddoc/templates-sdk/assets/css/default.css

+3 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,9 @@ Header, Login, Nav-X, Search 
    color: #333;

    font-size: 16px;

}

.about a.selected {

    color: #9933CC;

}

.design a.selected {

    color: #33b5e5;

}

tools/droiddoc/templates-sdk/assets/js/docs.js

+12 −0
Original line number Diff line number Diff line
@@ -173,6 +173,18 @@ $(document).ready(function() { 
    $("#header li.design a").addClass("selected");

    $("#sticky-header").addClass("design");



  // highlight About tabs

  } else if ($("body").hasClass("about")) {

    var rootDir = pagePathOriginal.substring(1,pagePathOriginal.indexOf('/', 1));

    if (rootDir == "about") {

      $("#nav-x li.about a").addClass("selected");

    } else if (rootDir == "wear") {

      $("#nav-x li.wear a").addClass("selected");

    } else if (rootDir == "tv") {

      $("#nav-x li.tv a").addClass("selected");

    } else if (rootDir == "auto") {

      $("#nav-x li.auto a").addClass("selected");

    }

  // highlight Develop tab

  } else if ($("body").hasClass("develop") || $("body").hasClass("google")) {

    $("#header li.develop a").addClass("selected");

tools/droiddoc/templates-sdk/components/masthead.cs

+24 −50
Original line number Diff line number Diff line 
<?cs def:custom_masthead() ?>

<?cs if:wear ?>

  <?cs call:wear_masthead() ?>

<?cs else ?>

<a name="top"></a>

<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>

  <!-- Header -->
@@ -126,7 +123,27 @@ 
      </div><!-- end header-wrap.wrap -->

    </div><!-- end header -->



  <?cs if:training || guide || reference || tools || develop || google || samples ?>

  <?cs if:about || wear || tv || auto ?>

    <!-- Secondary x-nav -->

    <div id="nav-x">

        <div class="wrap">

            <ul class="nav-x col-9 about" style="width:100%">

                <li class="about"><a href="<?cs var:toroot ?>about/index.html"

                  >About</a></li>

                <li class="wear"><a href="<?cs var:toroot ?>wear/index.html"

                  >Wear</a></li>

                <li class="tv"><a href="<?cs var:toroot ?>tv/index.html"

                  >TV</a></li>

                <li class="auto"><a href="<?cs var:toroot ?>auto/index.html"

                  >Auto</a></li>

            </ul>

        </div>

    </div>

    <!-- /Sendondary x-nav ABOUT -->







  <?cs elif:training || guide || reference || tools || develop || google || samples ?>

    <!-- Secondary x-nav -->

    <div id="nav-x">

        <div class="wrap">
@@ -174,7 +191,7 @@ 
            </ul>

        </div>

    </div>

    <!-- /Sendondary x-nav -->

    <!-- /Sendondary x-nav DEVELOP -->



  <?cs elif:distribute || googleplay || essentials || users || engage || monetize || disttools || stories ?>

    <!-- Secondary distribute x-nav -->
@@ -202,6 +219,7 @@ 
            <a href="https://play.google.com/apps/publish/" class="developer-console-btn">Developer Console</a>

        </div> <!-- /Secondary distribute x-nav -->

    </div>

    <!-- /Sendondary x-nav DISTRIBUTE -->

  <?cs /if ?>



    <div id="searchResults" class="wrap" style="display:none;">
@@ -222,49 +240,5 @@ 
    </div>

  </div>



<?cs /if ?><?cs # end if/else !devsite ?>

<?cs /if ?><?cs # end if/else wear ?><?cs

/def ?>



<?cs def:wear_masthead() ?>

<a name="top"></a>



<!-- Header -->

<div id="header-wrapper">

  <div id="header">

    <div class="wrap" id="header-wrap">

      <div class="col_3 logo wear-logo">

        <a href="<?cs var:toroot ?>wear/index.html">

          <img src="<?cs var:toroot ?>wear/images/android-wear.png" height="16" alt="Android Wear" />

        </a>

      </div>

      <div class="col-8" style="margin:0"><h1 style="margin:1px 0 0 20px;padding:0;line-height:16px;

color:#666;font-weight:100;font-size:24px;">Developer Preview</h1></div>



      <?cs # ADD SEARCH AND MENU ?>

      <?cs call:header_search_widget() ?>



    </div><!-- end header-wrap -->

  </div><!-- /Header -->





  <div id="searchResults" class="wrap" style="display:none;">

          <h2 id="searchTitle">Results</h2>

          <div id="leftSearchControl" class="search-control">Loading...</div>

  </div>

</div> <!--end header-wrapper -->



<div id="sticky-header">

  <div>

    <a class="logo" href="#top"></a>

    <a class="top" href="#top"></a>

    <ul class="breadcrumb">

      <?cs # More <li> elements added here with javascript ?>

      <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs

      /if ?>

    </ul>

  </div>

</div>



  <?cs

<?cs /if ?><?cs # end if/else !devsite ?><?cs

/def ?>

tools/droiddoc/templates-sdk/docpage.cs

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs 
    if:monetize ?> monetize<?cs /if ?><?cs

    if:disttools ?> disttools<?cs /if ?><?cs

    if:stories ?> stories<?cs /if ?><?cs

  elif:about ?>about<?cs

  elif:(about||wear||tv||auto) ?>about<?cs

  elif:design ?>design<?cs

/if ?><?cs

if:page.trainingcourse ?> trainingcourse<?cs