Fixed OSQA-150: "tags pages" and "unanswered questions" pages have proper titles...

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

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index ddf4f694d47d0ed7ddcfe60b6213ad113112eee5..9eea455bc53023797b53fb231f5ca9033d7883c4 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -4,7 +4,7 @@
 {% load i18n %}\r
 {% load extra_tags %}\r
 \r
-{% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}\r
+{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 {% block content %}\r
 <div class="tabBar">\r
     {% question_list_title %}\r

diff --git a/forum/views/readers.py b/forum/views/readers.py
index beb3744936546638d0722761bc77eab4496c11d5..bac3c0c244b5c3ae05e4e08f6b8c9de1136f3f61 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -49,20 +49,20 @@ def index(request):
 def unanswered(request):
     return question_list(request, Question.objects.filter(extra_ref=None),
                          _('Open questions without an accepted answer'),
-                         sort='active')
+                         'active', None, _("Unanswered questions"))
 
 @decorators.render('questions.html', 'questions')
 def questions(request):
-    return question_list(request, Question.objects.all(), sort='active')
+    return question_list(request, Question.objects.all(), _('questions'), 'active')
 
 @decorators.render('questions.html')
 def tag(request, tag):
     return question_list(request, Question.objects.filter(tags__name=unquote(tag)),
                         mark_safe(_('Questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
-                        sort='active')
+                        'active', None, mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}))
 
 @decorators.list('questions', QUESTIONS_PAGE_SIZE)
-def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None):
+def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None):
     questions = initial.filter(deleted=None, in_moderation=None)
 
     if request.user.is_authenticated():
@@ -79,12 +79,16 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
 
         questions=questions.order_by(view_dic.get(sort, '-added_at'))
 
+    if page_title is None:
+        page_title = _("Questions")
+        
     return {
         "questions" : questions,
         "questions_count" : questions.count(),
         #"tags_autocomplete" : _get_tags_cache_json(),
         "list_description": list_description,
         "base_path" : base_path,
+        "page_title" : page_title,
         }
 
 

diff --git a/forum/views/users.py b/forum/views/users.py
index 8acd5d687aedba4c3fe9dbc4fd11cbb3f81a2b80..c55b7920bdde6e16c6b7f53ed515d9258d0d0585 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -121,17 +121,20 @@ def user_view(template, tab_name, tab_description, page_title, private=False):
             if private and not user == request.user:\r
                 return HttpResponseForbidden()\r
             context = fn(request, user)\r
+\r
+            rev_page_title = user.username + " - " + page_title\r
+\r
             context.update({\r
                 "tab_name" : tab_name,\r
                 "tab_description" : tab_description,\r
-                "page_title" : page_title,\r
+                "page_title" : rev_page_title,\r
             })\r
             return render_to_response(template, context, context_instance=RequestContext(request))\r
         return decorated\r
     return decorator\r
 \r
 \r
-@user_view('users/stats.html', 'stats', _('user profile'), _('user profile overview'))\r
+@user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))\r
 def user_stats(request, user):\r
     questions = Question.objects.filter(author=user, deleted=None).order_by('-added_at')\r
     answers = Answer.objects.filter(author=user, deleted=None).order_by('-added_at')\r
@@ -161,21 +164,21 @@ def user_stats(request, user):
             "total_awards" : len(awards),\r
         }\r
 \r
-@user_view('users/recent.html', 'recent', _('recent user activity'), _('profile - recent activity'))\r
+@user_view('users/recent.html', 'recent', _('recent user activity'), _('recent activity'))\r
 def user_recent(request, user):\r
     activities = user.actions.exclude(action_type__in=("voteup", "votedown", "voteupcomment", "flag")).order_by('-action_date')[:USERS_PAGE_SIZE]\r
 \r
     return {"view_user" : user, "activities" : activities}\r
 \r
 \r
-@user_view('users/votes.html', 'votes', _('user vote record'), _('profile - votes'), True)\r
+@user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True)\r
 def user_votes(request, user):\r
     votes = user.votes.filter(node__deleted=None).order_by('-voted_at')[:USERS_PAGE_SIZE]\r
 \r
     return {"view_user" : user, "votes" : votes}\r
 \r
 \r
-@user_view('users/reputation.html', 'reputation', _('user reputation in the community'), _('profile - user reputation'))\r
+@user_view('users/reputation.html', 'reputation', _('user reputation in the community'), _('user reputation'))\r
 def user_reputation(request, user):\r
     rep = list(user.reputes.order_by('date'))\r
     values = [r.value for r in rep]\r
@@ -188,13 +191,13 @@ def user_reputation(request, user):
 \r
     return {"view_user": user, "reputation": reversed(rep), "graph_data": graph_data}\r
 \r
-@user_view('users/questions.html', 'favorites', _('favorite questions'),  _('profile - favorite questions'))\r
+@user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))\r
 def user_favorites(request, user):\r
     favorites = FavoriteAction.objects.filter(user=user)\r
 \r
     return {"favorites" : favorites, "view_user" : user}\r
 \r
-@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('profile - subscriptions'), True)\r
+@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True)\r
 def user_subscriptions(request, user):\r
     if request.method == 'POST':\r
         form = SubscriptionSettingsForm(request.POST)\r