From 58400dd4ebd57c6fb7845c6cee1a5c44e1761634 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 7 Dec 2017 15:53:18 -0500
Subject: [PATCH] Update navigation  - Simplify nav header  - Use index for
 main Dev Doc page (instead of separate page)

---
 _includes/layout/base/breadcrumbs.html |  2 +-
 _includes/layout/base/head-menu.html   | 18 ++++++++----
 _includes/templates/index.html         | 38 ++++++++++++++++----------
 _translations/en.yml                   |  8 ++++--
 en/developer-examples.md               |  2 +-
 en/developer-guide.md                  |  2 +-
 en/developer-reference.md              |  2 +-
 7 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/_includes/layout/base/breadcrumbs.html b/_includes/layout/base/breadcrumbs.html
index cdf0ec17..e3deae96 100644
--- a/_includes/layout/base/breadcrumbs.html
+++ b/_includes/layout/base/breadcrumbs.html
@@ -30,7 +30,7 @@ http://opensource.org/licenses/MIT.
 
         {% when "dash" %}<a href="/{{page.lang}}/">{% translate dash vocabulary %}</a>
 
-        {% when "dev docs" %}<a href="/en/developer-documentation">Developer Documentation</a>
+        {% when "dev docs" %}<a href="/en/">Developer Documentation</a>
         {% when "glossary" %}<a href="/en/developer-glossary">Glossary</a>
         {% else %}{% die "Breadcrumb not found in _includes/layout/breadcrumbs.html" %}
       {% endcase %}
diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html
index dd324bbb..85e3d55d 100644
--- a/_includes/layout/base/head-menu.html
+++ b/_includes/layout/base/head-menu.html
@@ -4,15 +4,23 @@ http://opensource.org/licenses/MIT.
 {% endcomment %}
 
 <ul id="menusimple" class="menusimple menumain" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
-  <li><a>{% translate menu-intro layout %}</a>
+  <li{% if page.id == 'bitcoin-for-developers' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-developers url %}">{% translate menu-bitcoin-for-developers layout %}</a></li>
+  <!--{% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}-->
+
+  <li><a>{% translate menu-documentation layout %}</a>
     <ul>
       <!--
       <li{% if page.id == 'bitcoin-for-individuals' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-individuals url %}">{% translate menu-bitcoin-for-individuals layout %}</a></li>
       <li{% if page.id == 'bitcoin-for-businesses' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-businesses url %}">{% translate menu-bitcoin-for-businesses layout %}</a></li>
-      -->
+
       <li{% if page.id == 'bitcoin-for-developers' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-developers url %}">{% translate menu-bitcoin-for-developers layout %}</a></li>
-      <li{% if page.id == 'getting-started' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate getting-started url %}">{% translate menu-getting-started layout %}</a></li>
+      -->
+      {% if page.lang == 'en' %}<li{% if page.id == 'developer-guide' %} class="active"{% endif %}><a href="/en/developer-guide">Guide</a></li>{% endif %}
+      {% if page.lang == 'en' %}<li{% if page.id == 'developer-reference' %} class="active"{% endif %}><a href="/en/developer-reference">Reference</a></li>{% endif %}
+      {% if page.lang == 'en' %}<li{% if page.id == 'developer-glossary' %} class="active"{% endif %}><a href="/en/developer-glossary">Glossary</a></li>{% endif %}
+
       <!--
+      <li{% if page.id == 'getting-started' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate getting-started url %}">{% translate menu-getting-started layout %}</a></li>
       <li{% if page.id == 'how-it-works' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate how-it-works url %}">{% translate menu-how-it-works layout %}</a></li>
       <li{% if page.id == 'you-need-to-know' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate you-need-to-know url %}">{% translate menu-you-need-to-know layout %}</a></li>
     -->
@@ -25,7 +33,7 @@ http://opensource.org/licenses/MIT.
       <li{% if page.id == 'community' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate community url %}">{% translate menu-community layout %}</a></li>
       -->
       <li{% if page.id == 'community' %} class="active"{% endif %}><a href="https://www.dash.org/community/">{% translate menu-community layout %}</a></li>
