scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaned code and fix themes css

Browse source 
--HG--
rename : apps/forum/templates/forum/head.html => apps/forum/templates/forum/header.html
This commit is contained in:
alafin 2009-03-30 19:25:28 +03:00
parent 3af483e6a0
commit c4f2e7aae8
9 changed files with 16 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

83
apps/forum/forms.py
View file

@ -239,89 +239,6 @@ class UserSearchForm(forms.Form):
else:
return qs
class PostSearchForm(forms.Form):
keywords = forms.CharField(required=False, label=_('Keyword search'),
widget=forms.TextInput(attrs={'size':'40', 'maxlength':'100'}))
author = forms.CharField(required=False, label=_('Author search'),
widget=forms.TextInput(attrs={'size':'25', 'maxlength':'25'}))
forum = forms.CharField(required=False, label=_('Forum'))
search_in = forms.ChoiceField(choices=SEARCH_IN_CHOICES, label=_('Search in'))
sort_by = forms.ChoiceField(choices=SORT_POST_BY_CHOICES, label=_('Sort by'))
sort_dir = forms.ChoiceField(choices=SORT_DIR_CHOICES, label=_('Sort order'))
show_as = forms.ChoiceField(choices=SHOW_AS_CHOICES, label=_('Show results as'))
def filter(self, qs):
if self.is_valid():
keywords = self.cleaned_data['keywords']
author = self.cleaned_data['author']
forum = self.cleaned_data['forum']
search_in = self.cleaned_data['search_in']
sort_by = self.cleaned_data['sort_by']
sort_dir = self.cleaned_data['sort_dir']
if sort_by=='0':
if sort_dir=='ASC':
if search_in=='all':
return qs.filter(Q(topic__name__contains=keywords)).order_by('created')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('created')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('created')
elif sort_dir=='DESC':
if search_in=='all':
return qs.filter(Q(topic__contains=keywords) | Q(body__contains=keywords) & Q(user__username__contains=author)).order_by('-created')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('-created')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('-created')
elif sort_by=='1':
if sort_dir=='ASC':
if search_in=='all':
return qs.filter(Q(topic__contains=keywords) | Q(body__contains=keywords) & Q(user__username__contains=author)).order_by('user')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('user')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('user')
elif sort_dir=='DESC':
if search_in=='all':
return qs.filter(Q(topic__contains=keywords) | Q(body__contains=keywords) & Q(user__username__contains=author)).order_by('-user')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('-user')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('-user')
elif sort_by=='2':
if sort_dir=='ASC':
if search_in=='all':
return qs.filter((Q(topic__contains=keywords) | Q(body__contains=keywords)) & Q(user__username__contains=author)).order_by('topic')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('topic')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('topic')
elif sort_dir=='DESC':
if search_in=='all':
return qs.filter((Q(topic__contains=keywords) | Q(body__contains=keywords)) & Q(user__username__contains=author)).order_by('-topic')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('-topic')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('-topic')
elif sort_by=='3':
if sort_dir=='ASC':
if search_in=='all':
return qs.filter((Q(topic__contains=keywords) | Q(body__contains=keywords)) & Q(user__username__contains=author)).order_by('topic__forum')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('topic__forum')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('topic__forum')
elif sort_dir=='DESC':
if search_in=='all':
return qs.filter((Q(topic__contains=keywords) | Q(body__contains=keywords)) & Q(user__username__contains=author)).order_by('-topic__forum')
elif search_in=='message':
return qs.filter(body__contains=keywords, user__username__contains=author).order_by('-topic__forum')
elif search_in=='topic':
return qs.filter(topic__contains=keywords, user__username__contains=author).order_by('-topic__forum')
else:
return qs
class ReputationForm(forms.ModelForm):