Byebye grappelli

master
Nick Sergeant 2012-06-04 23:20:28 -04:00
parent 47a83fed0e
commit de0035e880
5 changed files with 4 additions and 14 deletions

4
fabfile.py vendored
View File

@ -18,7 +18,7 @@ def dep():
_display_message('Collect static')
################
local('python manage.py collectstatic --ignore grappelli --ignore admin --noinput')
local('python manage.py collectstatic --noinput')
_display_message('Git push')
################
@ -45,7 +45,7 @@ def dep():
_display_message('Collect static', False)
################
run(_python('manage.py collectstatic --ignore grappelli --ignore admin --noinput'))
run(_python('manage.py collectstatic --noinput'))
def db():
with cd(env.site_path):

View File

@ -6,7 +6,6 @@ django-annoying
django-appconf
django-bcrypt
django_compressor
django-grappelli
django-markdown-deux
django-pagination
django-taggit

View File

@ -68,15 +68,7 @@ MEDIA_URL = '/media/uploads/'
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = os.path.join(BASE_PATH, 'static')
if DEBUG:
STATIC_URL = '/media/'
else:
STATIC_URL = '/static/'
# URL prefix for admin static files -- CSS, JavaScript and images.
# Make sure to use a trailing slash.
# Examples: "http://foo.com/static/admin/", "/static/admin/".
ADMIN_MEDIA_PREFIX = '/static/grappelli/'
STATIC_URL = '/static/'
# Additional locations of static files
STATICFILES_DIRS = (
@ -129,7 +121,6 @@ TEMPLATE_DIRS = (
INSTALLED_APPS = (
'gunicorn',
'grappelli',
'django.contrib.auth',
'django.contrib.contenttypes',

View File

@ -6,6 +6,7 @@ from snipts.models import Favorite, Snipt
class SniptAdmin(admin.ModelAdmin):
readonly_fields = ('user',)
list_display = ('title', 'slug', 'user', 'lexer', 'public', 'blog_post', 'created', 'modified', 'publish_date',)
list_filter = ('blog_post',)
search_fields = ('title', 'user__username', 'lexer', 'id', 'key',)
ordering = ('-created',)
prepopulated_fields = {'slug': ('title',)}

View File

@ -27,7 +27,6 @@ private_api.register(PrivateFavoriteResource())
urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^grappelli/', include('grappelli.urls')),
url(r'^404/$', direct_to_template, {'template': '404.html'}),
url(r'^500/$', direct_to_template, {'template': '500.html'}),