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

Commit 29bec3f7 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver...

am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the 

Merge commit '7e680c89' into eclair-plus-aosp

* commit '7e680c89':
  docs: make the Resources docs use the same clearsilver template
parents bd4fcbfb 7e680c89
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class DocFile
                ClearPage.write(hdf, "docpage.cs", outfile);
            } else if (outfile.indexOf("resources/") != -1) {
                hdf.setValue("resources", "true");
                ClearPage.write(hdf, "resourcespage.cs", outfile);
                ClearPage.write(hdf, "docpage.cs", outfile);
            } else {
                ClearPage.write(hdf, "nosidenavpage.cs", outfile);
            }
+0 −36
Original line number Diff line number Diff line
<?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?>

<html>
<?cs include:"head_tag.cs" ?>

<body class="gc-documentation">
<?cs call:custom_masthead() ?>
<?cs call:resources_tab_nav() ?>
<a name="top"></a>
<div class="g-unit" id="doc-content" >
  <div id="jd-header" class="guide-header">
    <span class="crumb">
      <?cs if:parent.link ?>
        <a href="<?cs var:parent.link ?>"><?cs var:parent.title ?></a> >
      <?cs else ?>&nbsp;
      <?cs /if ?>
    </span>
    <h1><?cs var:page.title ?></h1>
  </div>

  <div id="jd-content">

    <?cs call:tag_list(root.descr) ?>

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

</div><!-- end doc-content -->

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

</body>
</html>