From e8f1aef3636a2b9ef10d2d2bc4a768503a3e0d07 Mon Sep 17 00:00:00 2001
From: sailingcai <sailingcai@gmail.com>
Date: Mon, 12 Oct 2009 22:49:12 +0800
Subject: 1. adjust logo css, remove margin-bottom 2. add urlquote in
 get_absolute_url 3. enable QuestionsPageSizeMiddleware middleware 4. remove
 unused code

---
 forum/models.py                   | 7 ++++---
 forum/views.py                    | 2 --
 settings.py                       | 2 +-
 templates/content/style/style.css | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/forum/models.py b/forum/models.py
index 255eb21f..a6326fa9 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -3,6 +3,7 @@ import datetime
 import hashlib
 from urllib import quote_plus, urlencode
 from django.db import models
+from django.utils.http import urlquote  as django_urlquote
 from django.utils.html import strip_tags
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
@@ -180,7 +181,7 @@ class Question(models.Model):
         return [name for name in self.tagnames.split(u' ')]
 
     def get_absolute_url(self):
-        return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-'))
+        return '%s%s' % (reverse('question', args=[self.id]), django_urlquote(self.title.replace(' ', '-')))
 
     def has_favorite_by_user(self, user):
         if not user.is_authenticated():
@@ -384,7 +385,7 @@ class Answer(models.Model):
         return self.question.title
 
     def get_absolute_url(self):
-        return '%s%s#%s' % (reverse('question', args=[self.question.id]), self.question.title, self.id)
+        return '%s%s#%s' % (reverse('question', args=[self.question.id]), django_urlquote(self.question.title), self.id)
 
     class Meta:
         db_table = u'answer'
@@ -535,7 +536,7 @@ class Book(models.Model):
     questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')
     
     def get_absolute_url(self):
-        return '%s' % reverse('book', args=[self.short_name])
+        return '%s' % reverse('book', args=[django_urlquote(self.short_name)])
         
     def __unicode__(self):
         return self.title
diff --git a/forum/views.py b/forum/views.py
index dc38bcdf..377e7e8b 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -115,8 +115,6 @@ def questions(request, tagname=None, unanswered=False):
     # template file
     # "questions.html" or "unanswered.html"
     template_file = "questions.html"
-    # Set flag to False by default. If it is equal to True, then need to be saved.
-    pagesize_changed = False
     # get pagesize from session, if failed then get default value
     pagesize = request.session.get("pagesize", 10)
     try:
diff --git a/settings.py b/settings.py
index 7a70ae72..78df6859 100644
--- a/settings.py
+++ b/settings.py
@@ -36,7 +36,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     #'django.middleware.sqlprint.SqlPrintingMiddleware',
-    #'middleware.pagesize.QuestionsPageSizeMiddleware',
+    'middleware.pagesize.QuestionsPageSizeMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index fa20b014..7ccf1af3 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -108,7 +108,6 @@ blockquote
 		margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
 #logo {
 	padding: 5px 0px 0px 0px;
-	margin-bottom:-3px;
 }
 #navBar {float:clear;position:relative;display:block;width:960px;}
 #navBar .nav {margin:20px 0px 0px 16px;
-- 
cgit v1.2.3-1-g7c22