Changeset 70

Timestamp:

06/28/08 01:42:01 (2 months ago)

Author:

nobu

Message:

pluggable-contents:

• 細かい修正。
  

Files:

• branches/pluggable-contents/common/tests.py (modified) (3 diffs)
• branches/pluggable-contents/plugins/tests.py (added)
• branches/pluggable-contents/plugins/views.py (modified) (3 diffs)
• branches/pluggable-contents/settings.py (modified) (1 diff)

branches/pluggable-contents/common/tests.py

@@ -5 +5 @@
-from lxml import etree
-
+from django.contrib.sites.models import Site
+from django.conf import settings
-from django.test import TestCase
-from django.contrib.sites.models import Site
-
-from blog.models import Entry
@@ -18 +19 @@
-    common's test.
-    """
+    def setUp(self):
+        settings.SUB_CONTENTS = ()
+        settings.EXTRA_CONTENTS = ()
+
-    def test_sitemap(self):
-        """
@@ -75 +80 @@
-        self.assertEqual(html.xpath('//head/title/text()')[0],
-                         u'%s - %s' % (checked.title, CURRENT_SITE.name))
+
-        #   check context
-        context = response.context[-1]

branches/pluggable-contents/plugins/views.py

@@ -9 +9 @@
-from django.db import connection
-from django.template import loader, Context
+from django.utils.translation import ugettext_lazy as _
-
-from blog.models import Entry, Comment, TrackBack
@@ -245 +246 @@
-            'id': u'tag-list',
-            'obj_list': obj_list,
-u'Categories'
+_(u'Categories')
-        })
-        t = loader.get_template('blog/_tag_cloud.html')
+        return t.render(c)
+
+
+class RecentEntriesContent(Content):
+    """
+    """
+    def render(self):
+        # TODO: accessible this point.
+        obj_list = Entry.objects.filter(is_published__exact=True)\
+                                .filter(is_active__exact=True)[0:10]
+        c = Context({
+            'MEDIA_URL': settings.MEDIA_URL,
+            'DESIGN_THEME': settings.DESIGN_THEME,
+            'id': u'comment-list',
+            'obj_list': obj_list,
+            'title': _(u'Recent Comments'),
+        })
+        t = loader.get_template('blog/_links.html')
-        return t.render(c)
-
@@ -262 +281 @@
-            'id': u'comment-list',
-            'obj_list': obj_list,
-u'Recent Comments'
+_(u'Recent Comments')
-        })
-        t = loader.get_template('blog/_links.html')

branches/pluggable-contents/settings.py

@@ -119 +119 @@
-SUB_CONTENTS = (
-    'plugins.views.TagCloudContent',
-Comment
+Entrie
-)
-EXTRA_CONTENTS = (
+    'plugins.views.RecentCommentsContent',
-    'plugins.views.ArchiveContent',
-)