添加django-suit

liulixiang1988 · Aug 27, 2014 · d8e9bea · d8e9bea
1 parent 500fdec
commit d8e9bea
Show file tree

Hide file tree

Showing 51 changed files with 11,266 additions and 369 deletions.
diff --git a/django/mydjangosite/mydjangosite/settings.py b/django/mydjangosite/mydjangosite/settings.py
@@ -105,9 +105,9 @@
     #     'django.template.loaders.eggs.Loader',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.core.context_processors.request",
-    'django.contrib.auth.context_processors.auth'
+from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP
+TEMPLATE_CONTEXT_PROCESSORS = TCP + (
+    'django.core.context_processors.request',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -137,7 +137,8 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'grappelli',
+    #'grappelli',
+    #'suit',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:

diff --git a/django/mydjangosite/mydjangosite/urls.py b/django/mydjangosite/mydjangosite/urls.py
@@ -17,7 +17,7 @@
                        url(r'^signups/', include('signups.urls', namespace='signups')),
                        url(r'^rango/', include('rango.urls', namespace='rango')),
                        #url(r'^auth/', include('auth.urls', namespace='auth')),
-                       (r'^grappelli/', include('grappelli.urls')), # grappelli URLS
+                       #(r'^grappelli/', include('grappelli.urls')), # grappelli URLS
                        # Uncomment the admin/doc line below to enable admin documentation:
                        url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 

diff --git a/django/mydjangosite/requirements.txt b/django/mydjangosite/requirements.txt
@@ -0,0 +1,7 @@
+Django==1.6.5
+Pillow==2.5.1
+South==1.0
+django-grappelli==2.5.3
+django-suit==0.2.9
+markdown2==2.2.1
+requests==2.3.0