Gentoo Archives: gentoo-commits

From: Alex Legler <a3li@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] sites/www:master commit in: _plugins/, support/news-items/
Date: Sat, 02 Jul 2016 20:15:43
Message-Id: 1467490533.77572687eee4183849b567e8f29609c616177007.a3li@gentoo
1 commit: 77572687eee4183849b567e8f29609c616177007
2 Author: Alex Legler <alex <AT> a3li <DOT> li>
3 AuthorDate: Sat Jul 2 20:14:57 2016 +0000
4 Commit: Alex Legler <a3li <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 2 20:15:33 2016 +0000
6 URL: https://gitweb.gentoo.org/sites/www.git/commit/?id=77572687
7
8 Rework news item page
9
10 * Mention the items only concern the main repo
11 * Syntax fixes
12 * Remove incomplete authors list from overview table (#587534)
13
14 _plugins/news.rb | 3 +--
15 support/news-items/index.html | 14 ++++++--------
16 2 files changed, 7 insertions(+), 10 deletions(-)
17
18 diff --git a/_plugins/news.rb b/_plugins/news.rb
19 index a90c435..2e2fde7 100644
20 --- a/_plugins/news.rb
21 +++ b/_plugins/news.rb
22 @@ -38,11 +38,10 @@ module Gentoo
23
24 File.readlines(File.join(@base, NewsGenerator::NEWS_DIR, path, "#{name}.en.txt")).each do |line|
25 @title = $1 if line =~ /Title: (.*)$/
26 - @author = $1 if line =~ /Author: (.*)$/
27 @date = $1 if line =~ /Posted: (.*)$/
28 end
29
30 - site.data['newsitems'] << { 'title' => @title, 'author' => @author, 'date' => @date, 'url' => data['permalink'] }
31 + site.data['newsitems'] << { 'title' => @title, 'date' => @date, 'url' => data['permalink'] }
32
33 data['title'] = @title
34 end
35
36 diff --git a/support/news-items/index.html b/support/news-items/index.html
37 index 396aec7..5cf8701 100644
38 --- a/support/news-items/index.html
39 +++ b/support/news-items/index.html
40 @@ -14,7 +14,7 @@ nav2-show: true
41 <div class="alert alert-info">
42 <strong>Which items affect me?</strong>
43 <p>
44 - This page lists <strong>all</strong> available news items, but sometimes items don't affect you because you don't have the relevant package installed,
45 + This page lists <strong>all</strong> available news items for the official Gentoo package repository, but sometimes items don't affect you because you don't have the relevant package installed,
46 or use a different architecture.
47 <br>
48 The <kbd>emerge</kbd> command notifies you after each operation if there are news items affecting your configuration:
49 @@ -33,17 +33,15 @@ nav2-show: true
50
51 <h2>Published News Items</h2>
52
53 -<table class="table table-striped">
54 +<table class="table table-condensed table-striped">
55 <tr>
56 - <th>Title</th>
57 - <th>Author</th>
58 <th>Date</th>
59 + <th>Title</th>
60 </tr>
61 {% for entry in site.data.newsitems %}
62 <tr>
63 - <td><a href="{{ entry.url}}">{{ entry.title | xml_escape }}</a></td>
64 - <td>{{ entry.author | xml_escape }}</td>
65 - <td>{{ entry.date | xml_escape }}</td>
66 + <td>{{ entry.date | xml_escape }}</td>
67 + <td><a href="{{ entry.url }}">{{ entry.title | xml_escape }}</a></td>
68 </tr>
69 {% endfor %}
70 -</table>
71 \ No newline at end of file
72 +</table>