-      {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
+      <!-- {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %} -->
       <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
       <!--
       <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
@@ -37,7 +45,7 @@ http://opensource.org/licenses/MIT.
     -->
     </ul>
   </li>
-  <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
+  <!-- <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li> -->
   <!--
   <li><a>{% translate menu-participate layout %}</a>
     <ul>
diff --git a/_includes/templates/index.html b/_includes/templates/index.html
index be5ee970..26edfa7d 100644
--- a/_includes/templates/index.html
+++ b/_includes/templates/index.html
@@ -14,7 +14,7 @@ http://opensource.org/licenses/MIT.
 <div class="docreference">
 <a href="/en/developer-guide"><span class="fa fa-info-circle fa-2x"></span><span>Guide</span></a>
 <a href="/en/developer-reference"><span class="fa fa-book fa-2x"></span><span>Reference</span></a>
-<a href="/en/developer-examples"><span class="fa fa-code fa-2x"></span><span>Examples</span></a>
+<!-- <a href="/en/developer-examples"><span class="fa fa-code fa-2x"></span><span>Examples</span></a> -->
 <a href="/en/developer-glossary"><span class="fa fa-font fa-2x"></span><span>Glossary</span></a>
 </div>
 
@@ -27,7 +27,7 @@ http://opensource.org/licenses/MIT.
       <h2 id="transactions"><span class="fa fa-exchange fa-lg"></span> Transactions</h2>
       <p><a href="/en/developer-guide#transactions">Transactions Guide</a></p>
       <p><a href="/en/developer-reference#transactions">Transactions Reference</a></p>
-      <p><a href="/en/developer-examples#transactions">Transaction Examples</a></p>
+      <!-- <p><a href="/en/developer-examples#transactions">Transaction Examples</a></p> -->
     </div>
   </div>
   <div>
@@ -35,24 +35,30 @@ http://opensource.org/licenses/MIT.
       <h2 id="p2p-network"><span class="fa fa-share-alt fa-lg"></span> P2P Network</h2>
       <p><a href="/en/developer-guide#p2p-network">P2P Network Guide</a></p>
       <p><a href="/en/developer-reference#p2p-network">P2P Network Reference</a></p>
-      <p><a href="/en/developer-examples#p2p-network">P2P Network Examples</a></p>
+      <!-- <p><a href="/en/developer-examples#p2p-network">P2P Network Examples</a></p> -->
       <!--<p><a href="https://en.bitcoin.it/wiki/Protocol_specification"><span class="fa fa-external-link"></span> Full Protocol Specification</a> - Wiki</p>-->
     </div><div>
+      <h2 id="contracts"><span class="fa fa-sitemap fa-lg fa-rotate-270"></span> Dash Features</h2>
+      <!-- <p><a href="/en/developer-guide#contracts">Contracts Guide</a></p> -->
+
+      <p><a href="/en/developer-guide#instantsend">InstantSend Guide</a></p>
+      <p><a href="/en/developer-guide#privatesend">PrivateSend Guide</a></p>
+      <p><a href="/en/developer-guide#masternode-payment">Masternode Payment Guide</a></p>
+      <p><a href="/en/developer-guide#masternode-sync">Masternode Sync Guide</a></p>
+      <p><a href="/en/developer-guide#governance">Governance Guide</a></p>
+      <!--
+      <p><a href="https://en.bitcoin.it/wiki/Contracts"><span class="fa fa-external-link"></span> More Contracts</a> - Wiki</p>
+      <p><a href="https://bitcoinj.github.io/working-with-micropayments"><span class="fa fa-external-link"></span> Micropayment Channel Example</a> - bitcoinj</p>
+      -->
+    </div>
+  </div>
+  <div>
+    <div>
       <h2 id="wallets"><span class="fa fa-btc fa-lg"></span> Wallets</h2>
       <p><a href="/en/developer-guide#wallets">Wallets Guide</a></p>
       <p><a href="/en/developer-reference#wallets">Wallets Reference</a></p>
       <p><a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki"><span class="fa fa-external-link"></span> HD Wallets</a> - BIP32</p>
       <p><a href="https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki"><span class="fa fa-external-link"></span> Mnemonic Code</a> - BIP39</p>
-    </div>
-  </div>
-  <div>
-    <div>
-      <h2 id="contracts"><span class="fa fa-sitemap fa-lg fa-rotate-270"></span> Contracts</h2>
-      <p><a href="/en/developer-guide#contracts">Contracts Guide</a></p>
-      <!--
-      <p><a href="https://en.bitcoin.it/wiki/Contracts"><span class="fa fa-external-link"></span> More Contracts</a> - Wiki</p>
-      <p><a href="https://bitcoinj.github.io/working-with-micropayments"><span class="fa fa-external-link"></span> Micropayment Channel Example</a> - bitcoinj</p>
-      -->
     </div><div>
       <h2 id="operating_modes"><span class="fa fa-cogs fa-lg"></span> Operating Modes</h2>
       <p><a href="/en/developer-guide#operating-modes">Operating Modes Guide</a></p>
@@ -63,8 +69,9 @@ http://opensource.org/licenses/MIT.
       <h2 id="payment-processing"><span class="fa fa-cart-plus fa-lg"></span> Payment Processing</h2>
       <!--
       <p><a href="/en/developer-guide#payment-processing">Payment Processing Guide</a></p>
-      -->
       <p><a href="/en/developer-examples#payment-processing">Payment Processing Examples</a></p>
+      -->
+      <p><a href="https://dashpay.atlassian.net/wiki/spaces/DOC/pages/86278547/Dash+Payment+Processor"><span class="fa fa-external-link"></span> Dash Payment Processor</a></p>
       <p><a href="https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki"><span class="fa fa-external-link"></span> Payment Protocol</a> - BIP70</p>
     </div><div>
       <h2 id="mining"><span class="fa fa-puzzle-piece fa-lg"></span> Mining</h2>
@@ -82,12 +89,13 @@ http://opensource.org/licenses/MIT.
   <p><a href="https://dashpay.atlassian.net/wiki/spaces/DOC/pages"><span class="fa fa-external-link"></span> Dash Official Documentation</a> - Wiki</p>
   <p><a href="/en/bitcoin-paper"><span class="fa fa-external-link"></span> Bitcoin: A Peer-to-Peer Electronic Cash System</a> - Satoshi Nakamoto</p>
   <p><a href="https://github.com/bitcoin/bips#readme"><span class="fa fa-external-link"></span> Bitcoin Improvement Proposals</a> - GitHub</p>
+
+  <p><a href="https://www.blockcypher.com/dev/dash/"><span class="fa fa-external-link"></span> BlockCypher </a> - RESTful JSON API for blockchains</p>
   <!--<p><a href="https://github.com/minium/Bitcoin-Spec"><span class="fa fa-external-link"></span> Bitcoin Developer Reference (working paper)</a> - Krzysztof Okupski</p>-->
   <!--<p><a href="https://bitcoinj.github.io/#documentation"><span class="fa fa-external-link"></span> Bitcoinj Developer Documentation</a> - bitcoinj.org</p>-->
   <!--<p><a href="https://programmingblockchain.gitbooks.io/programmingblockchain/content/"><span class="fa fa-external-link"></span> The C# Bitcoin book (NBitcoin Developer Documentation)</a> - Nicolas Dorier</p>-->
 </div></div>
 
-
 <script src="/js/jquery/jquery-1.11.2.min.js"></script>
 <script src="/js/jquery/jquery-ui.min.js"></script>
 <script src="/js/devsearch.js"></script>
diff --git a/_translations/en.yml b/_translations/en.yml
index a808e228..66ef0d37 100644
--- a/_translations/en.yml
+++ b/_translations/en.yml
@@ -84,10 +84,11 @@ en:
       Most security is handled by the protocol, eliminating the need for
       PCI compliance. Fraud prevention can be simplified down to
       monitoring a single variable: the <a
-      href="#you-need-to-know##instant">confirmation score</a>. Beyond
+      href="#vocabulary##confirmation">confirmation count</a>. Beyond
       that, keeping
-      your Dash secure is mainly a matter of <a
-      href="#secure-your-wallet#">securing your wallet</a> and using
+      your Dash secure is mainly a matter of
+      securing your wallet
+      and using
       HTTPS or other secure protocols to send payment requests to customers.
 
     micro: "New payment possibilities"
@@ -871,6 +872,7 @@ en:
     menu-bitcoin-for-individuals: Individuals
     menu-community: Community
     menu-development: Development
+    menu-documentation: Documentation
     menu-events: Events
     menu-exchanges: Exchanges
     menu-faq: FAQ
diff --git a/en/developer-examples.md b/en/developer-examples.md
index d3676e75..73ec84be 100644
--- a/en/developer-examples.md
+++ b/en/developer-examples.md
@@ -27,7 +27,7 @@ end_of_page: |
 * Table of contents
 {:toc}
 
-<ul class="goback"><li><a href="/en/developer-documentation">Return To Overview</a></li></ul>
+<ul class="goback"><li><a href="/en">Return To Overview</a></li></ul>
 <ul class="reportissue"><li><a href="https://github.com/bitcoin-dot-org/bitcoin.org/issues/new" onmouseover="updateIssue(event);">Report An Issue</a></li></ul>
 <ul class="editsource"><li><a href="https://github.com/bitcoin-dot-org/bitcoin.org/tree/master/_includes" onmouseover="updateSource(event);">Edit On GitHub</a></li></ul>
 
diff --git a/en/developer-guide.md b/en/developer-guide.md
index 38859f6e..be7bc222 100644
--- a/en/developer-guide.md
+++ b/en/developer-guide.md
@@ -27,7 +27,7 @@ end_of_page: |
 * Table of contents
 {:toc}
 
-<ul class="goback"><li><a href="/en/developer-documentation">Return To Overview</a></li></ul>
+<ul class="goback"><li><a href="/en">Return To Overview</a></li></ul>
 <ul class="reportissue"><li><a href="https://github.com/thephez/dash.org/issues/new" onmouseover="updateIssue(event);">Report An Issue</a></li></ul>
 <ul class="editsource"><li><a href="https://github.com/thephez/dash.org/tree/master/_includes" onmouseover="updateSource(event);">Edit On GitHub</a></li></ul>
 
diff --git a/en/developer-reference.md b/en/developer-reference.md
index 6b93fce3..6abd1db8 100644
--- a/en/developer-reference.md
+++ b/en/developer-reference.md
@@ -29,7 +29,7 @@ end_of_page: |
 * Table of contents
 {:toc}
 
-<ul class="goback"><li><a href="/en/developer-documentation">Return To Overview</a></li></ul>
+<ul class="goback"><li><a href="/en">Return To Overview</a></li></ul>
 <ul class="reportissue"><li><a href="https://github.com/thephez/dash.org/issues/new" onmouseover="updateIssue(event);">Report An Issue</a></li></ul>
 <ul class="editsource"><li><a href="https://github.com/thephez/dash.org/tree/master/_includes" onmouseover="updateSource(event);">Edit On GitHub</a></li></ul>