Merge pull request #4 from stellar/touchups-4

Touchups 4
stellar-deprecated · Sep 29, 2015 · 1ec4a3a · 1ec4a3a
2 parents 09a6ba0 + 47a2b08
commit 1ec4a3a
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 21 deletions.
diff --git a/gulp/enhance.js b/gulp/enhance.js
@@ -7,6 +7,7 @@ let repos = require("../repos.json");
 // The enhance middleware populates a bunch of metadata fields on the files.
 export default function enhance(files, metalsmith, done) {
   _.each(files, (f, p) => {
+    addSrcInfo(f, p, metalsmith);
     addRepoInfo(f, p, metalsmith);
     addProject(f, p, metalsmith);
     addSection(f, p, metalsmith);
@@ -17,6 +18,10 @@ export default function enhance(files, metalsmith, done) {
   done();
 }
 
+function addSrcInfo(f, p) {
+  f.srcPath = p;
+}
+
 function addRepoInfo(f, p) {
   let parts = p.split(path.sep);
 
@@ -38,7 +43,7 @@ function addRepoInfo(f, p) {
       } else {
         // no repo for this case
       }
-    break;  
+    break;
   }
 
   if (!f.repo) return;
@@ -99,12 +104,8 @@ function addExamples(f, p, metalsmith) {
   let examples = metalsmith.metadata()._examples;
   let ext = path.extname(p);
   let endpoint = path.basename(p).slice(0,-ext.length);
-  
+
   if(!(endpoint in examples)) return;
 
   f.examples = examples[endpoint];
 }
-
-
-
-
diff --git a/partials/learn/sidebar.handlebars b/partials/learn/sidebar.handlebars
@@ -10,7 +10,18 @@
       {{>sidebarSubMenu title="Concepts" glob="learn/concepts/*.html"}}
 
       {{#sidebarSubMenu "Integration Guides"}}
-        <li class="pageNavList__item">TODO</li>
+        {{>sidebarSubMenu title="Building blocks" glob="learn/integration-guides/building-blocks/*.html"}}
+        {{>sidebarSubItems glob="learn/integration-guides/*.html"}}
+      {{/sidebarSubMenu}}
+
+      {{#sidebarSubMenu "js-stellar"}}
+        {{>sidebarSubItems glob="js-stellar-base/learn/*.html"}}
+        {{>sidebarSubItems glob="js-stellar-sdk/learn/*.html"}}
+      {{/sidebarSubMenu}}
+
+      {{#sidebarSubMenu "Interstellar"}}
+        {{>sidebarSubItems glob="interstellar/learn/index.html"}}
+        {{>sidebarSubItems glob="interstellar/learn/!(index).html"}}
       {{/sidebarSubMenu}}
 
       {{#sidebarSubMenu "Horizon"}}

diff --git a/partials/sidebarSubItems.handlebars b/partials/sidebarSubItems.handlebars
@@ -1,3 +1,3 @@
 {{#eachFile glob}}
-  <li class="pageNavList__item{{#equal repoPath file.repoPath}} is-currentItem{{/equal}}"><a href="{{pathPrefix}}/{{path}}">{{file.title}}</a></li>
+  <li class="pageNavList__item{{#equal srcPath file.srcPath}} is-currentItem{{/equal}}"><a href="{{pathPrefix}}/{{path}}">{{file.title}}</a></li>
 {{/eachFile}}
diff --git a/partials/siteLogo.handlebars b/partials/siteLogo.handlebars
@@ -1,5 +1,5 @@
-<a href="/" class="so-logo">
-  <span class="so-logo__main">Stellar</span><!--
+<span class="so-logo">
+  <a href="https://www.stellar.org/" class="so-logo__main">Stellar</a><!--
   --><span class="so-logo__separator"> </span><!--
-  --><span class="so-logo__subSite">developers</span>
-</a>
+  --><a href="{{pathPrefix}}/" class="so-logo__subSite">developers</a>
+</span>
diff --git a/repos.json b/repos.json
@@ -5,11 +5,16 @@
   "stellar-core" : {
     "githubURL": "https://github.com/stellar/stellar-core"
   },
+  "interstellar" : {
+    "githubURL": "https://github.com/stellar/interstellar"
+  },
+  "js-stellar-base" : {
+    "githubURL": "https://github.com/stellar/js-stellar-base"
+  },
   "js-stellar-sdk" : {
     "githubURL": "https://github.com/stellar/js-stellar-sdk"
   },
   "horizon" : {
     "githubURL": "https://github.com/stellar/horizon"
   }
-
 }
diff --git a/src/index.html b/src/index.html
@@ -14,30 +14,30 @@
   </div>
   <div class="so-chunk">
     <div class="flexCols flexCols--l flexCols--twinBorder spu-background-primary8 spu-radius">
-      <a href="/developers/learn/"><div class="flexCols__col flexCols--l__col flexCols__col--borderBetween flexCols--l__col--borderBetween spu-borderColor-light4 spu-pad-20 spu-padSE-30 centerText">
+      <a href="{{pathPrefix}}/learn/" class="flexCols__col flexCols--l__col flexCols__col--borderBetween flexCols--l__col--borderBetween spu-borderColor-light4 spu-pad-20 spu-padSE-30 centerText spu-textDecorationNone">
         <p class="so-capTitle">Basics</p>
         <h3>Start learning Stellar concepts</h3>
         <div class="spu-padTB-30">
           <span class="so-graphic-pencilOnEarth"></span>
         </div>
         <p class="spu-fontSize-5">Get to know the ABCs of the Stellar network.</p>
-      </div></a>
-        <a href="/developers/reference/"><div class="flexCols__col flexCols--l__col flexCols__col--borderBetween flexCols--l__col--borderBetween spu-borderColor-light4 spu-pad-20 spu-padSE-30 centerText">
+      </a>
+      <a href="{{pathPrefix}}/reference/" class="flexCols__col flexCols--l__col flexCols__col--borderBetween flexCols--l__col--borderBetween spu-borderColor-light4 spu-pad-20 spu-padSE-30 centerText spu-textDecorationNone">
         <p class="so-capTitle">Documentation</p>
         <h3>Dive deep into the Stellar Galaxy</h3>
         <div class="spu-padTB-30">
           <span class="so-graphic-codeWithOrbits"></span>
         </div>
         <p class="spu-fontSize-5">All the reference you need to build anything you want.</p>
-      </div></a>
-        <a href="/developers/beyond-code/"><div class="flexCols__col flexCols--l__col flexCols__col--borderBetween flexCols--l__col--borderBetween spu-borderColor-light4 spu-pad-20 spu-padSE-30 centerText">
+      </a>
+      <a href="{{pathPrefix}}/beyond-code/" class="flexCols__col flexCols--l__col flexCols__col--borderBetween flexCols--l__col--borderBetween spu-borderColor-light4 spu-pad-20 spu-padSE-30 centerText spu-textDecorationNone">
         <p class="so-capTitle">Participate</p>
         <h3>Join the Stellar community</h3>
         <div class="spu-padTB-30">
           <span class="so-graphic-nodeConnectedEarth"></span>
         </div>
         <p class="spu-fontSize-5">Ask questions, meet other developers, hang out with us.</p>
-      </div></a>
+      </a>
     </div>
   </div>
 </div>
@@ -59,7 +59,7 @@ <h3 class="spu-color-light3 spu-centerText spu-padBottom-10">Quick Start</h3>
       </div>
       <h4 class="spu-padBottom-10">Join the Community</h4>
       <ul class="so-linkList">
-        <li class="so-linkList__item"><a href="/developers/beyond-code/contribute.html">Contribute</a></li>
+        <li class="so-linkList__item"><a href="{{pathPrefix}}/beyond-code/contribute.html">Contribute</a></li>
         <li class="so-linkList__item"><a href="https://slack.stellar.org">Slack</a></li>
         <li class="so-linkList__item"><a href="#check">Volunteer</a></li>
       </ul>
@@ -71,7 +71,7 @@ <h4 class="spu-padBottom-10">Join the Community</h4>
       <h4 class="spu-padBottom-10">Participate in the network</h4>
       <ul class="so-linkList">
         <li class="so-linkList__item"><a href="#check">Contribute</a></li>
-        <li class="so-linkList__item"><a href="/developers/stellar-core/learn/admin.html">Run a node</a></li>
+        <li class="so-linkList__item"><a href="{{pathPrefix}}/stellar-core/learn/admin.html">Run a node</a></li>
         <li class="so-linkList__item"><a href="#check">Volunteer</a></li>
       </ul>
     </div>

diff --git a/src/interstellar b/src/interstellar
@@ -0,0 +1 @@
+../repos/interstellar/docs
diff --git a/src/js-stellar-base b/src/js-stellar-base
@@ -0,0 +1 @@
+../repos/js-stellar-base/docs
diff --git a/src/styles/index.scss b/src/styles/index.scss
@@ -21,6 +21,9 @@
   border-top: 1px solid $s-color-light2;
   padding-top: 2em;
 }
+.mainContent {
+  max-width: 900px;
+}
 
 // gray sidebar on full width pages
 .siteSidebar {