_includes: merge links.html to navbar.html

1 files changed, 9 insertions, 3 deletions

diff --git a/_includes/navbar.html b/_includes/navbar.html
index f052baa..517c9a6 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -11,9 +11,15 @@
     </div>
     <div class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
-        {% assign page_list = site.pages %}
-        {% assign group = 'navigation' %}
-        {% include links.html %}
+        {% for node in site.pages %}
+          {% if node.group contains 'navbar' %}
+            {% if page.url == node.url %}
+              <li class="active"><a href="{{ site.baseurl }}{{ node.url }}" class="active">{{ node.navbar_link }}</a></li>
+            {% else %}
+              <li><a href="{{ site.baseurl }}{{ node.url }}">{{ node.navbar_link }}</a></li>
+            {% endif %}
+          {% endif %}
+        {% endfor %}
       </ul>
     </div>
   </div>