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

Commit 82e929d5 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Read sdk vars from centralized files. Fix a couple of issues in navigation labels and alignment. 

Change-Id: I71da51cd20ac68ad6bc82cf8d9507cda965ec88b
parent 6857e477

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

+4 −3
Original line number Diff line number Diff line
@@ -1854,10 +1854,11 @@ a:visited { 
  -webkit-appearance: none;

  background: transparent url(../images/arrows-up-down.png) 23px 5px no-repeat;

  color: #222;

  /* remove the lines below after xp testing

     height: 19px;

  line-height: 19px;

     line-height: 19px; */

  padding: 0;

  margin:1px 0 0 0;

  margin: .5px 0 0 0;

  width:150%;

  font-size:13px;

  vertical-align:top;

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

+4 −5
Original line number Diff line number Diff line
@@ -4166,13 +4166,12 @@ switch (window.getLangPref()) { 
      views.addClass('dac-active');

    } else {

      // Activate back button and tier 2 nav.

      var langAttr = window.getLangPref();

      console.log("langAttr is " + langAttr);

      views.slice(0, 2).addClass('dac-active');

      var selectedNav = views.eq(2).find('.selected').after(forwardLink);

      //select the localized text if available else the selectedNav value

      if (langAttr!='en') {

        $('.dac-nav-back-title').text(selectedNav.attr(langAttr + '-lang'));

      var langAttr = selectedNav.attr(window.getLangPref() + '-lang');

      //form the label from locale attr if possible, else set to selectedNav text value

      if ((typeof langAttr !== typeof undefined &&  langAttr !== false) && (langAttr !== '')) {

        $('.dac-nav-back-title').text(langAttr);

      } else {

        $('.dac-nav-back-title').text(selectedNav.text());

      }

tools/droiddoc/templates-sdk-dev/sdkpage.cs

+1 −0
Original line number Diff line number Diff line 
<?cs include:"doctype.cs" ?>

<?cs include:"macros.cs" ?>

<?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_vars.cs" ?>

<html<?cs if:devsite ?> devsite<?cs /if ?>>

<?cs if:sdk.redirect ?>

  <head>