re-enables trash/ in settings and urls so that /trash/simple/ple.inria.f14 should...

remember though that this of course would break the packaged app b/c trash is not packaged

diff --git a/myslice/settings.py b/myslice/settings.py
index c51010a..c069b96 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -195,7 +195,7 @@ INSTALLED_APPS = (
     # 'django.contrib.admindocs',
     'portal',
     # temporary - not packaged
-    # 'trash',
+    'trash',
     'sample',
 # DEPRECATED #    'django.contrib.formtools',
 # DEPRECATED ##    'crispy_forms',

diff --git a/myslice/urls.py b/myslice/urls.py
index 8ff01f9..3210957 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -63,6 +63,6 @@ urlpatterns = patterns(
     #
     # various trash views - bound to go away 
     #
-#    url(r'^trash/', include('trash.urls')),
+    url(r'^trash/', include('trash.urls')),
 
 )