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

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

Merge "revisions to the next/prev page link layout. make "next" link in footer... 

Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
parents aaa502bc 5bc3a1ac

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

+12 −5
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ video.with-shadow { 
  border-top: 1px solid #ccc;

  margin-top: 10px;

  padding-top:10px;

  height: 30px; }

  width:100%; }



.content-footer .col-9 {

  margin-left:0;
@@ -455,9 +455,15 @@ video.with-shadow { 
.content-footer.wrap {

  width:940px;

}

.content-footer .plus-container {

  margin:5px 0 0;

  text-align:right;

  float:right;

}



.paging-links {

  position: relative; }

  position: relative;

  height:30px; }

  .paging-links a {

    position: absolute; }

  .paging-links a,
@@ -482,7 +488,7 @@ video.with-shadow { 
    .paging-links .prev-page-link {

      left: -15px; }

    .paging-links .next-page-link {

      right: 0px; }

      right: 0; }

    .next-page-link:after,

    .start-class-link:after,

    .start-course-link:after,
@@ -499,6 +505,9 @@ video.with-shadow { 
    .next-page-link.inline:after {

      content: none; }



  .content-footer .paging-links .next-page-link {

    left:0;

  }



  .training-nav-top a {

    display:block;
@@ -537,7 +546,6 @@ video.with-shadow { 


  .paging-links a.start-class-link {

    width:100%;

    text-align:right;

  }



  /* list of classes on course landing page */
@@ -625,7 +633,6 @@ video.with-shadow { 


  .content-footer.next-class a.next-class-link {

    display:block;

    float:right;

    text-transform:uppercase;

  }

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

+6 −2
Original line number Diff line number Diff line
@@ -332,11 +332,15 @@ false; // navigate across topic boundaries only in design docs 
                          .click(function() { return false; });

      if ($nextLink.length) {

        $('.next-class-link').attr('href',$nextLink.attr('href'))

                             .removeClass("hide").append($nextLink.html());

                             .removeClass("hide")

                             .append(": " + $nextLink.html());

        $('.next-class-link').find('.new').empty();

      }

    } else {

      $('.next-page-link').attr('href', $nextLink.attr('href')).removeClass("hide");

      $('.next-page-link').attr('href', $nextLink.attr('href'))

                          .removeClass("hide");

      // for the footer link, also add the next page title

      $('.content-footer .next-page-link').append(": " + $nextLink.html());

    }



    if (!startClass && $prevLink.length) {

tools/droiddoc/templates-sdk/docpage.cs

+7 −18
Original line number Diff line number Diff line
@@ -157,25 +157,9 @@ include:"header.cs" ?> 
                    if:fullpage ?>wrap<?cs

                    else ?>layout-content-row<?cs /if ?>"

                    itemscope itemtype="http://schema.org/SiteNavigationElement">

        <div class="layout-content-col <?cs

                    if:fullpage ?>col-16<?cs

                    elif:training||guide ?>col-8<?cs

                    else ?>col-9<?cs /if ?>" style="padding-top:4px">

          <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?>

            <div class="g-plusone" data-size="medium"></div>

          <?cs /if ?>

        </div>

        <?cs if:!fullscreen ?>

        <div class="paging-links layout-content-col col-4">

        <div class="paging-links layout-content-col col-10">

          <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?>

            <a href="#" class="prev-page-link hide"

                zh-tw-lang="上一堂課"

                zh-cn-lang="上一课"

                ru-lang="Предыдущий"

                ko-lang="이전"

                ja-lang="前へ"

                es-lang="Anterior"

                >Previous</a>

            <a href="#" class="next-page-link hide"

                zh-tw-lang="下一堂課"

                zh-cn-lang="下一课"
@@ -194,13 +178,18 @@ include:"header.cs" ?> 
                >Get started</a>

          <?cs /if ?>

        </div>

        <div class="layout-content-col plus-container col-2" >

          <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?>

            <div class="g-plusone" data-size="medium"></div>

          <?cs /if ?>

        </div>

        <?cs /if ?>

      </div>



      <?cs # for training classes, provide a different kind of link when the next page is a different class ?>

      <?cs if:training && !page.article ?>

      <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement">

          <a href="#" class="next-class-link hide">Next class: </a>

          <a href="#" class="next-class-link hide">Next class</a>

      </div>

      <?cs /if ?>