Skip to content

Commit

Permalink
1. adjust logo css, remove margin-bottom
Browse files Browse the repository at this point in the history
2. add urlquote in get_absolute_url
3. enable QuestionsPageSizeMiddleware middleware
4. remove unused code
  • Loading branch information
sailingcai committed Oct 12, 2009
1 parent ca1cf62 commit fb1574a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
7 changes: 4 additions & 3 deletions forum/models.py
Expand Up @@ -3,6 +3,7 @@
import hashlib import hashlib
from urllib import quote_plus, urlencode from urllib import quote_plus, urlencode
from django.db import models from django.db import models
from django.utils.http import urlquote as django_urlquote
from django.utils.html import strip_tags from django.utils.html import strip_tags
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib.auth.models import User from django.contrib.auth.models import User
Expand Down Expand Up @@ -180,7 +181,7 @@ def tagname_list(self):
return [name for name in self.tagnames.split(u' ')] return [name for name in self.tagnames.split(u' ')]


def get_absolute_url(self): 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): def has_favorite_by_user(self, user):
if not user.is_authenticated(): if not user.is_authenticated():
Expand Down Expand Up @@ -384,7 +385,7 @@ def get_question_title(self):
return self.question.title return self.question.title


def get_absolute_url(self): 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: class Meta:
db_table = u'answer' db_table = u'answer'
Expand Down Expand Up @@ -535,7 +536,7 @@ class Book(models.Model):
questions = models.ManyToManyField(Question, related_name='book', db_table='book_question') questions = models.ManyToManyField(Question, related_name='book', db_table='book_question')


def get_absolute_url(self): 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): def __unicode__(self):
return self.title return self.title
Expand Down
2 changes: 0 additions & 2 deletions forum/views.py
Expand Up @@ -115,8 +115,6 @@ def questions(request, tagname=None, unanswered=False):
# template file # template file
# "questions.html" or "unanswered.html" # "questions.html" or "unanswered.html"
template_file = "questions.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 # get pagesize from session, if failed then get default value
pagesize = request.session.get("pagesize", 10) pagesize = request.session.get("pagesize", 10)
try: try:
Expand Down
2 changes: 1 addition & 1 deletion settings.py
Expand Up @@ -36,7 +36,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.transaction.TransactionMiddleware', 'django.middleware.transaction.TransactionMiddleware',
#'django.middleware.sqlprint.SqlPrintingMiddleware', #'django.middleware.sqlprint.SqlPrintingMiddleware',
#'middleware.pagesize.QuestionsPageSizeMiddleware', 'middleware.pagesize.QuestionsPageSizeMiddleware',
#'debug_toolbar.middleware.DebugToolbarMiddleware', #'debug_toolbar.middleware.DebugToolbarMiddleware',
) )


Expand Down
1 change: 0 additions & 1 deletion templates/content/style/style.css
Expand Up @@ -108,7 +108,6 @@ blockquote
margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;} margin-left:20px;text-decoration:underline; font-size:12px; color:#333333;}
#logo { #logo {
padding: 5px 0px 0px 0px; padding: 5px 0px 0px 0px;
margin-bottom:-3px;
} }
#navBar {float:clear;position:relative;display:block;width:960px;} #navBar {float:clear;position:relative;display:block;width:960px;}
#navBar .nav {margin:20px 0px 0px 16px; #navBar .nav {margin:20px 0px 0px 16px;
Expand Down

0 comments on commit fb1574a

Please sign in to comment.