refactor: Split nav links into an include

riboseinc · Sep 4, 2018 · 4e7dc1c · 4e7dc1c
1 parent 86a8060
commit 4e7dc1c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/_includes/nav-links.html b/_includes/nav-links.html
@@ -0,0 +1,32 @@
+{% include nav-page-link.html url="/" title="Home" %}
+{% assign contact_link = "mailto:" | append: site.contact_email %}
+
+{% if site.is_hub %}
+  {% include nav-page-link.html url="/projects/" title="Open Projects" %}
+
+  {% if site.num_all_software > 0 %}
+    {% include nav-page-link.html url="/software/" title="Software" active_for_nested=true %}
+  {% endif %}
+  {% if site.num_all_specs > 0 %}
+    {% include nav-page-link.html url="/specs/" title="Specifications" active_for_nested=true %}
+  {% endif %}
+  {% if site.num_posts_combined > 0 %}
+    {% include nav-page-link.html url="/blog/" title="Blog" active_for_nested=true %}
+  {% endif %}
+
+{% else %}
+  {% if site.num_all_software > 0 %}
+    {% include nav-page-link.html url="/software/" title="Software" active_for_nested=true %}
+  {% endif %}
+  {% if site.num_all_specs > 0 %}
+    {% include nav-page-link.html url="/specs/" title="Specifications" active_for_nested=true %}
+  {% endif %}
+
+  {% include project-nav.html %}
+
+  {% if site.num_posts_combined > 0 %}
+    {% include nav-page-link.html url="/blog/" title="Blog" active_for_nested=true %}
+  {% endif %}
+
+  {% include nav-page-link.html url=contact_link title="Contact" %}
+{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -19,38 +19,7 @@
     <header>
       <h1 class="site-logo"><a href="/">{% include logo.html %}</a></h1>
       <nav>
-        {% include nav-page-link.html url="/" title="Home" %}
-        {% assign contact_link = "mailto:" | append: site.contact_email %}
-
-        {% if site.is_hub %}
-          {% include nav-page-link.html url="/projects/" title="Open Projects" %}
-
-          {% if site.num_all_software > 0 %}
-            {% include nav-page-link.html url="/software/" title="Software" active_for_nested=true %}
-          {% endif %}
-          {% if site.num_all_specs > 0 %}
-            {% include nav-page-link.html url="/specs/" title="Specifications" active_for_nested=true %}
-          {% endif %}
-          {% if site.num_posts_combined > 0 %}
-            {% include nav-page-link.html url="/blog/" title="Blog" active_for_nested=true %}
-          {% endif %}
-
-        {% else %}
-          {% if site.num_all_software > 0 %}
-            {% include nav-page-link.html url="/software/" title="Software" active_for_nested=true %}
-          {% endif %}
-          {% if site.num_all_specs > 0 %}
-            {% include nav-page-link.html url="/specs/" title="Specifications" active_for_nested=true %}
-          {% endif %}
-
-          {% include project-nav.html %}
-
-          {% if site.num_posts_combined > 0 %}
-            {% include nav-page-link.html url="/blog/" title="Blog" active_for_nested=true %}
-          {% endif %}
-
-          {% include nav-page-link.html url=contact_link title="Contact" %}
-        {% endif %}
+        {% include nav-links.html %}
       </nav>
       {% include social-links.html %}
     </header>