works with static rather than media

stefanfoulis · May 31, 2011 · 5a06350 · 5a06350
1 parent 57bbf52
commit 5a06350
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 7 deletions.
diff --git a/widgetry/fk_lookup/widgets.py b/widgetry/fk_lookup/widgets.py
@@ -100,14 +100,14 @@ def render(self, name, value, attrs=None, extra_context={}):
 
     class Media:
         css = {
-            'all': ('/media/widgetry/jquery.fkautocomplete.css',)
+            'all': ('/static/widgetry/jquery.fkautocomplete.css',)
         }
         js = (
-            '/media/cms/js/lib/jquery.js',
-            '/media/javascript/jquery/external/bgiframe/jquery.bgiframe.min.js',
-            '/media/javascript/jquery/external/jquery-autocomplete/lib/jquery.ajaxQueue.js',
-            '/media/javascript/jquery/external/jquery-autocomplete/jquery.autocomplete.js',
-            '/media/widgetry/jquery.fkautocomplete.js',
+            '/static/cms/js/lib/jquery.js',
+            '/static/jquery/external/bgiframe/jquery.bgiframe.min.js',
+            '/static/jquery/external/jquery-autocomplete/lib/jquery.ajaxQueue.js',
+            '/static/jquery/external/jquery-autocomplete/jquery.autocomplete.js',
+            '/static/widgetry/jquery.fkautocomplete.js',
         )
 
 class GenericFkLookup(FkLookup):

diff --git a/...etry/media/jquery.autocomplete-django.css → ...try/static/jquery.autocomplete-django.css b/...etry/media/jquery.autocomplete-django.css → ...try/static/jquery.autocomplete-django.css
diff --git a/widgetry/static/widgetry/indicator.gif b/widgetry/static/widgetry/indicator.gif
diff --git a/.../media/widgetry/jquery.fkautocomplete.css → ...static/widgetry/jquery.fkautocomplete.css b/.../media/widgetry/jquery.fkautocomplete.css → ...static/widgetry/jquery.fkautocomplete.css
diff --git a/...y/media/widgetry/jquery.fkautocomplete.js → .../static/widgetry/jquery.fkautocomplete.js b/...y/media/widgetry/jquery.fkautocomplete.js → .../static/widgetry/jquery.fkautocomplete.js
diff --git a/...etry/tabs/css/jquery-ui-1.8.10.custom.css → ...etry/tabs/css/jquery-ui-1.8.10.custom.css b/...etry/tabs/css/jquery-ui-1.8.10.custom.css → ...etry/tabs/css/jquery-ui-1.8.10.custom.css
diff --git a/...edia/widgetry/tabs/js/jquery-1.4.4.min.js → ...atic/widgetry/tabs/js/jquery-1.4.4.min.js b/...edia/widgetry/tabs/js/jquery-1.4.4.min.js → ...atic/widgetry/tabs/js/jquery-1.4.4.min.js
diff --git a/...ry/tabs/js/jquery-ui-1.8.10.custom.min.js → ...ry/tabs/js/jquery-ui-1.8.10.custom.min.js b/...ry/tabs/js/jquery-ui-1.8.10.custom.min.js → ...ry/tabs/js/jquery-ui-1.8.10.custom.min.js
diff --git a/widgetry/tabs/admin.py b/widgetry/tabs/admin.py
@@ -11,6 +11,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 from django.views.decorators.csrf import csrf_protect
+from cms.admin.placeholderadmin import PlaceholderAdmin
 
 try:
     set
@@ -135,7 +136,7 @@ def _media(self):
 
 
 
-class ModelAdminWithTabs(admin.ModelAdmin):
+class ModelAdminWithTabs(PlaceholderAdmin):
     tabs = []
 
     @csrf_protect_m