Commit ad1dc1e4 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

media loads; removed thumbnails

parent 5b336140
...@@ -47,7 +47,6 @@ INSTALLED_APPS = ( ...@@ -47,7 +47,6 @@ INSTALLED_APPS = (
'randomslugfield', 'randomslugfield',
'django_gravatar', 'django_gravatar',
'crispy_forms', 'crispy_forms',
'easy_thumbnails',
'haystack', 'haystack',
'piwik', 'piwik',
) )
...@@ -109,17 +108,8 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner' ...@@ -109,17 +108,8 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner'
STATIC_URL = '/static/' STATIC_URL = '/static/'
THUMBNAIL_ALIASES = {'': {
'listing_photo': {
'size': (333, 250),
'crop': True,
},
},}
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = (os.path.join(BASE_DIR, 'media/')) MEDIA_ROOT = (os.path.join(BASE_DIR, 'media'))
MEDIAFILES_DIRS = (
)
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',
......
...@@ -3,6 +3,9 @@ from django.conf.urls import patterns, include, url ...@@ -3,6 +3,9 @@ from django.conf.urls import patterns, include, url
from .views import HomepageView, ChartsView from .views import HomepageView, ChartsView
from django.views.generic import TemplateView from django.views.generic import TemplateView
from django.conf.urls.static import static
from django.conf import settings
from django.contrib import admin from django.contrib import admin
# Uncomment the next two lines to enable the admin: # Uncomment the next two lines to enable the admin:
...@@ -38,4 +41,4 @@ urlpatterns = patterns('', ...@@ -38,4 +41,4 @@ urlpatterns = patterns('',
url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
) ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
...@@ -15,7 +15,6 @@ django-piwik==0.1 ...@@ -15,7 +15,6 @@ django-piwik==0.1
django-randomslugfield==0.3.0 django-randomslugfield==0.3.0
djangorestframework==3.0.4 djangorestframework==3.0.4
docutils==0.12 docutils==0.12
easy-thumbnails==2.2
gunicorn==19.1.1 gunicorn==19.1.1
pyisbn==1.0.0 pyisbn==1.0.0
python-dateutil==2.4.1 python-dateutil==2.4.1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment