diff options
| author |  Tom Willemsen | 2012-03-10 14:02:59 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-03-10 14:02:59 +0100 |
| commit | 63d1ed7d192e2e17665add4f70dca10c2681d704 (patch) | |
| tree | ecf583a24eeecc98d1b5428ce1a9a0ad15fb7c83 /aggregator | |
| parent | ca93d7a2d20f2044bfe3a15ecd43160ba84d7ad2 (diff) | |
| download | ryuslash.org-63d1ed7d192e2e17665add4f70dca10c2681d704.tar.gz ryuslash.org-63d1ed7d192e2e17665add4f70dca10c2681d704.zip | |
Add a little 'design' to the site
Diffstat (limited to 'aggregator')
| -rw-r--r-- | aggregator/fixtures/initial_data.json | 18 | ||||
| -rw-r--r-- | aggregator/models.py | 6 | ||||
| -rw-r--r-- | aggregator/views.py | 8 |
3 files changed, 22 insertions, 10 deletions
diff --git a/aggregator/fixtures/initial_data.json b/aggregator/fixtures/initial_data.json index 58fb2d4..a9a83df 100644 --- a/aggregator/fixtures/initial_data.json +++ b/aggregator/fixtures/initial_data.json @@ -7,7 +7,6 @@ "base_url": "http://www.advogato.org/", "feed_url": "person/ryuslash/rss.xml", "profile_url": "person/ryuslash", - "uses_title": false, "favicon_ext": "ico" } }, @@ -19,8 +18,6 @@ "base_url": "http://diasp.org/", "feed_url": "public/ryuslash.atom", "profile_url": "public/ryuslash", - "uses_title": false, - "favicon_ext": "png", "br2nl": true } }, @@ -32,7 +29,6 @@ "base_url": "http://identi.ca/", "feed_url": "api/statuses/user_timeline/107950.rss", "profile_url": "ryuslash", - "uses_title": false, "favicon_ext": "ico" } }, @@ -43,9 +39,17 @@ "name": "Github", "base_url": "https://github.com/", "feed_url": "ryuslash.atom", - "profile_url": "ryuslash", - "uses_title": true, - "favicon_ext": "png" + "profile_url": "ryuslash" + } + }, + { + "model": "aggregator.Feed", + "pk": 5, + "fields": { + "name": "Gitorious", + "base_url": "https://gitorious.org/", + "feed_url": "~ryuslash/feed.atom", + "profile_url": "~ryuslash" } } ] diff --git a/aggregator/models.py b/aggregator/models.py index 3825d69..6bc6d1a 100644 --- a/aggregator/models.py +++ b/aggregator/models.py @@ -20,6 +20,9 @@ class Feed(models.Model): def get_favicon_url(self): return self.base_url + 'favicon.' + self.favicon_ext + class Meta: + ordering = [ '-updated' ] + class Post(models.Model): post_id = models.CharField(max_length=500, unique=True) title = models.CharField(max_length=500) @@ -28,3 +31,6 @@ class Post(models.Model): updated = models.DateTimeField() added = models.DateTimeField(auto_now_add=True) feed = models.ForeignKey(Feed) + + class Meta: + ordering = [ '-updated' ] diff --git a/aggregator/views.py b/aggregator/views.py index c946c31..b0fdf3b 100644 --- a/aggregator/views.py +++ b/aggregator/views.py @@ -2,10 +2,11 @@ from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.http import Http404 from django.shortcuts import render_to_response -from .models import Post +from .models import Post, Feed def posts(request, page=1): - queryset = Post.objects.order_by('-updated') + queryset = Post.objects.all() + feeds = Feed.objects.all() paginator = Paginator(queryset, 20) if page == None: @@ -17,4 +18,5 @@ def posts(request, page=1): raise Http404 return render_to_response('aggregator/posts.html', - { 'list': object_list }) + { 'list': object_list, + 'feeds': feeds }) |