Menu
▾
▴
[Felix-impl] SF.net SVN: felix:[2320] felix-lang.org/felix_website
|
From: <ida...@us...> - 2009-01-31 02:46:22
|
Revision: 2320
http://felix.svn.sourceforge.net/felix/?rev=2320&view=rev
Author: idadesub
Date: 2009-01-31 02:46:01 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
Update the felix website to work with django 1.0.2.
Modified Paths:
--------------
felix-lang.org/felix_website/apps/authors/views.py
felix-lang.org/felix_website/apps/blog/forms.py
felix-lang.org/felix_website/apps/blog/models.py
felix-lang.org/felix_website/apps/blog/templatetags/blog_tags.py
felix-lang.org/felix_website/apps/blog/urls.py
felix-lang.org/felix_website/apps/blog/views.py
felix-lang.org/felix_website/apps/codeblocks/models.py
felix-lang.org/felix_website/apps/codeblocks/templatetags/random_codeblock.py
felix-lang.org/felix_website/apps/codeblocks/views.py
felix-lang.org/felix_website/apps/feeds.py
felix-lang.org/felix_website/apps/tags/models.py
felix-lang.org/felix_website/apps/tags/views.py
felix-lang.org/felix_website/urls.py
Modified: felix-lang.org/felix_website/apps/authors/views.py
===================================================================
--- felix-lang.org/felix_website/apps/authors/views.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/authors/views.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -6,9 +6,9 @@
from django.views.generic.date_based import archive_index, archive_month, archive_day
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
-import django.newforms as forms
+import django.forms as forms
-from apps.blog.models import Post
+from felix_website.apps.blog.models import Post
def authors_view(request, username, view, args, kwds):
Modified: felix-lang.org/felix_website/apps/blog/forms.py
===================================================================
--- felix-lang.org/felix_website/apps/blog/forms.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/blog/forms.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,7 +1,8 @@
-import django.newforms as forms
-from apps.tags.models import Tag
-from apps.blog.models import Post, BODY_TYPE_CHOICES
+from django import forms
+from felix_website.apps.tags.models import Tag
+from felix_website.apps.blog.models import Post, BODY_TYPE_CHOICES
+
# -----------------------------------------------------------------------------
class PostForm(forms.Form):
Modified: felix-lang.org/felix_website/apps/blog/models.py
===================================================================
--- felix-lang.org/felix_website/apps/blog/models.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/blog/models.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -2,10 +2,11 @@
import md5
from django.db import models
+from django.contrib import admin
from django.contrib.auth.models import User
from django.conf import settings
-from apps.tags.models import Tag
+from felix_website.apps.tags.models import Tag
BODY_TYPE_CHOICES = (
('markdown', 'markdown'),
@@ -19,7 +20,7 @@
mod_date = models.DateTimeField('modification date', blank=True)
author = models.ForeignKey(User)
title = models.CharField(max_length=200)
- slug = models.SlugField(prepopulate_from=('title',), unique_for_date='pub_date')
+ slug = models.SlugField(unique_for_date='pub_date')
tags = models.ManyToManyField(Tag, blank=True)
format = models.CharField(max_length=30, choices=BODY_TYPE_CHOICES)
body = models.TextField(help_text='use html')
@@ -30,18 +31,6 @@
ordering = ('-pub_date',)
get_latest_by = 'pub_date'
- class Admin:
- fields = (
- ('Tags', {'fields': ('tags',)}),
- ('Post', {'fields': ('author', 'title', 'format', 'body')}),
- ('Optional', {'fields': ('slug', 'pub_date', 'mod_date', 'html_body'), 'classes': 'collapse'}),
- )
-
- list_display = ('pub_date', 'mod_date', 'author', 'title', 'slug')
- search_fields = ('title', 'body')
- list_filter = ('pub_date',)
- date_hierarchy = 'pub_date'
-
def __str__(self):
return self.title
@@ -68,3 +57,19 @@
return self.tags.count()
except ValueError:
return False
+
+class PostAdmin(admin.ModelAdmin):
+ prepopulated_fields = {'slug': ('title',)}
+
+ fieldsets = (
+ ('Tags', {'fields': ('tags',)}),
+ ('Post', {'fields': ('author', 'title', 'format', 'body')}),
+ ('Optional', {'fields': ('slug', 'pub_date', 'mod_date', 'html_body'), 'classes': 'collapse'}),
+ )
+
+ list_display = ('pub_date', 'mod_date', 'author', 'title', 'slug')
+ search_fields = ('title', 'body')
+ list_filter = ('pub_date',)
+ date_hierarchy = 'pub_date'
+
+admin.site.register(Post, PostAdmin)
Modified: felix-lang.org/felix_website/apps/blog/templatetags/blog_tags.py
===================================================================
--- felix-lang.org/felix_website/apps/blog/templatetags/blog_tags.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/blog/templatetags/blog_tags.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -3,8 +3,8 @@
from django import template
from django.contrib.auth.models import User
-from apps.blog.models import Post
-from apps.tags.models import Tag
+from felix_website.apps.blog.models import Post
+from felix_website.apps.tags.models import Tag
register = template.Library()
Modified: felix-lang.org/felix_website/apps/blog/urls.py
===================================================================
--- felix-lang.org/felix_website/apps/blog/urls.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/blog/urls.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,7 +1,8 @@
from django.conf.urls.defaults import *
-from apps.blog.models import Post
-from apps.tags.models import Tag
+from felix_website.apps.blog.models import Post
+from felix_website.apps.tags.models import Tag
+
info_dict = {
'queryset': Post.objects.all().select_related(),
'date_field': 'pub_date',
Modified: felix-lang.org/felix_website/apps/blog/views.py
===================================================================
--- felix-lang.org/felix_website/apps/blog/views.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/blog/views.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -6,16 +6,15 @@
from django.http import HttpResponse, HttpResponseRedirect
from django.template import RequestContext
from django.contrib.auth.decorators import login_required
-import django.newforms as forms
+from django import forms
from django.conf import settings
-from apps.blog.models import Post, BODY_TYPE_CHOICES
-from apps.tags.models import Tag
-from apps.blog.forms import PostForm, MailForm
+from felix_website.apps.blog.models import Post, BODY_TYPE_CHOICES
+from felix_website.apps.tags.models import Tag
+from felix_website.apps.blog.forms import PostForm, MailForm
+from felix_website.apps.markdown import markdown
+from felix_website.apps.mail import send_mail, create_message_id, html2text
-from apps.markdown import markdown
-from apps.mail import send_mail, create_message_id, html2text
-
# -----------------------------------------------------------------------------
_re_slug = re.compile(r'\W+')
Modified: felix-lang.org/felix_website/apps/codeblocks/models.py
===================================================================
--- felix-lang.org/felix_website/apps/codeblocks/models.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/codeblocks/models.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,3 +1,4 @@
+from django.contrib import admin
from django.db import models
class CodeBlock(models.Model):
@@ -10,11 +11,6 @@
html_code = models.TextField(blank=True, help_text='leave blank to autogenerate')
html_output = models.TextField(blank=True)
- class Admin:
- fields = (
- (None, {'fields': ('title', 'slug', 'description', 'filetype', 'code', 'html', 'output')}),
- )
-
class Meta:
ordering = ('slug',)
get_latest_by = 'slug'
@@ -24,3 +20,8 @@
def get_absolute_url(self):
return '/codeblocks/' + self.slug
+
+class CodeBlockAdmin(admin.ModelAdmin):
+ fields = ('title', 'slug', 'description', 'filetype', 'code', 'html_code', 'html_output')
+
+admin.site.register(CodeBlock, CodeBlockAdmin)
Modified: felix-lang.org/felix_website/apps/codeblocks/templatetags/random_codeblock.py
===================================================================
--- felix-lang.org/felix_website/apps/codeblocks/templatetags/random_codeblock.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/codeblocks/templatetags/random_codeblock.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,8 +1,9 @@
-from django import template
-from apps.codeblocks.models import CodeBlock
import datetime
import random
+from django import template
+from felix_website.apps.codeblocks.models import CodeBlock
+
class RandomCodeBlockNode(template.Node):
def __init__(self, varname):
self.varname = varname
Modified: felix-lang.org/felix_website/apps/codeblocks/views.py
===================================================================
--- felix-lang.org/felix_website/apps/codeblocks/views.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/codeblocks/views.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -4,13 +4,13 @@
from django.http import HttpResponse, HttpResponseRedirect
from django.template import RequestContext
from django.contrib.auth.decorators import login_required
-import django.newforms as forms
+from django import forms
from pygments import highlight
from pygments.lexers import get_lexer_by_name
from pygments.formatters import get_formatter_by_name
-from apps.codeblocks.models import CodeBlock
+from felix_website.apps.codeblocks.models import CodeBlock
# -----------------------------------------------------------------------------
Modified: felix-lang.org/felix_website/apps/feeds.py
===================================================================
--- felix-lang.org/felix_website/apps/feeds.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/feeds.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,6 +1,7 @@
from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
-from apps.blog.models import Post
+from felix_website.apps.blog.models import Post
+
class LatestEntries(Feed):
title = 'felix-lang.org news'
link = '/feeds/'
Modified: felix-lang.org/felix_website/apps/tags/models.py
===================================================================
--- felix-lang.org/felix_website/apps/tags/models.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/tags/models.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,3 +1,4 @@
+from django.contrib import admin
from django.db import models
class Tag(models.Model):
@@ -7,16 +8,15 @@
class Meta:
ordering = ('title',)
- class Admin:
- fields = (
- (None, {'fields': ('title', 'slug')}),
- )
-
- list_display = ('slug', 'title')
- search_fields = ('title',)
-
def __str__(self):
return self.title
def get_absolute_url(self):
return '/tags/%s/' % self.slug
+
+class TagAdmin(admin.ModelAdmin):
+ fields = ('title', 'slug')
+ list_display = ('slug', 'title')
+ search_fields = ('title',)
+
+admin.site.register(Tag, TagAdmin)
Modified: felix-lang.org/felix_website/apps/tags/views.py
===================================================================
--- felix-lang.org/felix_website/apps/tags/views.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/apps/tags/views.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -5,10 +5,10 @@
from django.template import RequestContext
from django.views.generic.date_based import archive_index, archive_month, archive_day
from django.contrib.auth.decorators import login_required
-import django.newforms as forms
+from django import forms
-from apps.blog.models import Post
-from apps.tags.models import Tag
+from felix_website.apps.blog.models import Post
+from felix_website.apps.tags.models import Tag
def tags_view(request, slug, view, args, kwds):
Modified: felix-lang.org/felix_website/urls.py
===================================================================
--- felix-lang.org/felix_website/urls.py 2009-01-30 09:53:13 UTC (rev 2319)
+++ felix-lang.org/felix_website/urls.py 2009-01-31 02:46:01 UTC (rev 2320)
@@ -1,12 +1,15 @@
import os
from django.conf import settings
-from django.contrib.comments.models import FreeComment
+from django.contrib import admin
+from django.contrib.comments.models import Comment
from django.conf.urls.defaults import *
-from apps.feeds import LatestEntries
+from felix_website.apps.feeds import LatestEntries
+admin.autodiscover()
+
comments_info_dict = {
- 'queryset': FreeComment.objects.all(),
+ 'queryset': Comment.objects.all(),
'paginate_by': 15,
}
@@ -22,13 +25,9 @@
(r'^tags/', include('felix_website.apps.tags.urls')),
(r'^authors/', include('felix_website.apps.authors.urls')),
(r'^pygments/', include('felix_website.apps.pygments.urls')),
- (r'^admin/', include('django.contrib.admin.urls')),
+ (r'^admin/(.*)', admin.site.root),
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
)
if os.path.exists(os.path.join(settings.PROJECT_DIR, 'urls_local.py')):
execfile(os.path.join(settings.PROJECT_DIR, 'urls_local.py'))
-
-urlpatterns += patterns('',
- (r'', include('django.contrib.flatpages.urls')),
-)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|