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)

16 files changed, 185 insertions, 9 deletions

diff --git a/_articles/2015-02-12-adding-articles-to-irssi.org.markdown b/_articles/2015-02-12-adding-articles-to-irssi.org.markdown
new file mode 100644
index 0000000..ea6664d
--- /dev/null
+++ b/_articles/2015-02-12-adding-articles-to-irssi.org.markdown
@@ -0,0 +1,25 @@
+---
+layout: post
+title: "Contributing articles to irssi.org"
+author: "Nicolas Kuttler"
+email: "irssi@kuttler.eu"
+web: "http://kuttler.eu"
+---
+
+If you would like to contribute an article to [irssi.org](http://irssi.org)
+fork the [website's github repository](https://github.com/irssi/irssi.github.io)
+and add your article to the `_articles` directory.
+Use an existing article as template.
+
+If you like you can verify that your articles displays properly by installing
+[jekyll](http://jekyllrb.com) and running a command like
+`jekyll serve` inside the repository and connecting to
+`http://localhost:4000` with your web browser.
+
+TODO
+--
+
+- Make forking/git usage optional.
+- We could build a form with a [markdown editor](http://vuejs.org/examples/),
+  where should we submit it to though?
+- Policy for images and other included content?
diff --git a/_config.yml b/_config.yml
index f39f1c7..1df1331 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,3 +14,7 @@ email: staff@irssi.org
 
 paginate: 8
 paginate_path: "news/:num/"
+
+collections:
+  articles:
+    output: true
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>
diff --git a/_layouts/default.html b/_layouts/default.html
index 1ab31f9..887ef16 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -7,7 +7,17 @@
 
         <div class="page-content">
             <div class="container">
-                {{ content }}
+                <div class="col-xs-12 col-md-8">
+                    {{ content }}
+                </div>
+                <div class="col-xs-12 col-md-4">
+                    <h2>What's this?</h2>
+                    <p>
+                        You are visiting the official website for the IRC
+                        client Irssi, for more information see the about
+                        section.
+                    </p>
+                </div>
             </div>
         </div>
 
diff --git a/_layouts/home.html b/_layouts/home.html
index 9a2976a..81451b6 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -6,6 +6,7 @@ layout: default
 
 {% for post in paginator.posts %}
     <h2><a href="{{ post.url }}">{{ post.title }}</a></h2>
+    {% include postmeta.html node=post %}
     {{ post.content | markdownify }}
 {% endfor %}
 
diff --git a/_layouts/post.html b/_layouts/post.html
index aa390ea..8e1bfd0 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -2,5 +2,6 @@
 layout: default
 ---
 
-<h2>{{ page.title }}</h2>
-{{ page.content|markdownify }}
+<h1>{{ page.title }}</h1>
+{% include postmeta.html node=page %}
+{{ page.content | markdownify }}
diff --git a/_posts/2009-11-12-how-irc-should-look.markdown b/_posts/2009-11-12-how-irc-should-look.markdown
index 68fe3d2..cce0c6f 100644
--- a/_posts/2009-11-12-how-irc-should-look.markdown
+++ b/_posts/2009-11-12-how-irc-should-look.markdown
@@ -8,6 +8,6 @@ email: "ahf@irssi.org"
 It has been brought to our attention that we have done something completely
 wrong. This is what the upcoming Irssi release is going to look like:
 
-<object width="560" height="340"><param name="movie" value="http://www.youtube.com/v/O2rGTXHvPCQ&hl=en_US&fs=1&"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/O2rGTXHvPCQ&hl=en_US&fs=1&" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="560" height="340"></embed></object>
+<iframe width="560" height="315" src="https://www.youtube.com/embed/O2rGTXHvPCQ" frameborder="0" allowfullscreen></iframe>
 
 The Irssi Team.
diff --git a/about/index.markdown b/about/index.markdown
new file mode 100644
index 0000000..d3ce479
--- /dev/null
+++ b/about/index.markdown
@@ -0,0 +1,36 @@
+---
+layout: default
+title: About Irssi
+---
+
+About Irssi
+===========
+
+Introduction
+------------
+
+Irssi is a terminal based IRC client for UNIX systems. It also supports SILC and ICB protocols via plugins.
+
+### Greatest features
+You might be wondering what makes Irssi such an easy and comfortable client to use; Joost Vunderink wrote a summary of the most beneficial Irssi features.
+
+### Autologging
+Irssi will automatically log any channels, queries or special windows that you want. The logfiles will be separated per IRC network, and even log rotation is supported. Log file formats, themes and destination directories can be easily configured with the Irssi log settings.
+
+### Formats and themes
+Theming is a popular item in todays desktop enviroments, it's an easy yet powerful way to customize your Irssi client's look and feel. Irssi's formatting is modular which means you can just change the appearance of the objects and all items contaning that object will change into that format.
+
+### Configurable keybindings
+This feature is a piece of art; it allows you to modify the default keybindings and create your own so you can customize your client. If these keybindings are tuned, you can switch through the windows in no time, execute commands and even complete objects with these bindings.
+
+### Paste detection
+If you have ever pasted a bunchload of text into a wrong channel, you know how hard the consequences can be. Irssi tries to detect when you are pasting large amounts of text, by looking at the speed that characters are entered; if such pasting is detected [TAB]-characters are sent as-is instead of being tab-completed and eventually ending up in a wrong destination window. When Irssi detects such a pasting, you will get the option to either abort the paste or execute the paste, this way you have total control of the pasting.
+
+### Perl scripting
+Perl is one of the most used programming languages around the globe and integrating Perl into applications means flexible and powerful scripting capabilities. The entire behavior and appearence of Irssi can be modified within these Perl scripts. Irssi provides a script archive with many contributed Irssi scripts which provide both useful extra features and the required assistance to make your own scripts.
+
+### Irssi-proxy
+This is much more than just a bouncer, Irssi-proxy is a plugin which allows to bind a port to each IRC server you are connected to. This means that instead of having to remember to identify with a password, you can just connect to the Irssi-proxy with a server password. The copy of Irssi running the proxy works just as a normal client which you can use, but you can also connect one or more clients to it to share the connections. Using Irssi as a proxy has the major advantage of Irssi's power as an IRC client. You never have to worry about losing your connection to IRC. Even if you don't want to use Issi as a client, I can strongly recommend it as a proxy because you can just connect to it with any IRC client by just connecting to the specified port instead of SSH-ing to the machine that your Irssi is running on.
+
+### Upgrades
+Upgrading your Irssi client to the latest version can be easily done without losing the connections to the IRC servers and without restarting Irssi. You can use the UPGRADE command to load the new Irssi binary and restoring your connections.
diff --git a/articles/index.markdown b/articles/index.markdown
new file mode 100644
index 0000000..1f8c44f
--- /dev/null
+++ b/articles/index.markdown
@@ -0,0 +1,11 @@
+---
+title: Articles
+layout: default
+---
+
+Articles
+========
+
+{% for article in site.articles %}
+- [{{ article.title }}]({{ article.url }})
+{% endfor %}
diff --git a/assets/css/style.css b/assets/css/style.css
index a8fc8a1..9731f01 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1,3 +1,26 @@
 body {
     padding-top: 50px;
+    overflow-y: scroll;
+}
+
+
+/* This is for mobile devices and the size of the youtube video */
+iframe {
+    max-width: 100%;
+}
+
+/* Better color for linked headers */
+h1 a,
+h2 a,
+h3 a {
+    color: #333;
+}
+
+/* Position the irssi logo */
+.navbar-brand img {
+    margin-top: -14px;
+}
+
+footer {
+    margin-top: 20ex;
 }
diff --git a/assets/js/irssi.js b/assets/js/irssi.js
new file mode 100644
index 0000000..bd72a7e
--- /dev/null
+++ b/assets/js/irssi.js
@@ -0,0 +1,12 @@
+function initMenu() {
+    'use strict';
+    var toggle = document.getElementById("navbar-toggle"),
+        menu = document.getElementById("navbar");
+    toggle.addEventListener('click', function (event) {
+        menu.classList.toggle("collapse");
+    });
+}
+
+document.addEventListener("DOMContentLoaded", function(event) {
+    initMenu();
+});
diff --git a/atom.xml b/atom.xml
index fb3aa9e..3da40aa 100644
--- a/atom.xml
+++ b/atom.xml
@@ -1,5 +1,6 @@
 ---
 layout: nil
+title: News Feed
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
diff --git a/index.html b/index.html
index e4d427d..90a7dc7 100644
--- a/index.html
+++ b/index.html
@@ -1,3 +1,4 @@
 ---
 layout: home
+title: News
 ---