Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

cof/settings_dev.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = (
     'captcha',
     'django_cas_ng',
     'debug_toolbar',
+    'bootstrapform',
 )
 
 MIDDLEWARE_CLASSES = (

cof/urls.py

@@ -5,23 +5,28 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import TemplateView
 
 import autocomplete_light
 
+from django.contrib.auth import views as django_views
+from django_cas_ng import views as django_cas_views
+from gestioncof import views as gestioncof_views, csv_views
 from gestioncof.urls import export_patterns, petitcours_patterns, \
-    surveys_patterns, events_patterns
+    surveys_patterns, events_patterns, calendar_patterns, \
+    clubs_patterns
+
+from gestioncof.autocomplete import autocomplete
 
 autocomplete_light.autodiscover()
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # Page d'accueil
-    url(r'^$', 'gestioncof.views.home', name='home'),
+    url(r'^$', gestioncof_views.home, name='home'),
     # Le BdA
     url(r'^bda/', include('bda.urls')),
     # Les exports
@@ -32,50 +37,51 @@ urlpatterns = patterns(
     url(r'^survey/', include(surveys_patterns)),
     # Evenements
     url(r'^event/', include(events_patterns)),
+    # Calendrier
+    url(r'^calendar/', include(calendar_patterns)),
+    # Clubs
+    url(r'^clubs/', include(clubs_patterns)),
     # Authentification
     url(r'^cof/denied$', TemplateView.as_view(template_name='cof-denied.html'),
         name="cof-denied"),
-    url(r'^cas/login$', 'django_cas_ng.views.login', name="cas_login_view"),
-    url(r'^cas/logout$', 'django_cas_ng.views.logout'),
-    url(r'^outsider/login$', 'gestioncof.views.login_ext'),
-    url(r'^outsider/logout$', 'django.contrib.auth.views.logout',
-        {'next_page': 'home'}),
-    url(r'^login$', 'gestioncof.views.login'),
-    url(r'^logout$', 'gestioncof.views.logout'),
+    url(r'^cas/login$', django_cas_views.login, name="cas_login_view"),
+    url(r'^cas/logout$', django_cas_views.logout),
+    url(r'^outsider/login$', gestioncof_views.login_ext),
+    url(r'^outsider/logout$', django_views.logout, {'next_page': 'home'}),
+    url(r'^login$', gestioncof_views.login),
+    url(r'^logout$', gestioncof_views.logout),
     # Infos persos
-    url(r'^profile$', 'gestioncof.views.profile'),
-    url(r'^outsider/password-change$',
-        'django.contrib.auth.views.password_change'),
+    url(r'^profile$', gestioncof_views.profile),
+    url(r'^outsider/password-change$', django_views.password_change),
     url(r'^outsider/password-change-done$',
-        'django.contrib.auth.views.password_change_done',
+        django_views.password_change_done,
         name='password_change_done'),
     # Inscription d'un nouveau membre
-    url(r'^registration$', 'gestioncof.views.registration'),
+    url(r'^registration$', gestioncof_views.registration),
     url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$',
-        'gestioncof.views.registration_form2', name="clipper-registration"),
+        gestioncof_views.registration_form2, name="clipper-registration"),
     url(r'^registration/user/(?P<username>.+)$',
-        'gestioncof.views.registration_form2', name="user-registration"),
-    url(r'^registration/empty$', 'gestioncof.views.registration_form2',
+        gestioncof_views.registration_form2, name="user-registration"),
+    url(r'^registration/empty$', gestioncof_views.registration_form2,
         name="empty-registration"),
     # Autocompletion
-    url(r'^autocomplete/registration$',
-        'gestioncof.autocomplete.autocomplete'),
+    url(r'^autocomplete/registration$', autocomplete),
     url(r'^autocomplete/', include('autocomplete_light.urls')),
     # Interface admin
-    url(r'^admin/logout/', 'gestioncof.views.logout'),
+    url(r'^admin/logout/', gestioncof_views.logout),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/(?P<app_label>[\d\w]+)/(?P<model_name>[\d\w]+)/csv/',
-        'gestioncof.csv_views.admin_list_export',
+        csv_views.admin_list_export,
         {'fields': ['username', ]}),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^grappelli/', include('grappelli.urls')),
     # Liens utiles du COF et du BdA
-    url(r'^utile_cof$', 'gestioncof.views.utile_cof'),
-    url(r'^utile_bda$', 'gestioncof.views.utile_bda'),
-    url(r'^utile_bda/bda_diff$', 'gestioncof.views.liste_bdadiff'),
-    url(r'^utile_cof/diff_cof$', 'gestioncof.views.liste_diffcof'),
-    url(r'^utile_bda/bda_revente$', 'gestioncof.views.liste_bdarevente'),
-) + \
+    url(r'^utile_cof$', gestioncof_views.utile_cof),
+    url(r'^utile_bda$', gestioncof_views.utile_bda),
+    url(r'^utile_bda/bda_diff$', gestioncof_views.liste_bdadiff),
+    url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof),
+    url(r'^utile_bda/bda_revente$', gestioncof_views.liste_bdarevente),
+] + \
     (static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
      if settings.DEBUG
      else [])