_includes: merge links.html to navbar.html

4 files changed, 13 insertions, 16 deletions

diff --git a/_includes/links.html b/_includes/links.html
deleted file mode 100644
index ddab348..0000000
--- a/_includes/links.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% for node in page_list %}
-  {% if group == null or group == node.group %}
-    {% 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 %}
-{% assign page_list = nil %}
-{% assign group = nil %}
diff --git a/_includes/navbar.html b/_includes/navbar.html
index f052baa..d763c3e 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.groups 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>
diff --git a/index.html b/index.html
index a1aae21..8bedd3f 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,8 @@
 ---
 title: Main page
 layout: main
-group: "navigation"
+groups:
+  - navbar
 navbar_link: <span class="glyphicon glyphicon-home"></span>&nbsp;Main page
 ---
 {% if site.posts.size == 0 %}
diff --git a/plots.html b/plots.html
index e0b19cb..a91a7a6 100644
--- a/plots.html
+++ b/plots.html
@@ -1,7 +1,8 @@
 ---
 title: Plots
 layout: plots
-group: "navigation"
+groups:
+  - navbar
 navbar_link: <span class="glyphicon glyphicon-th-large"></span>&nbsp;Plots
 ---
 <h1>Plots</h1>