9 files changed, 107 insertions, 29 deletions

diff --git a/etc/nginx/site.conf b/etc/nginx/site.conf
index 90ceaea..eb8c5e8 100644
--- a/etc/nginx/site.conf
+++ b/etc/nginx/site.conf
@@ -68,6 +68,9 @@ server {
         location ^~ /taxonomy/term/2 {
                 return 301 /doc/presentation.html;
         }
+        location ~ ^/doc/release-notes/(.*)$ {
+                return 301 /news/release-$1;
+        }
         location ~ ^/(?:man.*|guidelines|extra-opts)$ {
                 return 301 /doc$request_uri.html;
         }
diff --git a/web/input/development.md b/web/input/development.md
index ddff634..9a1a72f 100644
--- a/web/input/development.md
+++ b/web/input/development.md
@@ -1,6 +1,6 @@
 title: Development
 parent: Home
-menu-position: 5
+menu: 6
 ---
 
 # Development
diff --git a/web/input/doc/index.md b/web/input/doc/index.md
index 7b2d098..8f22011 100644
--- a/web/input/doc/index.md
+++ b/web/input/doc/index.md
@@ -1,6 +1,6 @@
 title: Documentation
 parent: Home
-menu-position: 3
+menu: 4
 ---
 
 # Documentation
diff --git a/web/input/download.md b/web/input/download.md
index 4d46cf5..9c3d65b 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -1,6 +1,6 @@
 title: Download
 parent: Home
-menu-position: 2
+menu: 3
 ---
 
 # Download
diff --git a/web/input/index.md b/web/input/index.md
index 8ab186c..b860177 100644
--- a/web/input/index.md
+++ b/web/input/index.md
@@ -1,5 +1,5 @@
 title: Home
-menu-position: 1
+menu: 1
 ---
 
 # The Nagios Plugins Project
diff --git a/web/input/doc/release-notes/1-5.md b/web/input/news/release-1-5.md
index f68222f..58d0822 100644
--- a/web/input/doc/release-notes/1-5.md
+++ b/web/input/news/release-1-5.md
@@ -1,18 +1,14 @@
-title: Version 1.5
-parent: Download
-post: Version 1.5 Released
+title: Version 1.5 Released
 date: 2013-10-02
 ---
 
-# Version 1.5 Released
-
-*Wednesday, October 2, 2013*
-
 The Nagios Plugins Development Team is proud to announce version 1.5 of the
 Nagios Plugins!  This release comes with the new `check_dbi` plugin written by
 Sebastian Harl, and includes lots of enhancements and fixes provided by more
 than forty contributors.  Many thanks to all of you!
 
+<end-of-abstract>
+
 Special kudos go to Sven Nierlein for fixing numerous bugs, reviewing many
 pull requests, bringing our test suite back into shape, and setting up
 automated tests on a variety of platforms.  This helped us spotting lots of
diff --git a/web/input/resources/plugins.css b/web/input/resources/plugins.css
index 552284f..7b44e7a 100644
--- a/web/input/resources/plugins.css
+++ b/web/input/resources/plugins.css
@@ -132,3 +132,9 @@ div#breadcrumb a:hover,
 div#footer a:hover {
     border-bottom: 1px solid #696969;
 }
+
+p#news-footer {
+    color: #696969;
+    text-align: center;
+    font-size: small;
+}
diff --git a/web/input/support.md b/web/input/support.md
index c6d8b3d..538f320 100644
--- a/web/input/support.md
+++ b/web/input/support.md
@@ -1,6 +1,6 @@
 title: Support
 parent: Home
-menu-position: 4
+menu: 5
 ---
 
 # Support
diff --git a/web/macros.py b/web/macros.py
index f3b6ec6..5918195 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -8,9 +8,13 @@ page = {
     "description": "Standard monitoring plugins for Nagios and compatible monitoring solutions.",
     "keywords": "Nagios, Icinga, Shinken, Monitoring, Official, Plugins, Open, Source, Free, Software"
 }
-release_notes = 'doc/release-notes/' + plugins_release.replace('.', '-') + '.html'
+release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
 site_url = 'https://www.nagios-plugins.org/'
 
+#
+# RSS Feed
+#
+
 _RSS = """<?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0">
   <channel>
@@ -40,15 +44,14 @@ _RSS_ITEM = """
 
 def hook_postconvert_rss():
     items = []
-    posts = [p for p in pages if 'post' in p]
+    posts = [p for p in pages if 'date' in p]
     posts.sort(key=lambda p: p.date, reverse=True)
     for p in posts:
-        title = p.post
         link = '%s/%s' % (site_url.rstrip('/'), p.url)
         desc = hx(p.html)
         date = time.mktime(time.strptime('%s 12' % p.date, '%Y-%m-%d %H'))
         date = email.utils.formatdate(date)
