From 4cc9c6d9a87b555565140307a376c2c5fda2db7b Mon Sep 17 00:00:00 2001 From: Ben Davis Date: Sat, 20 Aug 2011 16:22:19 -0500 Subject: [PATCH 1/2] move media to static for staticfiles support --- src/orderable/{media => static}/orderable/orderable.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/orderable/{media => static}/orderable/orderable.js (100%) diff --git a/src/orderable/media/orderable/orderable.js b/src/orderable/static/orderable/orderable.js similarity index 100% rename from src/orderable/media/orderable/orderable.js rename to src/orderable/static/orderable/orderable.js From 4354263ea81dacc8a982f2ab2070dabd24370e2f Mon Sep 17 00:00:00 2001 From: Ben Davis Date: Sat, 20 Aug 2011 16:53:18 -0500 Subject: [PATCH 2/2] switched media to static for statcfiles support --- src/orderable/admin.py | 8 ++++---- src/orderable/settings.py | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/orderable/admin.py b/src/orderable/admin.py index 6015d66..a7f8e25 100644 --- a/src/orderable/admin.py +++ b/src/orderable/admin.py @@ -1,8 +1,8 @@ import posixpath -from django import forms from django.contrib import admin -from orderable.settings import JQUERY_URL, JQUERYUI_URL, ORDERABLE_MEDIA_URL +from orderable.settings import JQUERY_URL, JQUERYUI_URL +from django.conf import settings class OrderableAdmin(admin.ModelAdmin): exclude = ('order',) @@ -13,7 +13,7 @@ class OrderableAdmin(admin.ModelAdmin): class Media: js = (JQUERY_URL, JQUERYUI_URL, - posixpath.join(ORDERABLE_MEDIA_URL, 'orderable/orderable.js')) + posixpath.join(settings.STATIC_URL, 'orderable/orderable.js')) def __init__(self, *args, **kwargs): super(OrderableAdmin, self).__init__(*args, **kwargs) @@ -28,7 +28,7 @@ class OrderableInline(object): class Media: js = (JQUERY_URL, JQUERYUI_URL, - posixpath.join(ORDERABLE_MEDIA_URL, 'orderable/orderable.js')) + posixpath.join(settings.STATIC_URL, 'orderable/orderable.js')) class OrderableStackedInline(OrderableInline, admin.StackedInline): template = 'orderable/edit_inline/stacked.html' diff --git a/src/orderable/settings.py b/src/orderable/settings.py index 5aa3bb3..10111d5 100644 --- a/src/orderable/settings.py +++ b/src/orderable/settings.py @@ -15,6 +15,3 @@ def is_valid(url): if not is_valid(JQUERYUI_URL): JQUERYUI_URL = posixpath.join(settings.MEDIA_URL, JQUERYUI_URL) - -ORDERABLE_MEDIA_URL = getattr(settings, 'ORDERABLE_MEDIA_URL', - settings.MEDIA_URL)