stellar-deprecated · irisli · Jul 5, 2016 · May 12, 2016 · May 12, 2016 · May 18, 2016
diff --git a/gulp/enhance.js b/gulp/enhance.js
@@ -27,8 +27,9 @@ function addRepoInfo(f, p) {
   let parts = p.split(path.sep);
 
   switch(parts[0]) {
-    case "learn":
+    case "guides":
     case "reference":
+    case "software":
     case "tools":
     case "beyond-code":
       f.repo = "docs";
@@ -75,13 +76,14 @@ function addFullTitle(f, p) {
 
 function addSection(f, p) {
   if (path.extname(p) !== ".md") return;
+  if (f.section) return;
 
   let parts = p.split(path.sep);
   switch(parts[0]) {
-    case "learn":
+    case "guides":
     case "reference":
+    case "software":
     case "tools":
-    case "beyond-code":
       f.section = parts[0];
       break;
     default:

diff --git a/gulp/handlebars.js b/gulp/handlebars.js
@@ -35,12 +35,15 @@ module.exports.helpers = {
   },
 
   sidebarSubMenu(title, options) {
+    let c = options.hash.collapsible == true;
+    const listTag = options.hash.numbered ? 'ol' : 'ul';
+
     return `
-      <li class="pageNavList__subList collapsibleListSet js-collapsibleListSet">
-        <span class="pageNavList__title collapsibleListSet__label js-collapsibleListSet__label">${title}</span>
-        <ul class="collapsibleListSet__list js-collapsibleListSet__list is-collapsed">
+      <li class="pageNavList__subList${(c) ? ' collapsibleListSet js-collapsibleListSet' : ''}">
+        <span class="pageNavList__title${(c) ? ' collapsibleListSet__label js-collapsibleListSet__label' : ''}">${title}</span>
+        <${listTag} class="collapsibleListSet__list${(c) ? ' js-collapsibleListSet__list is-collapsed' : ''}">
           ${options.fn(this)}
-        </ul>
+        </${listTag}>
       </li>
     `;
   },

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -2,6 +2,8 @@ import gulp from 'gulp';
 import path from 'path';
 import Metalsmith from 'metalsmith';
 import _ from 'lodash';
+import markdownItAnchor from 'markdown-it-anchor';
+import markdownItFootnote from 'markdown-it-footnote';
 import util from 'util';
 import fs from 'fs';
 import hbars from './gulp/handlebars';
@@ -21,10 +23,10 @@ gulp.task("default", ["build"]);
 
 gulp.task('src:symlink-repos', ['git:clone'], () => {
   // symlink the landing pages/custom content from the docs repo for each section
-  safeSymlink("../repos/docs/learn", "src/learn")
+  safeSymlink("../repos/docs/guides", "src/guides")
   safeSymlink("../repos/docs/reference", "src/reference")
+  safeSymlink("../repos/docs/software", "src/software")
   safeSymlink("../repos/docs/tools", "src/tools")
-  safeSymlink("../repos/docs/beyond-code", "src/beyond-code")
 
   // link up other repo's docs folder into the src structure
   return gulp.src("./repos/*/docs/")
@@ -39,6 +41,8 @@ gulp.task('js:copy-vendor', function() {
       './bower_components/codemirror/addon/runmode/runmode.js',
       './bower_components/codemirror/mode/javascript/javascript.js',
       './bower_components/codemirror/mode/shell/shell.js',
+      './bower_components/codemirror/mode/clike/clike.js',
+      './bower_components/codemirror/mode/go/go.js',
       './bower_components/stellar-sdk/stellar-sdk.min.js',
     ])
     .pipe($g.concat('vendor.js'))
@@ -72,10 +76,10 @@ gulp.task('build', ['src:symlink-repos', "js:copy-vendor"], done => {
       files: [
         "js/vendor.js",
         "js/syntaxHighlight.js",
+        "js/codeExamples.js",
         "js/endpointRef.js",
         "js/friendbot4.js",
         "js/collapsibleListSet.js",
-        "js/headingAnchorShortcut.js",
         "js/linkCheck.js",
       ],
       output: "js/app.js",
@@ -87,7 +91,16 @@ gulp.task('build', ['src:symlink-repos', "js:copy-vendor"], done => {
       ]
     }))
     .use(renameReadme)
-    .use($m.markdown())
+    .use($m.markdownit({
+      html: true,
+      linkify: true,
+      typographer: true
+    }).use(markdownItAnchor, {
+      permalink: true,
+      permalinkClass: 'anchorShortcut',
+      permalinkSymbol: '',
+      permalinkBefore: true
+    }).use(markdownItFootnote))
     .use($m.inPlace(_.extend({}, templateOptions, {
       pattern: '*.handlebars'
     })))

diff --git a/layouts/learn.handlebars → layouts/guides.handlebars b/layouts/learn.handlebars → layouts/guides.handlebars
@@ -2,7 +2,7 @@
 {{> header-full-with-sidebar }}
 
 <div class="S-flex-row">
-  {{> learn/sidebar }}
+  {{> guides/sidebar }}
   {{> contentWrapperStart }}
   {{> contentWrapperEnd }}
 </div>

diff --git a/layouts/software.handlebars b/layouts/software.handlebars
@@ -0,0 +1,11 @@
+{{> head }}
+{{> header-full-with-sidebar }}
+
+<div class="S-flex-row">
+  {{> software/sidebar }}
+  {{> contentWrapperStart }}
+  {{> contentWrapperEnd }}
+</div>
+
+{{> footer }}
+{{> foot }}
diff --git a/package.json b/package.json
@@ -16,13 +16,15 @@
     "handlebars": "^4.0.2",
     "load-metalsmith-plugins": "^0.1.1",
     "lodash": "^3.10.1",
+    "markdown-it-anchor": "^2.5.0",
+    "markdown-it-footnote": "^2.0.0",
     "metalsmith": "git+https://github.com/stellar/metalsmith.git",
     "metalsmith-autoprefixer": "^1.1.0",
     "metalsmith-concat": "^3.0.3",
     "metalsmith-fingerprint": "^1.0.3",
     "metalsmith-in-place": "^1.3.1",
     "metalsmith-layouts": "^1.4.1",
-    "metalsmith-markdown": "^0.2.1",
+    "metalsmith-markdownit": "^0.3.0",
     "metalsmith-metadata": "0.0.1",
     "metalsmith-sass": "^1.3.0",
     "minimatch": "^2.0.10",

diff --git a/partials/footer.handlebars b/partials/footer.handlebars
@@ -5,8 +5,8 @@
         <a class="siteFooter__list__item" href="https://www.stellar.org/"><span class="graphic-backArrow-9"></span>&nbsp;&nbsp;Stellar.org</a>
         <span class="siteFooter__list__sep">|</span>
         <a class="siteFooter__list__item" href="{{pathPrefix}}/">Developers</a>
-        <a class="siteFooter__list__item" href="{{pathPrefix}}/stellar-core/learn/admin.html">Run a node</a>
-        <a class="siteFooter__list__item" href="https://github.com/stellar/docs/blob/master/other/things-to-build.md">Build an app</a>
+        <a class="siteFooter__list__item" href="{{pathPrefix}}/stellar-core/software/admin.html">Run a node</a>
+        <a class="siteFooter__list__item" href="{{pathPrefix}}/guides/things-to-build.html">Build an app</a>
         <a class="siteFooter__list__item" href="https://github.com/stellar/">GitHub</a>
         <a class="siteFooter__list__item" href="http://slack.stellar.org/">Community chat</a>
       </div>

diff --git a/partials/guides/sidebar.handlebars b/partials/guides/sidebar.handlebars
@@ -0,0 +1,17 @@
+<div class="siteSidebar pageNavListBounder">
+  <div class="mainSidebar">
+    <ul class="pageNavList">
+      {{#sidebarSubMenu "Get Started" numbered="true" }}
+        {{>sidebarSubItems glob="guides/get-started/index.html"}}
+        {{>sidebarSubItems glob="guides/get-started/!(index).html"}}
+      {{/sidebarSubMenu}}
+
+      {{>sidebarSubMenu title="Concepts" glob="guides/concepts/*.html"}}
+
+      {{>sidebarSubItems glob="guides/anchor.html"}}
+      {{>sidebarSubItems glob="guides/exchange.html"}}
+      {{>sidebarSubItems glob="guides/!(index|contributing|anchor|exchange).html"}}
+      {{>sidebarSubItems glob="guides/contributing.html"}}
+    </ul>
+  </div>
+</div>
diff --git a/partials/header-centered.handlebars b/partials/header-centered.handlebars
@@ -1,6 +1,6 @@
-<div class="so-back">
+<div class="so-back header2016Back">
   <div class="so-chunk">
-    <div class="header2016">
+    <div class="header2016 header2016--centered">
       <div class="header2016__logo">
         <div class="so-siteHeader">
           {{> siteLogo }}

diff --git a/partials/learn/sidebar.handlebars b/partials/learn/sidebar.handlebars
diff --git a/partials/mainNavMenu.handlebars b/partials/mainNavMenu.handlebars
@@ -1,4 +1,4 @@
-{{> mainNavMenu/item href="/learn/" text="Learn" sectionFilter="learn"}}
-{{> mainNavMenu/item href="/reference/" text="Reference" sectionFilter="reference"}}
+{{> mainNavMenu/item href="/guides/" text="Guides" sectionFilter="guides"}}
+{{> mainNavMenu/item href="/reference/" text="API Reference" sectionFilter="reference"}}
+{{> mainNavMenu/item href="/software/" text="Software" sectionFilter="software"}}
 {{> mainNavMenu/item href="/tools/" text="Tools" sectionFilter="tools"}}
-{{> mainNavMenu/item href="/beyond-code/" text="Beyond Code" sectionFilter="beyond-code"}}
diff --git a/partials/modules/dev-newsletter.handlebars b/partials/modules/dev-newsletter.handlebars
@@ -2,5 +2,5 @@
   <span class="mailSignup__title">Get developer updates:</span>
   <input type="email" value="" name="EMAIL" class="mailSignup__input" style="border-radius: 3px; " placeholder="email address" required="">
   <div style="position: absolute; left: -5000px;"><input type="text" name="b_c001d97369b7a10d224c23867_c77c979e43" tabindex="-1" value=""></div>
-  <input type="submit" value="Sign up" name="subscribe" class="s-button mailSignup__submit">
+  <input type="submit" value="Sign up" name="subscribe" class="s-button mailSignup__submit spu-textUppercase">
 </form>
diff --git a/partials/modules/friendbot4.handlebars b/partials/modules/friendbot4.handlebars
@@ -69,7 +69,7 @@
       <br>
       <span class="js-friendbot4-step4-seed"></span>
     </p>
-    <p class="friendbot4-stepOutro">Explore more of the <a href="{{pathPrefix}}/learn/" target="_blank">Stellar ecosystem</a>.</p>
+    <p class="friendbot4-stepOutro">Explore more of the <a href="{{pathPrefix}}/guides/" target="_blank">Stellar ecosystem</a>.</p>
   </div>
   <div class="friendbot4-initialHide js-friendbot4__navWrapper">
     <nav class="friendbot4__nav">

diff --git a/partials/reference/sidebar.handlebars b/partials/reference/sidebar.handlebars
@@ -2,10 +2,29 @@
   <div class="mainSidebar">
     <ul class="pageNavList">
 
-      {{>sidebarSubItems glob="horizon/reference/*.html"}}
+      {{#sidebarSubMenu "REST API" collapsible=true}}
+        {{>sidebarSubItems glob="horizon/reference/index.html"}}
+        {{>sidebarSubItems glob="horizon/reference/!(index).html"}}
+        {{>sidebarSubMenu title="Tutorials" glob="horizon/reference/tutorials/*.html"}}
+        {{>sidebarSubMenu title="Endpoints" glob="horizon/reference/endpoints/*.html"}}
+        {{>sidebarSubMenu title="Resources" glob="horizon/reference/resources/*.html"}}
+        {{>sidebarSubMenu title="Errors" glob="horizon/reference/errors/*.html"}}
+      {{/sidebarSubMenu}}
 
-      {{>sidebarSubMenu title="Resources" glob="horizon/reference/resources/*.html"}}
-      {{>sidebarSubMenu title="Errors" glob="horizon/reference/errors/*.html"}}
+      {{#sidebarSubMenu "JavaScript SDK" collapsible=true}}
+        {{>sidebarSubItems glob="js-stellar-sdk/reference/index.html"}}
+        {{>sidebarSubItems glob="js-stellar-base/reference/*.html"}}
+        {{>sidebarSubItems glob="js-stellar-sdk/reference/!(index).html"}}
+        <li class="pageNavList__item"><a href="https://stellar.github.io/js-stellar-sdk/" target="_blank">API Reference <span class="icon-faSvg icon-faSvg--small icon-faSvg-external-neutral5"></span></a></a></li>
+      {{/sidebarSubMenu}}
+
+      {{! FIXME: these should be info pages rather than raw links to Github }}
+      {{! e.g. >sidebarSubItems glob="java-stellar-sdk/guides/index.html"}}
+      <li class="pageNavList__item"><a href="https://github.com/stellar/java-stellar-sdk" target="_blank">Java SDK <span class="icon-faSvg icon-faSvg--small icon-faSvg-external-neutral5"></span></a></a></li>
+      <li class="pageNavList__item"><a href="https://github.com/stellar/go-stellar-base" target="_blank">Go SDK <span class="icon-faSvg icon-faSvg--small icon-faSvg-external-neutral5"></span></a></a></li>
+      <li class="pageNavList__item"><a href="https://github.com/stellar/ruby-stellar-sdk" target="_blank">Ruby SDK <span class="icon-faSvg icon-faSvg--small icon-faSvg-external-neutral5"></span></a></a></li>
+      <li class="pageNavList__item"><a href="https://github.com/StellarCN/py-stellar-base" target="_blank">Python SDK <span class="icon-faSvg icon-faSvg--small icon-faSvg-external-neutral5"></span></a></a></li>
+      <li class="pageNavList__item"><a href="https://github.com/QuantozTechnology/csharp-stellar-base" target="_blank">C# SDK <span class="icon-faSvg icon-faSvg--small icon-faSvg-external-neutral5"></span></a></a></li>
 
     </ul>
   </div>

diff --git a/partials/sidebarSubMenu.handlebars b/partials/sidebarSubMenu.handlebars
@@ -1,3 +1,3 @@
-{{#sidebarSubMenu title}}
+{{#sidebarSubMenu title collapsible=collapsible}}
   {{>sidebarSubItems glob=glob}}
 {{/sidebarSubMenu}}
diff --git a/partials/software/sidebar.handlebars b/partials/software/sidebar.handlebars
@@ -0,0 +1,15 @@
+<div class="siteSidebar pageNavListBounder">
+  <div class="mainSidebar">
+    <ul class="pageNavList">
+      {{#sidebarSubMenu "Stellar Core"}}
+        {{>sidebarSubItems glob="stellar-core/software/*.html"}}
+        {{>sidebarSubItems glob="stellar-core/software/*.pdf"}}
+      {{/sidebarSubMenu}}
+
+      <li class="pageNavList__item"><a href="https://github.com/stellar/federation">Federation Server</a></li>
+      <li class="pageNavList__item"><a href="https://github.com/stellar/bridge-server">Bridge Server</a></li>
+      <li class="pageNavList__item"><a href="https://github.com/stellar/archivist">Archivist</a></li>
+      <li class="pageNavList__item"><a href="https://github.com/stellar/horizon">Horizon</a></li>
+    </ul>
+  </div>
+</div>
diff --git a/partials/tools/sidebar.handlebars b/partials/tools/sidebar.handlebars
@@ -1,8 +1,13 @@
 <div class="siteSidebar pageNavListBounder">
   <div class="mainSidebar">
     <ul class="pageNavList">
-      <li class="pageNavList__item"><a href="https://www.stellar.org/laboratory/">Laboratory</a></li>
-      <li class="pageNavList__item"><a href="https://www.stellar.org/account-viewer/">Account Viewer</a></li>
+      {{#sidebarSubMenu "Tools" collapsible=false}}
+        <li class="pageNavList__item"><a href="https://www.stellar.org/laboratory/">Laboratory</a></li>
+      {{/sidebarSubMenu}}
+      {{#sidebarSubMenu "Sample Code" collapsible=false}}
+        <li class="pageNavList__item"><a href="https://github.com/stellar/account-viewer">Account Viewer</a></li>
+        <li class="pageNavList__item"><a href="https://github.com/stellar/stellar-sms-client">SMS Client</a></li>
+      {{/sidebarSubMenu}}
     </ul>
   </div>
 </div>
diff --git a/src/guides b/src/guides
@@ -0,0 +1 @@
+../repos/docs/guides
diff --git a/src/images/previews/landing-2.png b/src/images/previews/landing-2.png