-        items.append(_RSS_ITEM % (title, link, desc, link, date))
+        items.append(_RSS_ITEM % (p.title, link, desc, date, link))
     items = ''.join(items)
     title = 'Nagios Plugins'
     link = '%s/news/index.html' % site_url.rstrip('/')
@@ -59,23 +62,84 @@ def hook_postconvert_rss():
     fp.write(rss)
     fp.close()
 
-def list_posts(max_posts=-1):
-    posts = [p for p in pages if 'post' in p]
+#
+# News
+#
+
+def hook_preconvert_news():
+    posts_per_page = 10
+    posts = [p for p in pages if 'date' in p]
     posts.sort(key=lambda p: p.date, reverse=True)
-    if max_posts == -1:
-        max_posts = len(posts)
-    for p in posts[:max_posts]:
-        date = time.strftime('%B %d, %Y', time.strptime(p['date'], '%Y-%m-%d'))
-        print '* **[%s](%s)** (%s)' % (p.post, p.url, date)
+    n_news_pages = len(posts) / posts_per_page
+    if len(posts) % posts_per_page > 0:
+        n_news_pages += 1
+    for i, chunk in enumerate(next_news_chunk(posts, posts_per_page)):
+        content = make_news_page(chunk, i) + make_news_footer(n_news_pages, i)
+        if i == 0:
+            p = Page('news/index.md',
+                     virtual=content,
+                     menu=2,
+                     title='News',
+                     parent='Home')
+        else:
+            p = Page('news/%d.md' % (i + 1),
+                     virtual=content,
+                     title='News Page %d' % (i + 1),
+                     parent='News')
+        pages.append(p)
 
-def list_kids():
-    kids = [(p.url, p.title) for p in pages if p.get('parent') == page.title]
-    for kid in sorted(kids):
-        print('* [%s](%s)' % (kid[1], kid[0]))
+def make_news_page(posts, current_index):
+    marker = '<end-of-abstract>'
+    source = list()
+    if current_index == 0:
+        title = 'News'
+    else:
+        title = 'News Page %d' % (current_index + 1)
+    abstract = ['# ' + title]
+    for p in posts:
+        timestamp = time.strptime(p.date, '%Y-%m-%d')
+        date = time.strftime('%A, %B %-e, %Y', timestamp)
+        abstract.append('## %s' % p.title)
+        abstract.append('*%s*' % date)
+        abstract.append('%s' % p.source.split(marker, 1)[0])
+        abstract.append('[<a href="%s">Read more</a>]' % p.url)
+        source.append('# %s' % p.title)
+        source.append('*%s*' % date)
+        source.append(p.source.replace(marker, '', 1))
+        p.source = '\n'.join(source)
+        p['parent'] = title
+    return '\n'.join(abstract) + '\n\n'
+
+def make_news_footer(n_news_pages, current_index):
+    footer = list()
+    if current_index != 0:
+        previous = 'index' if current_index == 1 else str(current_index)
+        footer.append('[First](news/index.html)')
+        footer.append('[Previous](news/%s.html)' % previous)
+    if n_news_pages <= 20:
+        for i in range(n_news_pages):
+            if i == current_index:
+                footer.append('%d' % (i + 1))
+            else:
+                footer.append('[%d](news/%d.html)' % (i + 1, i + 1))
+    if current_index != n_news_pages - 1:
+        footer.append('[Next](news/%d.html)' % (current_index + 2))
+        footer.append('[Last](news/%d.html)' % n_news_pages)
+    return '&emsp;'.join(footer) + '\n{: #news-footer }\n'
+
+def next_news_chunk(posts, posts_per_page):
+    index = 0
+    while len(posts[index:]) > 0:
+        yield posts[index:index + posts_per_page]
+        index += posts_per_page
+
+#
+# Menu and Breadcrumb Navigation
+#
 
 def menu():
-    menu_pages = [p for p in pages if 'menu-position' in p]
-    menu_pages.sort(key=lambda p: int(p['menu-position']))
+    menu_pages = [p for p in pages if 'menu' in p]
+    menu_pages.sort(key=lambda p: int(p['menu']))
     for p in menu_pages:
         if p.title == page.title:
             print('<span id="current">%s</span>' % hx(p.title))
@@ -96,6 +160,15 @@ def breadcrumb():
         crumbs = '&nbsp;' + stable
     return crumbs
 
+#
+# Miscellaneous
+#
+
+def list_kids():
+    kids = [(p.url, p.title) for p in pages if p.get('parent') == page.title]
+    for kid in sorted(kids):
+        print('* [%s](%s)' % (kid[1], kid[0]))
+
 def copyright_years(since=None):
     this_year = time.gmtime().tm_year
     if since is not None and int(since) != this_year: