From 73fd280e2dd18039d57caee95a6358546ccb11df Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 27 May 2011 13:44:17 +0100 Subject: [PATCH] Switch to using staticfiles contrib, update to Django 1.3 --- .gitignore | 1 + .../static}/img/skills/level0.gif | Bin .../static}/img/skills/level0t.gif | Bin .../static}/img/skills/level1.gif | Bin .../static}/img/skills/level1t.gif | Bin .../static}/img/skills/level2.gif | Bin .../static}/img/skills/level2t.gif | Bin .../static}/img/skills/level3.gif | Bin .../static}/img/skills/level3t.gif | Bin .../static}/img/skills/level4.gif | Bin .../static}/img/skills/level4t.gif | Bin .../static}/img/skills/level5.gif | Bin app/settings.py | 23 ++++++------------ app/{media => sso/static}/css/style.css | 0 app/{media => sso/static}/css/tables.css | 0 app/{media => sso/static}/img/404.png | Bin .../static}/img/b0rtb0rtb0rt.png | Bin .../static}/img/dreddit_logo.jpg | Bin app/{media => sso/static}/img/favicon.ico | Bin app/{media => sso/static}/img/ganked.jpg | Bin app/{media => sso/static}/img/mmd-header.png | Bin app/{media => sso/static}/img/shutdown.jpg | Bin app/{media => sso/static}/img/spinner.gif | Bin app/urls.py | 5 ++-- fabfile.py | 3 +++ requirements.txt | 10 ++++---- 26 files changed, 19 insertions(+), 23 deletions(-) rename app/{media => eve_api/static}/img/skills/level0.gif (100%) rename app/{media => eve_api/static}/img/skills/level0t.gif (100%) rename app/{media => eve_api/static}/img/skills/level1.gif (100%) rename app/{media => eve_api/static}/img/skills/level1t.gif (100%) rename app/{media => eve_api/static}/img/skills/level2.gif (100%) rename app/{media => eve_api/static}/img/skills/level2t.gif (100%) rename app/{media => eve_api/static}/img/skills/level3.gif (100%) rename app/{media => eve_api/static}/img/skills/level3t.gif (100%) rename app/{media => eve_api/static}/img/skills/level4.gif (100%) rename app/{media => eve_api/static}/img/skills/level4t.gif (100%) rename app/{media => eve_api/static}/img/skills/level5.gif (100%) rename app/{media => sso/static}/css/style.css (100%) rename app/{media => sso/static}/css/tables.css (100%) rename app/{media => sso/static}/img/404.png (100%) rename app/{media => sso/static}/img/b0rtb0rtb0rt.png (100%) rename app/{media => sso/static}/img/dreddit_logo.jpg (100%) rename app/{media => sso/static}/img/favicon.ico (100%) rename app/{media => sso/static}/img/ganked.jpg (100%) rename app/{media => sso/static}/img/mmd-header.png (100%) rename app/{media => sso/static}/img/shutdown.jpg (100%) rename app/{media => sso/static}/img/spinner.gif (100%) diff --git a/.gitignore b/.gitignore index d9f61b5..e3b92da 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ app/conf/settingslocal.py env *.pid app/conf/brokersettings.py +app/static/ diff --git a/app/media/img/skills/level0.gif b/app/eve_api/static/img/skills/level0.gif similarity index 100% rename from app/media/img/skills/level0.gif rename to app/eve_api/static/img/skills/level0.gif diff --git a/app/media/img/skills/level0t.gif b/app/eve_api/static/img/skills/level0t.gif similarity index 100% rename from app/media/img/skills/level0t.gif rename to app/eve_api/static/img/skills/level0t.gif diff --git a/app/media/img/skills/level1.gif b/app/eve_api/static/img/skills/level1.gif similarity index 100% rename from app/media/img/skills/level1.gif rename to app/eve_api/static/img/skills/level1.gif diff --git a/app/media/img/skills/level1t.gif b/app/eve_api/static/img/skills/level1t.gif similarity index 100% rename from app/media/img/skills/level1t.gif rename to app/eve_api/static/img/skills/level1t.gif diff --git a/app/media/img/skills/level2.gif b/app/eve_api/static/img/skills/level2.gif similarity index 100% rename from app/media/img/skills/level2.gif rename to app/eve_api/static/img/skills/level2.gif diff --git a/app/media/img/skills/level2t.gif b/app/eve_api/static/img/skills/level2t.gif similarity index 100% rename from app/media/img/skills/level2t.gif rename to app/eve_api/static/img/skills/level2t.gif diff --git a/app/media/img/skills/level3.gif b/app/eve_api/static/img/skills/level3.gif similarity index 100% rename from app/media/img/skills/level3.gif rename to app/eve_api/static/img/skills/level3.gif diff --git a/app/media/img/skills/level3t.gif b/app/eve_api/static/img/skills/level3t.gif similarity index 100% rename from app/media/img/skills/level3t.gif rename to app/eve_api/static/img/skills/level3t.gif diff --git a/app/media/img/skills/level4.gif b/app/eve_api/static/img/skills/level4.gif similarity index 100% rename from app/media/img/skills/level4.gif rename to app/eve_api/static/img/skills/level4.gif diff --git a/app/media/img/skills/level4t.gif b/app/eve_api/static/img/skills/level4t.gif similarity index 100% rename from app/media/img/skills/level4t.gif rename to app/eve_api/static/img/skills/level4t.gif diff --git a/app/media/img/skills/level5.gif b/app/eve_api/static/img/skills/level5.gif similarity index 100% rename from app/media/img/skills/level5.gif rename to app/eve_api/static/img/skills/level5.gif diff --git a/app/settings.py b/app/settings.py index 11d5f9e..e5624d3 100755 --- a/app/settings.py +++ b/app/settings.py @@ -37,28 +37,18 @@ SITE_ID = 1 # to load the internationalization machinery. USE_I18N = True -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'media') - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash if there is a path component (optional in other cases). -# Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '/static/' - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/' +# Defines the Static Media storage as per staticfiles contrib +STATIC_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'static') +STATIC_URL = '/static/' +ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/' # Make this unique, and don't share it with anybody. SECRET_KEY = '8i2+dd-b2tg9g%mq$&i$-8beh4i5^2mm=e-nh^$p47^w=z1igr' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', ) MIDDLEWARE_CLASSES = ( @@ -97,6 +87,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.humanize', + 'django.contrib.staticfiles', 'south', 'piston', 'djcelery', diff --git a/app/media/css/style.css b/app/sso/static/css/style.css similarity index 100% rename from app/media/css/style.css rename to app/sso/static/css/style.css diff --git a/app/media/css/tables.css b/app/sso/static/css/tables.css similarity index 100% rename from app/media/css/tables.css rename to app/sso/static/css/tables.css diff --git a/app/media/img/404.png b/app/sso/static/img/404.png similarity index 100% rename from app/media/img/404.png rename to app/sso/static/img/404.png diff --git a/app/media/img/b0rtb0rtb0rt.png b/app/sso/static/img/b0rtb0rtb0rt.png similarity index 100% rename from app/media/img/b0rtb0rtb0rt.png rename to app/sso/static/img/b0rtb0rtb0rt.png diff --git a/app/media/img/dreddit_logo.jpg b/app/sso/static/img/dreddit_logo.jpg similarity index 100% rename from app/media/img/dreddit_logo.jpg rename to app/sso/static/img/dreddit_logo.jpg diff --git a/app/media/img/favicon.ico b/app/sso/static/img/favicon.ico similarity index 100% rename from app/media/img/favicon.ico rename to app/sso/static/img/favicon.ico diff --git a/app/media/img/ganked.jpg b/app/sso/static/img/ganked.jpg similarity index 100% rename from app/media/img/ganked.jpg rename to app/sso/static/img/ganked.jpg diff --git a/app/media/img/mmd-header.png b/app/sso/static/img/mmd-header.png similarity index 100% rename from app/media/img/mmd-header.png rename to app/sso/static/img/mmd-header.png diff --git a/app/media/img/shutdown.jpg b/app/sso/static/img/shutdown.jpg similarity index 100% rename from app/media/img/shutdown.jpg rename to app/sso/static/img/shutdown.jpg diff --git a/app/media/img/spinner.gif b/app/sso/static/img/spinner.gif similarity index 100% rename from app/media/img/spinner.gif rename to app/sso/static/img/spinner.gif diff --git a/app/urls.py b/app/urls.py index 86e74fe..5c39913 100644 --- a/app/urls.py +++ b/app/urls.py @@ -1,10 +1,10 @@ from django.conf.urls.defaults import * from django.contrib import admin from django.contrib.auth.views import login +from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.conf import settings from utils import installed - from registration.views import register from sso.forms import RegistrationFormUniqueEmailBlocked @@ -18,7 +18,6 @@ urlpatterns = patterns('', (r'^eve/', include('eve_api.urls')), (r'^eveapi/', include('eve_proxy.urls')), (r'^api/', include('api.urls')), - (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), ) if installed('reddit'): @@ -36,3 +35,5 @@ if installed('groups'): (r'^groups/', include('groups.urls')), ) +if settings.DEBUG: + urlpatterns += staticfiles_urlpatterns() diff --git a/fabfile.py b/fabfile.py index d5aff9f..8c76e62 100644 --- a/fabfile.py +++ b/fabfile.py @@ -241,3 +241,6 @@ def clear_logs(): with cd('%(path)s/dreddit-auth/' % env): run('rm ./logs/*.log') +def deploy_static(): + with cd('%(path)s/dreddit-auth/' % env): + run('./app/manage.py collectstatic -v0 --noinput') diff --git a/requirements.txt b/requirements.txt index a7b31cb..540cc4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ MySQL-python -Django==1.2.4 +Django==1.3 django-piston==0.2.2 -e hg+https://bitbucket.org/ubernostrum/django-registration@d36a38202ee3#egg=django-registration yolk==0.4.1 -e hg+http://bitbucket.org/schinckel/django-jsonfield@acb6b4fd7312#egg=django-jsonfield xmlrpclib==1.0.1 South==0.7.3 -fabric==1.0.1 +fabric flup -django-debug-toolbar==0.8.3 +django-debug-toolbar simplejson -celery==2.1.2 -django-celery==2.1.2 +celery==2.2.6 +django-celery==2.2.4 -e git+https://github.com/ericflo/django-pagination.git@47e7ec874cd7dddda5ed#egg=django-pagination xmpppy