# HG changeset patch
# User Brian Neal
# Date 1285440921 0
# Node ID ded03f2513e986c5d4417e92936f644916163a85
# Parent 4532ed27bed83d2bc8bc1607652d3cf34520679b
Fixing #116. Allow formatting on POTD description and enable TinyMCE in the admin.
diff -r 4532ed27bed8 -r ded03f2513e9 gpp/potd/admin.py
--- a/gpp/potd/admin.py Sat Sep 25 18:04:44 2010 +0000
+++ b/gpp/potd/admin.py Sat Sep 25 18:55:21 2010 +0000
@@ -1,16 +1,21 @@
"""
This file contains the admin definitions for the POTD application.
"""
+from django.contrib import admin
+from django.conf import settings
-from django.contrib import admin
from potd.models import Photo
from potd.models import Current
from potd.models import Sequence
+
class PhotoAdmin(admin.ModelAdmin):
exclude = ('thumb', )
raw_id_fields = ('user', )
+ class Media:
+ js = settings.GPP_THIRD_PARTY_JS['tiny_mce']
+
class CurrentAdmin(admin.ModelAdmin):
raw_id_fields = ('potd', )
diff -r 4532ed27bed8 -r ded03f2513e9 gpp/templates/potd/view.html
--- a/gpp/templates/potd/view.html Sat Sep 25 18:04:44 2010 +0000
+++ b/gpp/templates/potd/view.html Sat Sep 25 18:55:21 2010 +0000
@@ -27,7 +27,7 @@
on {{ potd.date_added|date:"d F Y" }}.
This photo has been Photo of the Day {{ potd.potd_count }} time{{ potd.potd_count|pluralize }}.
-{{ potd.description }}
+{{ potd.description|safe }}
If you would like us to feature your photo, send it along with your username, a title, and
short description to admin@surfguitar101.com.