completed CFP - basic testing done

4 files changed, 13 insertions, 9 deletions

diff --git a/scipy/forms.py b/scipy/forms.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/scipy/forms.py
diff --git a/scipy/settings.py b/scipy/settings.py
index 1bb64dc..f8c72ef 100644
--- a/scipy/settings.py
+++ b/scipy/settings.py
@@ -55,12 +55,12 @@ USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/var/www/example.com/media/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = os.path.join(BASE_DIR, 'static/uploads')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://example.com/media/", "http://media.example.com/"
-MEDIA_URL = ''
+MEDIA_URL = '/2014/downloads/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
@@ -86,6 +86,7 @@ STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    'dajaxice.finders.DajaxiceFinder',
 )
 
 # Make this unique, and don't share it with anybody.
@@ -95,7 +96,7 @@ SECRET_KEY = 'kk1ulxnr(o4o+60_pyb4v+&7_spaso8#o)ycyc@+1-y)bp9#0d'
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
+    'django.template.loaders.eggs.Loader',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -123,6 +124,7 @@ TEMPLATE_DIRS = (
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
+    'django.contrib.messages.context_processors.messages',
 )
 
 INSTALLED_APPS = (
@@ -136,6 +138,9 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
+    'widget_tweaks',
+    'dajaxice',
+    'dajax',
     'website',
 )
 
diff --git a/scipy/urls.py b/scipy/urls.py
index ff46bce..3e64f3a 100644
--- a/scipy/urls.py
+++ b/scipy/urls.py
@@ -1,7 +1,12 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
+from dajaxice.core import dajaxice_autodiscover, dajaxice_config
+dajaxice_autodiscover()
 
 urlpatterns = patterns('',
     url(r'^', include('website.urls', namespace='website')),
     url(r'^admin/', include(admin.site.urls)),
+
+    # Dajaxice urls
+    url(dajaxice_config.dajaxice_url, include('dajaxice.urls')),
 )
diff --git a/scipy/views.py b/scipy/views.py
index 9387ea1..e69de29 100644
--- a/scipy/views.py
+++ b/scipy/views.py
@@ -1,6 +0,0 @@
-from django.http import HttpResponse, HttpResponseRedirect
-from django.core.context_processors import csrf
-from django.shortcuts import render
-from django.contrib.auth.models import User
-from django.contrib.auth import authenticate, login, logout
-from django.contrib.auth.decorators import login_required