diff options
-rw-r--r-- | web/input/news/release-1-5.md | 2 | ||||
-rw-r--r-- | web/macros.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/web/input/news/release-1-5.md b/web/input/news/release-1-5.md index f2d130e..ed70d8c 100644 --- a/web/input/news/release-1-5.md +++ b/web/input/news/release-1-5.md | |||
@@ -5,7 +5,7 @@ date: 2013-10-02 | |||
5 | The Nagios Plugins Development Team is proud to announce version 1.5 of the | 5 | The Nagios Plugins Development Team is proud to announce version 1.5 of the |
6 | Nagios Plugins! This release comes with the new `check_dbi` plugin written by | 6 | Nagios Plugins! This release comes with the new `check_dbi` plugin written by |
7 | Sebastian Harl, and includes lots of enhancements and fixes provided by more | 7 | Sebastian Harl, and includes lots of enhancements and fixes provided by more |
8 | than forty contributors. Many thanks to all of you! <end-of-abstract> | 8 | than forty contributors. Many thanks to all of you! <end-of-teaser> |
9 | 9 | ||
10 | Special kudos go to Sven Nierlein for fixing numerous bugs, reviewing many | 10 | Special kudos go to Sven Nierlein for fixing numerous bugs, reviewing many |
11 | pull requests, bringing our test suite back into shape, and setting up | 11 | pull requests, bringing our test suite back into shape, and setting up |
diff --git a/web/macros.py b/web/macros.py index fa1b87a..b108398 100644 --- a/web/macros.py +++ b/web/macros.py | |||
@@ -89,26 +89,26 @@ def hook_preconvert_news(): | |||
89 | pages.append(p) | 89 | pages.append(p) |
90 | 90 | ||
91 | def make_news_page(posts, current_index): | 91 | def make_news_page(posts, current_index): |
92 | marker = '<end-of-abstract>' | 92 | marker = '<end-of-teaser>' |
93 | source = list() | 93 | source = list() |
94 | if current_index == 0: | 94 | if current_index == 0: |
95 | title = 'News' | 95 | title = 'News' |
96 | else: | 96 | else: |
97 | title = 'News Page %d' % (current_index + 1) | 97 | title = 'News Page %d' % (current_index + 1) |
98 | abstract = ['# ' + title] | 98 | teaser = ['# ' + title] |
99 | for p in posts: | 99 | for p in posts: |
100 | timestamp = time.strptime(p.date, '%Y-%m-%d') | 100 | timestamp = time.strptime(p.date, '%Y-%m-%d') |
101 | date = time.strftime('%A, %B %-e, %Y', timestamp) | 101 | date = time.strftime('%A, %B %-e, %Y', timestamp) |
102 | abstract.append('## %s' % p.title) | 102 | teaser.append('## %s' % p.title) |
103 | abstract.append('*%s*' % date) | 103 | teaser.append('*%s*' % date) |
104 | abstract.append('%s' % p.source.split(marker, 1)[0]) | 104 | teaser.append('%s' % p.source.split(marker, 1)[0]) |
105 | abstract.append('<a href="%s">Read more »</a>' % p.url) | 105 | teaser.append('<a href="%s">Read more »</a>' % p.url) |
106 | source.append('# %s' % p.title) | 106 | source.append('# %s' % p.title) |
107 | source.append('*%s*' % date) | 107 | source.append('*%s*' % date) |
108 | source.append(p.source.replace(marker, '', 1)) | 108 | source.append(p.source.replace(marker, '', 1)) |
109 | p.source = '\n'.join(source) | 109 | p.source = '\n'.join(source) |
110 | p['parent'] = title | 110 | p['parent'] = title |
111 | return '\n'.join(abstract) + '\n\n' | 111 | return '\n'.join(teaser) + '\n\n' |
112 | 112 | ||
113 | def make_news_footer(n_news_pages, current_index): | 113 | def make_news_footer(n_news_pages, current_index): |
114 | if n_news_pages == 1: | 114 | if n_news_pages == 1: |