Merge pull request #504 from jupyter/nav-links

Trimmed nav logic to fix active state bug and reduce code

Author: palewire

_data/nav.yml

@@ -1,13 +1,16 @@
 head:
     - title: Install
       url: /install
-    - About Us
+    - title: About Us
+      url: /about
     - title: Get Involved
       url: /community
     - title: Events
       url: /events
-    - Documentation
-    - Widgets
+    - title: Documentation
+      url: /documentation
+    - title: Widgets
+      url: /widgets
     - title: News
       url: https://blog.jupyter.org
       newpage: true

_includes/header.html

@@ -24,34 +24,16 @@
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
                     {%- for nav in site.data.nav.head -%}
-                      {%- if nav.url %}
-                               <li>
-                                 {%- if nav.newpage %}
-                                 <a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank" rel="noopener noreferrer">{{nav.title}}</a>
-                                 {%- else %}
-                                 <a href="{{site.baseurl}}{{nav.url}}" class="tab">{{nav.title}}</a>
-                                 {%- endif %}
-                               </li>
-                      {%- else -%}
-                        {%- for targetpage in site.pages %}
-                           {%- if nav contains targetpage.title -%}
-                              {%- if page.title == targetpage.title %}
-                               <li>
-                                   <a href="{{site.baseurl}}{{targetpage.url}}" class="tab navbar-active">{{targetpage.title}}</a>
-                               </li>
-                               {%- else %}
-                               <li>
-                                   <a href="{{site.baseurl}}{{targetpage.url}}" class="tab">{{targetpage.title}}</a>
-                               </li>
-                               {%- endif -%}
-                           {%- endif -%}
-                           {%- endfor -%}
-                      {%- endif -%}
+                    <li>
+                        <a href="{{nav.url}}"
+                           {%- if nav.newpage %}target="_blank" rel="noopener noreferrer"{% endif %}
+                           class="tab {% if nav.url == page.url %}navbar-active{% endif %}">
+                           {{nav.title}}
+                       </a>
+                    </li>
                     {%- endfor %}
                 </ul>
             </div>
-            <!-- /.navbar-collapse -->
         </div>
-        <!-- /.container -->
     </div>
 </nav>