Replace includes

alexandermukhin · Jan 3, 2017 · 4d13167 · 4d13167
1 parent 9f87d4a
commit 4d13167
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 44 deletions.
diff --git a/_includes/footer-links.html b/_includes/footer-links.html
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1 +1,17 @@
-Powered by <a href="http://jekyllrb.com" target="_blank">Jekyll</a>
+<footer class="main-footer">
+    <div class="wc-container">  
+        <div class="column one">
+            <h6>Few more links</h6>
+            <ul class="menu">
+                <li><a href="{{ '/about' | prepend: site.baseurl | prepend: site.url }}">About</a></li>
+                <li><a href="{{ '/blog' | prepend: site.baseurl | prepend: site.url }}">Blog</a></li>
+            </ul>                    
+        </div>
+        <div class="column two">
+            {% include social.html %}
+        </div>
+    </div>
+    <p class="wc-container disclaimer">
+        Powered by <a href="http://jekyllrb.com" target="_blank">Jekyll</a>
+    </p>
+</footer>
diff --git a/_includes/header-links.html b/_includes/header-links.html
diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,13 @@
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>{% if page.title %}{{ page.title }}{% else %}{{ site.positive.name }}{% endif %}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">        
+    <meta name="description" content="{% if page.meta_description %}{{ page.meta_description }}{% else %}{{ site.positive.meta_description }}{% endif %}">
+
+    <!-- Canonical url (https://support.google.com/webmasters/answer/139066) -->
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+
+    <!-- Main CSS File (compiled from _sass forder) -->
+    <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/assets/css/main.css">
+</head>
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -0,0 +1,13 @@
+<header class="main-header">
+    <div class="wc-container">
+        <h1><a href="{{ site.baseurl }}/">{{ site.positive.name }}</a></h1>
+        <ul>
+            <li>
+                <a href="{{ '/about' | prepend: site.baseurl | prepend: site.url }}">About</a><span>/</span>
+            </li>
+            <li>
+                <a href="{{ '/blog' | prepend: site.baseurl | prepend: site.url }}">Blog</a><span>/</span>
+            </li>
+        </ul>               
+    </div>
+</header>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,37 +1,12 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>{% if page.title %}{{ page.title }}{% else %}{{ site.positive.name }}{% endif %}</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1">        
-        <meta name="description" content="{% if page.meta_description %}{{ page.meta_description }}{% else %}{{ site.positive.meta_description }}{% endif %}">
-        <link rel="canonical" 
-        href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-
-        <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/assets/css/main.css">
-    </head>
+    {% include header.html %}
     <body>
-        <header class="main-header">
-            <div class="wc-container">
-                <h1><a href="{{ site.baseurl }}/">{{ site.positive.name }}</a></h1>
-                {% include header-links.html %}                
-            </div>
-        </header>
+        {% include navigation.html %}
+
         {{ content }}
-        <footer class="main-footer">
-            <div class="wc-container">
-                <div class="column one">
-                    {% include footer-links.html %}                    
-                </div>
-                <div class="column two">
-                    {% include social.html %}
-                </div>
-            </div>
-            <p class="wc-container disclaimer">
-                {% include footer.html %}
-            </p>
-        </footer>
+
+        {% include footer.html %}        
         <script type="text/javascript">
           /* To avoid render blocking css */
           var cb = function() {