Merge pull request #2 from nkuttler/nkuttler

Various updates to the site | I'll just merge since it seems sensible and I don't know of a way to preview the content before applying the PR. (let me know if you know how)

4 files changed, 56 insertions, 5 deletions

diff --git a/_includes/footer.html b/_includes/footer.html
index 59bbbd4..2cdbf6f 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1 +1,10 @@
-<script src="/assets/js/bootstrap.min.js"></script>
+<footer class="container">
+    <div class="col-lg-12">
+        <p class="text-center">
+            All the content of this site is copyright ©
+            2000-{{ 'now' | date: "%Y" }}
+            <a href="http://irssi.org">The Irssi project</a>.
+        </p>
+    </div>
+</footer>
+<script src="/assets/js/irssi.js"></script>
diff --git a/_includes/header.html b/_includes/header.html
index 8363b10..e902722 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,20 +1,38 @@
 <nav class="navbar navbar-inverse navbar-fixed-top">
     <div class="container">
         <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+            <button type="button" class="navbar-toggle" id="navbar-toggle">
                 <span class="sr-only">Toggle navigation</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">
+            <a class="navbar-brand" href="/">
                 <img alt="Irssi Logo" class="navbar-irssi-logo" src="/assets/logo.png">
-                {{ site.title }}
+                {% comment %}{{ site.title }}{% endcomment %}
             </a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li class="active"><a href="/">Home</a></li>
+                <li{% if page.url == "/index.html" %} class="active"{% endif %}><a href="/">News</a></li>
+                {% comment %}
+                    Exclude the news feed and the paginated news pages.
+                {% endcomment %}
+                {% for node in site.pages %}
+                    {% if node.title != "News" and node.title != "News Feed" %}
+                        {% if page.url == node.url %}
+                            <li class="active">
+                                <a href="{{ node.url }}" class="active">{{ node.title }}</a>
+                            </li>
+                        {% else %}
+                            <li>
+                                <a href="{{ node.url }}">{{ node.title }}</a>
+                            </li>
+                        {% endif %}
+                    {% endif %}
+                {% endfor %}
+                <li><a href="http://scripts.irssi.org/">Scripts</a></li>
+                <li><a href="https://github.com/irssi/irssi/issues">Bugs</a></li>
             </ul>
         </div>
     </div>
diff --git a/_includes/ordinal.html b/_includes/ordinal.html
new file mode 100644
index 0000000..c942963
--- /dev/null
+++ b/_includes/ordinal.html
@@ -0,0 +1,5 @@
+{% assign ordinalize=include.ordinalize %}
+{% if ordinalize == "1" or ordinalize == "21" or ordinalize == "31" %}st
+{% elsif ordinalize == "2" or ordinalize == "22" %}nd
+{% elsif ordinalize == "3" or ordinalize == "23" %}rd
+{% else %}th{% endif %}
diff --git a/_includes/postmeta.html b/_includes/postmeta.html
new file mode 100644
index 0000000..d71b943
--- /dev/null
+++ b/_includes/postmeta.html
@@ -0,0 +1,19 @@
+{% assign node=include.node %}
+<p>
+    <small>
+        Posted by
+        {% if node.web %}
+            <a href="{{ node.web }}">{{ node.author }}</a>
+        {% elsif node.email %}
+            <a href="mailto:{{ node.email }}">{{ node.author }}</a>
+        {% else %}
+            {{ node.author }}
+        {% endif %}
+
+        {% if node.date %}
+            {% assign ordinalize = node.date | date: "%-d" %}
+            on {{ node.date | date: "%B %-d" }}<sup>{% include ordinal.html ordinalize=ordinalize %}</sup>
+            {{ node.date | date: "%Y" }}
+        {% endif %}
+    </small>
+</p>