Mercurial > public > sg101
changeset 267:ded03f2513e9
Fixing #116. Allow formatting on POTD description and enable TinyMCE in the admin.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sat, 25 Sep 2010 18:55:21 +0000 |
| parents | 4532ed27bed8 |
| children | eea6219024ef |
| files | gpp/potd/admin.py gpp/templates/potd/view.html |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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', )
--- 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" }}.<br /> This photo has been Photo of the Day {{ potd.potd_count }} time{{ potd.potd_count|pluralize }}. </p> -<p class="description">{{ potd.description }}</p> +<p class="description">{{ potd.description|safe }}</p> <p class="details"> If you would like us to feature your photo, send it along with your username, a title, and short description to <a href="mailto:admin@surfguitar101.com">admin@surfguitar101.com</a>.