déplace les apps à la racine

apps/digicode/management/commands/clearcode.py → digicode/management/commands/clearcode.py

 # -*- coding: utf-8 -*-
 
 from django.core.management.base import BaseCommand
-from apps.digicode.models import Code
+from models import Code
 
 class Command(BaseCommand):
     help = u"Efface les codes périmés"

apps/impressions/views.py → impressions/views.py

@@ -20,7 +20,7 @@ from impression.impression_hp import impression
 # Formulaires
 from forms import UploadForm, PrintForm, ClubForm
 from models import Jobs
-from apps.digicode.models import Code
+from digicode.models import Code
 
 # config_impression, pour les prix
 import gestion.config.impression as config_impression

intranet/settings.py

@@ -261,6 +261,7 @@ INTRANET_APPS = (
     },
     {
         'name': 'tv',
+        'module': 'stream',
         'title':'Télévison et radio',
         'category':'Services',
         'label': u'TV',
@@ -418,7 +419,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     #'south',
     'reversion',
-) + tuple( 'apps.%s' % app['name'] for app in INTRANET_APPS )
+) + tuple( app.get('module', app['name']) for app in INTRANET_APPS )
 
 # Config de l'app d'impressions
 MAX_PRINTFILE_SIZE=25 * 1024 * 1024 # 25Mio

intranet/urls.py

@@ -23,7 +23,7 @@ else:
 
 urlpatterns = patterns('',
     # Les pages existantes
-    url('^$', 'apps.accueil.views.view', name='index'),
+    url('^$', 'accueil.views.view', name='index'),
     # Pages de login
     login_url,
     logout_url,
@@ -37,10 +37,11 @@ if settings.DEV:
                            )
 
 for app in settings.INTRANET_APPS:
-    app = app["name"]
-    urlpatterns += patterns('', ('^%s/' % app, include('apps.%s.urls' % app,
-                                                       namespace = app,
-                                                       app_name = app)))
+    app_name = app["name"]
+    module = app.get('module', app_name)
+    urlpatterns += patterns('', ('^%s/' % app_name, include('%s.urls' % module,
+                                                       namespace = app_name,
+                                                       app_name = app_name)))
 
 # Pour une raison inconnue, ces valeurs par défaut ne sont pas définies ...
 handler404='django.views.defaults.page_not_found'

apps/prises/admin.py → prises/admin.py

 from django.contrib import admin
-from apps.prises.models import Prise
+from models import Prise
 from reversion.admin import VersionAdmin
 
 class PriseAdmin(VersionAdmin):