diff options
-rw-r--r-- | feeds.py | 4 | ||||
-rw-r--r-- | templates/public/feeds.html | 3 | ||||
-rw-r--r-- | urls.py | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -71,8 +71,10 @@ class PackageFeed(Feed): def title(self, obj): s = 'Arch Linux: Recent package updates' - if 'repo' in obj: + if 'repo' in obj and 'arch' in obj: s += ' (%s [%s])' % (obj['arch'].name, obj['repo'].name.lower()) + elif 'repo' in obj: + s += ' [%s]' % (obj['repo'].name.lower()) elif 'arch' in obj: s += ' (%s)' % (obj['arch'].name) return s diff --git a/templates/public/feeds.html b/templates/public/feeds.html index b4214b1b..f5378afb 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -36,6 +36,7 @@ <thead> <tr> <th></th> + <th>All Arches</th> {% for arch in arches %} <th>{{ arch }}</th> {% endfor %} @@ -44,6 +45,7 @@ <tbody> <tr> <td><strong>All Repos</strong></td> + <td><a href="/feeds/packages/" class="rss">Feed</a></td> {% for arch in arches %} <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td> {% endfor %} @@ -51,6 +53,7 @@ {% for repo in repos %} <tr> <td><strong>{{ repo }}</strong></td> + <td><a href="/feeds/packages/all/{{ repo|lower }}/" class="rss">Feed</a></td> {% for arch in arches %} <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td> {% endfor %} @@ -27,6 +27,8 @@ feeds_patterns = patterns('', (r'^packages/$', cache_page(300)(PackageFeed())), (r'^packages/(?P<arch>[A-z0-9]+)/$', cache_page(300)(PackageFeed())), + (r'^packages/all/(?P<repo>[A-z0-9\-]+)/$', + cache_page(300)(PackageFeed())), (r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$', cache_page(300)(PackageFeed())), ) |