Some small tweaks.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@597 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/node.py b/forum/models/node.py
index f62a8e078b9c2fc17b8a80d6a39cc9617df6c9ff..36fbda9d9be9eef4162562b913735434311b80b0 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -247,7 +247,7 @@ class Node(BaseModel, NodeContent):
     @classmethod
     def _generate_cache_key(cls, key, group="node"):
         return super(Node, cls)._generate_cache_key(key, group)
-
+        
     @classmethod
     def get_type(cls):
         return cls.__name__.lower()
@@ -283,6 +283,13 @@ class Node(BaseModel, NodeContent):
 
         return nis
 
+    @property
+    def last_activity(self):
+        try:
+            return self.actions.order_by('-action_date')[0].action_date
+        except:
+            return self.last_seen
+
     @property
     def state_list(self):
         return [s.state_type for s in self.states.all()]

diff --git a/forum/sitemap.py b/forum/sitemap.py
index 27528a0a16dd4fc1b65a4b2503dd108c44fa1bec..d898124834f795926a0f52cd3119958cadc943da 100644 (file)
--- a/forum/sitemap.py
+++ b/forum/sitemap.py
@@ -2,7 +2,7 @@ from django.contrib.sitemaps import Sitemap
 from forum.models import Question
 from django.conf import settings
 
-class QuestionsSitemap(Sitemap):
+class OsqaSitemap(Sitemap):
     changefreq = 'daily'
     priority = 0.5
     def items(self):

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 1b5b8e3cec313e43324b98cf705fb8228969f1ab..03ef8eede5bd68c61db103d017561b93aff9ff2d 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -10,10 +10,12 @@
 {% load cache %}\r
 {% block metadescription %}{{question.summary}}{% endblock %}\r
 {% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}\r
-{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
-{% block forejs %}\r
+{% block meta %}\r
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />\r
         <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">\r
+{% endblock %}\r
+{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
+{% block forejs %}\r
         {% if not question.nis.closed %}\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>\r

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index d3166703642fd2df8a4109b4b8f3f339c48039e4..3be2c975d9fb68f6b33ee65b9314c0d0fd1ef4a5 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -7,7 +7,7 @@
 \r
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 \r
-{% block forejs %}\r
+{% block meta %}\r
     <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}">\r
 {% endblock %}\r
 \r

diff --git a/forum/urls.py b/forum/urls.py
index 3547fc2cf74966197973eb076f9e342c24eb1642..d1715df75cf7767a1279ef666292f078a4e57419 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -6,14 +6,14 @@ from django.conf.urls.defaults import *
 from django.conf import settings as djsettings
 from django.contrib import admin
 from forum import views as app
-from forum.sitemap import QuestionsSitemap
+from forum.sitemap import OsqaSitemap
 from django.utils.translation import ugettext as _
 import logging
 
 admin.autodiscover()
 
 sitemaps = {
-    'questions': QuestionsSitemap
+    'questions': OsqaSitemap
 }
 
 APP_PATH = os.path.dirname(__file__)