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

Commit cf7a3b9e authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk. 

Change-Id: Iade5ac4630c9e763c377ab5749f16832e3ba47b7
parent ab937720

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

+17 −3
Original line number Diff line number Diff line
@@ -7438,6 +7438,10 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me 
  font-weight: 400;

}



.dac-header-crumbs-link.current.ndk {

  color: #00BCD4;

}



@media (max-width: 719px) {

  .dac-header-crumbs {

    display: none;
@@ -7630,6 +7634,10 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me 
  padding-bottom: 11px;

}



.dac-nav-link.has-subnav.ndk, .dac-nav-link.selected.ndk {

  border-bottom: 3px solid #00BCD4;

}



.dac-nav-secondary {

  border-bottom: 1px solid #e5e5e5;

  display: none;
@@ -7660,11 +7668,12 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me 
  }

}



.dac-nav-secondary .dac-nav-item:first-child .dac-nav-link {

  padding-left: 20px;

.dac-nav-secondary .dac-nav-link.selected {

  border: none;

  font-weight: 700;

}



.dac-nav-secondary .dac-nav-link.selected {

.dac-nav-secondary .dac-nav-link.selected.ndk {

  border: none;

  font-weight: 700;

}
@@ -7750,6 +7759,11 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me 
    padding: 0 20px;

  }



  .dac-nav-link.has-subnav.ndk, .dac-nav-link.selected.ndk {

    border: none;

    padding: 0 20px;

  }



  .dac-logo-image {

    margin-right: 5px;

    vertical-align: top;

tools/droiddoc/templates-sdk/assets/images/android_logo_ndk.png

0 → 100644
+4.6 KiB
Loading image diff...

tools/droiddoc/templates-sdk/assets/images/android_logo_ndk@2x.png

0 → 100644
+18.2 KiB
Loading image diff...

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

+16 −1
Original line number Diff line number Diff line
@@ -163,6 +163,21 @@ $(document).ready(function() { 
    } else {

      navEl.find("> li.home > a").addClass('selected');

    }



// highlight NDK tabs

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

    parentNavEl = navEl.find("> li.ndk > a");

    parentNavEl.addClass('has-subnav');

    if ($("body").hasClass("guide")) {

      navEl.find("> li.guides > a").addClass("selected ndk");

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

      navEl.find("> li.reference > a").addClass("selected ndk");

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

      navEl.find("> li.samples > a").addClass("selected ndk");

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

      navEl.find("> li.downloads > a").addClass("selected ndk");

    }



  // highlight Develop tab

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

    parentNavEl = navEl.find("> li.develop > a");
@@ -1056,7 +1071,7 @@ function checkSticky() { 


  var top = $(window).scrollTop();

  // we set the navbar fixed when the scroll position is beyond the height of the site header...

  var shouldBeSticky = top >= stickyTop;

  var shouldBeSticky = top > stickyTop;

  // ... except if the document content is shorter than the sidenav height.

  // (this is necessary to avoid crazy behavior on OSX Lion due to overscroll bouncing)

  if ($("#doc-col").height() < $("#side-nav").height()) {

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

+59 −5
Original line number Diff line number Diff line
@@ -58,26 +58,36 @@ 
            <span class="dac-nav-hamburger-bot"></span>

          </span>

        </a>

        <a class="dac-header-logo" href="<?cs var:toroot ?>index.html">

        <?cs if:ndk ?><a class="dac-header-logo" href="<?cs var:toroot ?>ndk/index.html">

          <img class="dac-header-logo-image" src="<?cs var:toroot ?>assets/images/android_logo_ndk.png"

              srcset="<?cs var:toroot ?>assets/images/android_logo_ndk@2x.png 2x"

              width="32" height="36" alt="Android" /> NDK

          </a><?cs else ?><a class="dac-header-logo" href="<?cs var:toroot ?>index.html">

          <img class="dac-header-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png"

              srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x"

              width="32" height="36" alt="Android" /> Developers

        </a>

          </a><?cs /if ?>



        <ul class="dac-header-crumbs">

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

          <?cs if:!section.landing ?><li class="dac-header-crumbs-item"><span class="dac-header-crumbs-link current"><?cs var:page.title ?></a></li><?cs

          <?cs if:!section.landing ?><li class="dac-header-crumbs-item"><span class="dac-header-crumbs-link current <?cs

            if:ndk ?>ndk<?cs /if ?>"><?cs var:page.title ?></a></li><?cs

          /if ?>

        </ul>



        <?cs # ADD SEARCH AND MENU ?>

        <?cs if:!ndk ?>

        <?cs call:header_search_widget() ?>

        <?cs /if ?>



        <a class="dac-header-consoleBtn" href="https://play.google.com/apps/publish/">

        <?cs if:ndk ?><a class="dac-header-consoleBtn" href="http://developer.android.com">

          <span class="dac-visible-desktop-inline">Back to Android Developers</span>

        </a><?cs else ?><a class="dac-header-consoleBtn" href="https://play.google.com/apps/publish/">

          <span class="dac-sprite dac-google-play"></span>

          <span class="dac-visible-desktop-inline">Developer</span>

          Console

        </a>

        </a><?cs /if ?>



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

    </div><!-- end header -->
@@ -87,6 +97,49 @@ 
    </div>

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



  <?cs if:ndk ?>

  <!-- NDK Navigation-->

  <nav class="dac-nav">

    <div class="dac-nav-dimmer" data-dac-toggle-nav></div>



    <ul class="dac-nav-list" data-dac-nav>

      <li class="dac-nav-item dac-nav-head">

        <a class="dac-nav-link dac-nav-logo" data-dac-toggle-nav href="javascript:;" title="Close navigation">

          <img class="dac-logo-image" src="<?cs var:toroot ?>assets/images/android_logo_ndk.png"

               srcset="<?cs var:toroot ?>assets/images/android_logo_ndk@2x.png 2x"

               width="32" height="36" alt="Android" /> NDK

        </a>

      </li>

      <li class="dac-nav-item guides">

        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/guides/index.html"

           zh-tw-lang="API 指南"

           zh-cn-lang="API 指南"

           ru-lang="Руководства по API"

           ko-lang="API 가이드"

           ja-lang="API ガイド"

           es-lang="Guías de la API">Guides</a>

      </li>

      <li class="dac-nav-item reference">

        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/reference/index.html"

           zh-tw-lang="參考資源"

           zh-cn-lang="参考"

           ru-lang="Справочник"

           ko-lang="참조문서"

           ja-lang="リファレンス"

           es-lang="Referencia">Reference</a>

      </li>

      <li class="dac-nav-item samples">

        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/samples/index.html"

           >Samples</a>

      </li>

      <li class="dac-nav-item downloads">

        <a class="dac-nav-link" href="<?cs var:toroot ?>ndk/downloads/index.html"

           >Downloads</a>

      </li>

    </ul>

  </nav>

  <!-- end NDK navigation-->

  <?cs else ?>

  <!-- Navigation-->

  <nav class="dac-nav">

    <div class="dac-nav-dimmer" data-dac-toggle-nav></div>
@@ -213,6 +266,7 @@ 
    </ul>

  </nav>

  <!-- end navigation-->

  <?cs /if ?>

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



<?cs