From e94153fad462c658319974f068143053afdb323a Mon Sep 17 00:00:00 2001
From: Brandon Curtis <brandon.curtis@gmail.com>
Date: Thu, 17 Aug 2017 20:17:38 -0700
Subject: [PATCH 1/2] normalize navbar template

1) move Reference to Extras dropdown
2) add 'improve this page' button
---
 _includes/navbar.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/_includes/navbar.html b/_includes/navbar.html
index 0f82958..d42b532 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -51,7 +51,6 @@
 	{% comment %} Show setup instructions, reference guide, and lesson episodes for lessons. {% endcomment %}
         {% if site.kind == "lesson" %}
         <li><a href="{{ page.root }}/setup/{{ site.index }}">Setup</a></li>
-        <li><a href="{{ page.root }}/reference/{{ site.index }}">Reference</a></li>
         <li class="dropdown">
           <a href="{{ page.root }}/{{ site.index }}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>
           <ul class="dropdown-menu">
@@ -67,6 +66,7 @@
         <li class="dropdown">
           <a href="{{ page.root }}/{{ site.index }}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>
           <ul class="dropdown-menu">
+	    <li><a href="{{ page.root }}/reference/{{ site.index }}">Reference</a></li>
             {% for extra in site.extras %}
             <li><a href="{{ page.root }}{{ extra.url }}{{ site.index }}">{{ extra.title }}</a></li>
             {% endfor %}
@@ -76,6 +76,13 @@
 
 	{% comment %} Always show license. {% endcomment %}
         <li><a href="{{ page.root }}/license/{{ site.index }}">License</a></li>
+	{% if page.source %}
+	{% if page.source == "Rmd" %}
+	<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>
+	{% endif %}
+	{% else %}
+	<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>
+	{% endif %}
       </ul>
       <form class="navbar-form navbar-right" role="search" id="search" onsubmit="google_search(); return false;">
         <div class="form-group">

From 43b369bbc3991b16f75e20c574bc0390d6f17097 Mon Sep 17 00:00:00 2001
From: Brandon Curtis <brandon.curtis@gmail.com>
Date: Thu, 17 Aug 2017 20:28:49 -0700
Subject: [PATCH 2/2] add all-in-one link to Episodes dropdown

---
 _includes/navbar.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_includes/navbar.html b/_includes/navbar.html
index d42b532..13e7e58 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -57,6 +57,8 @@
             {% for episode in site.episodes %}
             <li><a href="{{ page.root }}{{ episode.url }}{{ site.index }}">{{ episode.title }}</a></li>
             {% endfor %}
+	    <li role="separator" class="divider"></li>
+            <li><a href="{{ page.root }}/aio/{{ site.index }}">All in one page (Beta)</a></li>
           </ul>
         </li>
 	{% endif %}