cleanup urls, /admin/ for admin

diff --git a/app/settings.py b/app/settings.py
index 49cfb3c48ba6a447eeb5e9bfcc0418c57dd9f1aa..257be230f4a78b86c77d053466ac2b251591c7c9 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -121,12 +121,12 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'urls'
 
-#TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-#    '/var/teleforma/crfpa/lib/teleforma-crfpa/teleforma/templates/',
-#)
+# TEMPLATE_DIRS = (
+# #     Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+# #     Always use forward slashes, even on Windows.
+# #     Don't forget to use absolute paths, not relative paths.
+#    '/srv/src/teleforma/teleforma/templates/',
+# )
 
 INSTALLED_APPS = (
     'suit',
@@ -142,7 +142,6 @@ INSTALLED_APPS = (
     'teleforma.webclass',
     'teleforma.exam',
     'jsonrpc',
-    'teleforma',
     'sorl.thumbnail',
     'django_extensions',
     'pagination',
@@ -177,6 +176,27 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'teleforma.context_processors.periods',
 )
 
+
+# BASE_DIR = os.path.dirname(__file__)
+
+# TEMPLATES = [
+# {
+#     'BACKEND': 'django.template.backends.django.DjangoTemplates',
+#     'DIRS': [
+#         os.path.join(BASE_DIR, 'templates')
+#     ],
+#     'APP_DIRS': True,
+#     'OPTIONS': {
+#         'context_processors': [
+#            'django.template.context_processors.debug',
+#            'django.template.context_processors.request',
+#            'django.contrib.auth.context_processors.auth',
+#            'django.contrib.messages.context_processors.messages',
+#         ],
+#     },
+# },]
+
+
 TELEMETA_ORGANIZATION = 'Pré-Barreau - CRFPA'
 TELEMETA_SUBJECTS = ('Barreau', 'CRFPA', 'e-learning')
 TELEMETA_DESCRIPTION = "E-learning Pré-Barreau - CRFPA"

diff --git a/app/urls.py b/app/urls.py
index 448c6d4440f48fb490dbf349dac7d430124b8bc9..9acecf4ef2e01ad7a90b6fd5eae26a0d72b5caf5 100644 (file)
--- a/app/urls.py
+++ b/app/urls.py
@@ -7,7 +7,7 @@ from django.contrib import admin
 admin.autodiscover()
 
 js_info_dict = {
-    'packages': ('telemeta', 'teleforma'),
+    'packages': ('teleforma'),
 }
 
 urlpatterns = patterns('',
@@ -17,7 +17,7 @@ urlpatterns = patterns('',
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
     # to INSTALLED_APPS to enable admin documentation:
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/django/', include(admin.site.urls)),
+    url(r'^admin/', include(admin.site.urls)),
 
     # TeleForma
     (r'^', include('teleforma.urls')),

diff --git a/teleforma/4.0.5.zip b/teleforma/4.0.5.zip
deleted file mode 100644 (file)
index db83dbe..0000000
Binary files a/teleforma/4.0.5.zip and /dev/null differ