Set the new structure of gestioCOF

- `cof` is renamed `gestioCOF`
- `gestioncof` become `cof` (yes it looks pretty stupid but it is not)
- `bds` is created

bda/management/commands/loadbdadevdata.py

@@ -8,7 +8,7 @@ import random
 from django.utils import timezone
 from django.contrib.auth.models import User
 
-from gestioncof.management.base import MyBaseCommand
+from cof.management.base import MyBaseCommand
 from bda.models import Tirage, Spectacle, Salle, Participant, ChoixSpectacle
 from bda.views import do_tirage
 

bda/templates/resume_places.html

@@ -19,7 +19,7 @@
     <h4 class="bda-prix">Total à payer : {{ total|floatformat }}€</h4>
     <br/>
     <p>Ne manque pas un spectacle avec le
-	    <a href="{% url "gestioncof.views.calendar" %}">calendrier
+	    <a href="{% url "cof.views.calendar" %}">calendrier
 	    automatique&#8239;!</a></p>
     {% else %}
     <h3>Vous n'avez aucune place :(</h3>

bda/urls.py

@@ -5,7 +5,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 from django.conf.urls import url
-from gestioncof.decorators import buro_required
+from cof.decorators import buro_required
 from bda.views import SpectacleListView
 from bda import views
 

bda/views.py

@@ -20,7 +20,7 @@ from django.template import loader
 from django.utils import timezone
 from django.views.generic.list import ListView
 
-from gestioncof.decorators import cof_required, buro_required
+from cof.decorators import cof_required, buro_required
 from bda.models import Spectacle, Participant, ChoixSpectacle, Attribution,\
     Tirage, SpectacleRevente
 from bda.algorithm import Algorithm

bds/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

bds/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

bds/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

bds/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

cof/admin.py

@@ -7,10 +7,10 @@ from __future__ import unicode_literals
 from django import forms
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
-from gestioncof.models import SurveyQuestionAnswer, SurveyQuestion, \
+from .models import SurveyQuestionAnswer, SurveyQuestion, \
     CofProfile, EventOption, EventOptionChoice, Event, Club, CustomMail, \
     Survey, EventCommentField, EventRegistration
-from gestioncof.petits_cours_models import PetitCoursDemande, \
+from .petits_cours_models import PetitCoursDemande, \
     PetitCoursSubject, PetitCoursAbility, PetitCoursAttribution, \
     PetitCoursAttributionCounter
 from django.contrib.auth.models import User, Group, Permission
@@ -195,7 +195,7 @@ class UserProfileAdmin(UserAdmin):
             # Si le groupe COF n'était pas déjà dans la bdd
             # On lui assigne les bonnes permissions
             perms = Permission.objects.filter(
-                Q(content_type__app_label='gestioncof')
+                Q(content_type__app_label='cof')
                 | Q(content_type__app_label='bda')
                 | (Q(content_type__app_label='auth')
                    & Q(content_type__model='user')))

cof/autocomplete.py

@@ -9,8 +9,8 @@ from django.http import Http404
 from django.db.models import Q
 
 from django.contrib.auth.models import User
-from gestioncof.models import CofProfile, Clipper
+from .models import CofProfile, Clipper
-from gestioncof.decorators import buro_required
+from .decorators import buro_required
 
 
 @buro_required

cof/fixtures/gestion.json

@@ -6,7 +6,7 @@
         "survey_open": true,
         "title": "Sort du barde"
     },
-    "model": "gestioncof.survey",
+    "model": "cof.survey",
     "pk": 1
 },
 {
@@ -15,7 +15,7 @@
         "survey": 1,
         "multi_answers": true
     },
-    "model": "gestioncof.surveyquestion",
+    "model": "cof.surveyquestion",
     "pk": 1
 },
 {
@@ -24,7 +24,7 @@
         "survey": 1,
         "multi_answers": false
     },
-    "model": "gestioncof.surveyquestion",
+    "model": "cof.surveyquestion",
     "pk": 2
 },
 {
@@ -32,7 +32,7 @@
         "answer": "On l'ernestise",
         "survey_question": 1
     },
-    "model": "gestioncof.surveyquestionanswer",
+    "model": "cof.surveyquestionanswer",
     "pk": 1
 },
 {
@@ -40,7 +40,7 @@
         "answer": "On ligote",
         "survey_question": 1
     },
-    "model": "gestioncof.surveyquestionanswer",
+    "model": "cof.surveyquestionanswer",
     "pk": 2
 },
 {
@@ -48,7 +48,7 @@
         "answer": "On le prive de banquet",
         "survey_question": 1
     },
-    "model": "gestioncof.surveyquestionanswer",
+    "model": "cof.surveyquestionanswer",
     "pk": 3
 },
 {
@@ -56,7 +56,7 @@
         "answer": "Oui",
         "survey_question": 2
     },
-    "model": "gestioncof.surveyquestionanswer",
+    "model": "cof.surveyquestionanswer",
     "pk": 4
 },
 {
@@ -64,7 +64,7 @@
         "answer": "Non",
         "survey_question": 2
     },
-    "model": "gestioncof.surveyquestionanswer",
+    "model": "cof.surveyquestionanswer",
     "pk": 5
 },
 {
@@ -78,7 +78,7 @@
         "registration_open": true,
         "start_date": "2016-09-09T00:00:00Z"
     },
-    "model": "gestioncof.event",
+    "model": "cof.event",
     "pk": 1
 },
 {
@@ -88,7 +88,7 @@
         "fieldtype": "text",
         "name": "Commentaires"
     },
-    "model": "gestioncof.eventcommentfield",
+    "model": "cof.eventcommentfield",
     "pk": 1
 },
 {
@@ -97,7 +97,7 @@
         "event": 1,
         "name": "Potion magique"
     },
-    "model": "gestioncof.eventoption",
+    "model": "cof.eventoption",
     "pk": 1
 },
 {
@@ -105,7 +105,7 @@
         "event_option": 1,
         "value": "Je suis alergique"
     },
-    "model": "gestioncof.eventoptionchoice",
+    "model": "cof.eventoptionchoice",
     "pk": 1
 },
 {
@@ -113,7 +113,7 @@
         "event_option": 1,
         "value": "J'en veux"
     },
-    "model": "gestioncof.eventoptionchoice",
+    "model": "cof.eventoptionchoice",
     "pk": 2
 },
 {
@@ -121,35 +121,35 @@
         "event_option": 1,
         "value": "Je suis tomb\u00e9 dans la marmite quand j'\u00e9tais petit"
     },
-    "model": "gestioncof.eventoptionchoice",
+    "model": "cof.eventoptionchoice",
     "pk": 3
 },
 {
     "fields": {
         "name": "Bagarre"
     },
-    "model": "gestioncof.petitcourssubject",
+    "model": "cof.petitcourssubject",
     "pk": 1
 },
 {
     "fields": {
         "name": "Lancer de menhir"
     },
-    "model": "gestioncof.petitcourssubject",
+    "model": "cof.petitcourssubject",
     "pk": 2
 },
 {
     "fields": {
         "name": "Pr\u00e9paration de potions"
     },
-    "model": "gestioncof.petitcourssubject",
+    "model": "cof.petitcourssubject",
     "pk": 3
 },
 {
     "fields": {
         "name": "Chant"
     },
-    "model": "gestioncof.petitcourssubject",
+    "model": "cof.petitcourssubject",
     "pk": 4
 },
 {
@@ -171,7 +171,7 @@
         "email": "jules.cesar@polytechnique.edu",
         "processed": null
     },
-    "model": "gestioncof.petitcoursdemande",
+    "model": "cof.petitcoursdemande",
     "pk": 1
 },
 {
@@ -193,7 +193,7 @@
         "email": "jules.cesar@polytechnique.edu",
         "processed": null
     },
-    "model": "gestioncof.petitcoursdemande",
+    "model": "cof.petitcoursdemande",
     "pk": 2
 }
 ]

cof/forms.py

@@ -12,10 +12,10 @@ from django.forms.formsets import BaseFormSet, formset_factory
 from django.db.models import Max
 from django.core.validators import MinLengthValidator
 
-from gestioncof.models import CofProfile, EventCommentValue, \
+from .models import CofProfile, EventCommentValue, \
     CalendarSubscription, Club
-from gestioncof.widgets import TriStateCheckbox
+from .widgets import TriStateCheckbox
-from gestioncof.shared import lock_table, unlock_table
+from .shared import lock_table, unlock_table
 
 from bda.models import Spectacle
 

cof/management/commands/loaddevdata.py

@@ -13,8 +13,8 @@ import random
 from django.contrib.auth.models import User
 from django.core.management import call_command
 
-from gestioncof.management.base import MyBaseCommand
+from cof.management.base import MyBaseCommand
-from gestioncof.petits_cours_models import (
+from cof.petits_cours_models import (
     PetitCoursAbility, PetitCoursSubject, LEVELS_CHOICES,
     PetitCoursAttributionCounter
 )

cof/migrations/0001_initial.py

@@ -91,7 +91,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=200, verbose_name=b'Champ')),
                 ('fieldtype', models.CharField(default=b'text', max_length=10, verbose_name=b'Type', choices=[(b'text', 'Texte long'), (b'char', 'Texte court')])),
                 ('default', models.TextField(verbose_name=b'Valeur par d\xc3\xa9faut', blank=True)),
-                ('event', models.ForeignKey(related_name='commentfields', to='gestioncof.Event')),
+                ('event', models.ForeignKey(related_name='commentfields', to='cof.Event')),
             ],
             options={
                 'verbose_name': 'Champ',
@@ -102,7 +102,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('content', models.TextField(null=True, verbose_name=b'Contenu', blank=True)),
-                ('commentfield', models.ForeignKey(related_name='values', to='gestioncof.EventCommentField')),
+                ('commentfield', models.ForeignKey(related_name='values', to='cof.EventCommentField')),
             ],
         ),
         migrations.CreateModel(
@@ -111,7 +111,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('name', models.CharField(max_length=200, verbose_name=b'Option')),
                 ('multi_choices', models.BooleanField(default=False, verbose_name=b'Choix multiples')),
-                ('event', models.ForeignKey(related_name='options', to='gestioncof.Event')),
+                ('event', models.ForeignKey(related_name='options', to='cof.Event')),
             ],
             options={
                 'verbose_name': 'Option',
@@ -122,7 +122,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('value', models.CharField(max_length=200, verbose_name=b'Valeur')),
-                ('event_option', models.ForeignKey(related_name='choices', to='gestioncof.EventOption')),
+                ('event_option', models.ForeignKey(related_name='choices', to='cof.EventOption')),
             ],
             options={
                 'verbose_name': 'Choix',
@@ -133,9 +133,9 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('paid', models.BooleanField(default=False, verbose_name=b'A pay\xc3\xa9')),
-                ('event', models.ForeignKey(to='gestioncof.Event')),
+                ('event', models.ForeignKey(to='cof.Event')),
-                ('filledcomments', models.ManyToManyField(to='gestioncof.EventCommentField', through='gestioncof.EventCommentValue')),
+                ('filledcomments', models.ManyToManyField(to='cof.EventCommentField', through='cof.EventCommentValue')),
-                ('options', models.ManyToManyField(to='gestioncof.EventOptionChoice')),
+                ('options', models.ManyToManyField(to='cof.EventOptionChoice')),
                 ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
@@ -205,7 +205,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('name', models.CharField(max_length=30, verbose_name='Mati\xe8re')),
-                ('users', models.ManyToManyField(related_name='petits_cours_matieres', through='gestioncof.PetitCoursAbility', to=settings.AUTH_USER_MODEL)),
+                ('users', models.ManyToManyField(related_name='petits_cours_matieres', through='cof.PetitCoursAbility', to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name': 'Mati\xe8re de petits cours',
@@ -240,7 +240,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('question', models.CharField(max_length=200, verbose_name=b'Question')),
                 ('multi_answers', models.BooleanField(default=False, verbose_name=b'Choix multiples')),
-                ('survey', models.ForeignKey(related_name='questions', to='gestioncof.Survey')),
+                ('survey', models.ForeignKey(related_name='questions', to='cof.Survey')),
             ],
             options={
                 'verbose_name': 'Question',
@@ -251,7 +251,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('answer', models.CharField(max_length=200, verbose_name=b'R\xc3\xa9ponse')),
-                ('survey_question', models.ForeignKey(related_name='answers', to='gestioncof.SurveyQuestion')),
+                ('survey_question', models.ForeignKey(related_name='answers', to='cof.SurveyQuestion')),
             ],
             options={
                 'verbose_name': 'R\xe9ponse',
@@ -260,12 +260,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='surveyanswer',
             name='answers',
-            field=models.ManyToManyField(related_name='selected_by', to='gestioncof.SurveyQuestionAnswer'),
+            field=models.ManyToManyField(related_name='selected_by', to='cof.SurveyQuestionAnswer'),
         ),
         migrations.AddField(
             model_name='surveyanswer',
             name='survey',
-            field=models.ForeignKey(to='gestioncof.Survey'),
+            field=models.ForeignKey(to='cof.Survey'),
         ),
         migrations.AddField(
             model_name='surveyanswer',
@@ -275,7 +275,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='petitcoursdemande',
             name='matieres',
-            field=models.ManyToManyField(related_name='demandes', verbose_name='Mati\xe8res', to='gestioncof.PetitCoursSubject'),
+            field=models.ManyToManyField(related_name='demandes', verbose_name='Mati\xe8res', to='cof.PetitCoursSubject'),
         ),
         migrations.AddField(
             model_name='petitcoursdemande',
@@ -285,7 +285,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='petitcoursattributioncounter',
             name='matiere',
-            field=models.ForeignKey(verbose_name='Matiere', to='gestioncof.PetitCoursSubject'),
+            field=models.ForeignKey(verbose_name='Matiere', to='cof.PetitCoursSubject'),
         ),
         migrations.AddField(
             model_name='petitcoursattributioncounter',
@@ -295,12 +295,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='petitcoursattribution',
             name='demande',
-            field=models.ForeignKey(verbose_name='Demande', to='gestioncof.PetitCoursDemande'),
+            field=models.ForeignKey(verbose_name='Demande', to='cof.PetitCoursDemande'),
         ),
         migrations.AddField(
             model_name='petitcoursattribution',
             name='matiere',
-            field=models.ForeignKey(verbose_name='Mati\xe8re', to='gestioncof.PetitCoursSubject'),
+            field=models.ForeignKey(verbose_name='Mati\xe8re', to='cof.PetitCoursSubject'),
         ),
         migrations.AddField(
             model_name='petitcoursattribution',
@@ -310,7 +310,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='petitcoursability',
             name='matiere',
-            field=models.ForeignKey(verbose_name='Mati\xe8re', to='gestioncof.PetitCoursSubject'),
+            field=models.ForeignKey(verbose_name='Mati\xe8re', to='cof.PetitCoursSubject'),
         ),
         migrations.AddField(
             model_name='petitcoursability',
@@ -320,7 +320,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='eventcommentvalue',
             name='registration',
-            field=models.ForeignKey(related_name='comments', to='gestioncof.EventRegistration'),
+            field=models.ForeignKey(related_name='comments', to='cof.EventRegistration'),
         ),
         migrations.AlterUniqueTogether(
             name='surveyanswer',

cof/migrations/0002_enable_unprocessed_demandes.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('gestioncof', '0001_initial'),
+        ('cof', '0001_initial'),
     ]
 
     operations = [

cof/migrations/0003_event_image.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('gestioncof', '0002_enable_unprocessed_demandes'),
+        ('cof', '0002_enable_unprocessed_demandes'),
     ]
 
     operations = [

cof/migrations/0004_registration_mail.py

@@ -5,7 +5,7 @@ from django.db import migrations
 
 
 def create_mail(apps, schema_editor):
-    CustomMail = apps.get_model("gestioncof", "CustomMail")
+    CustomMail = apps.get_model("cof", "CustomMail")
     db_alias = schema_editor.connection.alias
     if CustomMail.objects.filter(shortname="bienvenue").count() == 0:
         CustomMail.objects.using(db_alias).bulk_create([
@@ -24,7 +24,7 @@ def create_mail(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('gestioncof', '0003_event_image'),
+        ('cof', '0003_event_image'),
     ]
 
     operations = [

cof/migrations/0005_encoding.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('gestioncof', '0004_registration_mail'),
+        ('cof', '0004_registration_mail'),
     ]
 
     operations = [

cof/migrations/0006_add_calendar.py

@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('bda', '0004_mails-rappel'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('gestioncof', '0005_encoding'),
+        ('cof', '0005_encoding'),
     ]
 
     operations = [

cof/migrations/0007_alter_club.py

@@ -8,7 +8,7 @@ from django.conf import settings
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('gestioncof', '0006_add_calendar'),
+        ('cof', '0006_add_calendar'),
     ]
 
     operations = [

cof/migrations/0008_py3.py

@@ -5,14 +5,14 @@ from django.db import models, migrations
 
 
 def forwards(apps, schema_editor):
-    Profile = apps.get_model("gestioncof", "CofProfile")
+    Profile = apps.get_model("cof", "CofProfile")
     Profile.objects.update(comments="")
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('gestioncof', '0007_alter_club'),
+        ('cof', '0007_alter_club'),
     ]
 
     operations = [

cof/models.py

@@ -12,7 +12,7 @@ from django.utils.encoding import python_2_unicode_compatible
 import django.utils.six as six
 from django.db.models.signals import post_save, post_delete
 
-from gestioncof.petits_cours_models import choices_length
+from .petits_cours_models import choices_length
 
 from bda.models import Spectacle
 

cof/petits_cours_views.py

@@ -19,12 +19,12 @@ from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.db.models import Min
 
-from gestioncof.models import CofProfile
+from .models import CofProfile
-from gestioncof.petits_cours_models import PetitCoursDemande, \
+from .petits_cours_models import PetitCoursDemande, \
     PetitCoursAttribution, PetitCoursAttributionCounter, PetitCoursAbility, \
     PetitCoursSubject
-from gestioncof.decorators import buro_required
+from .decorators import buro_required
-from gestioncof.shared import lock_table, unlock_tables
+from .shared import lock_table, unlock_tables
 
 from captcha.fields import ReCaptchaField
 

cof/shared.py

@@ -14,7 +14,7 @@ from django.db import connection
 from django.core.mail import send_mail
 from django.template import Template, Context
 
-from gestioncof.models import CofProfile, CustomMail
+from .models import CofProfile, CustomMail
 
 User = get_user_model()
 

cof/templates/base_header.html

@@ -3,7 +3,7 @@
 {% block content %}
 <header>
     <div class="container banner">
-        <a href="{% url "gestioncof.views.home" %}">
+        <a href="{% url "cof.views.home" %}">
             <h1>GestioCOF</h1>
             {% block homelink %}
             <span class="glyphicon glyphicon-home" aria-hidden=true></span>
@@ -11,7 +11,7 @@
         </a>
         <div class="secondary">
             <span class="hidden-xxs">&nbsp;&nbsp;|&nbsp; </span>
-            <span><a href="{% url "gestioncof.views.logout" %}">Se déconnecter&nbsp;<span class="glyphicon glyphicon-log-out"></span></a></span>
+            <span><a href="{% url "cof.views.logout" %}">Se déconnecter&nbsp;<span class="glyphicon glyphicon-log-out"></span></a></span>
         </div>
         <h2 class="member-status">{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, {% if user.profile.is_cof %}<tt class="user-is-cof">au COF{% else %}<tt class="user-is-not-cof">non-COF{% endif %}</tt></h2>
     </div><!-- /.container -->

cof/templates/cof/calendar_subscription.html

@@ -20,7 +20,7 @@ souscrire aux événements du COF et/ou aux spectacles BdA.
 
 {% if token %}
 <p>Votre calendrier (compatible avec toutes les applications d'agenda) se trouve à
-<a href="{% url 'gestioncof.views.calendar_ics' token %}">cette adresse</a>.</p>
+<a href="{% url 'cof.views.calendar_ics' token %}">cette adresse</a>.</p>
 
 <ul>
     <li>Pour l'ajouter à Thunderbird (lightning), il faut copier ce lien et aller

cof/templates/cof/utile_cof.html

@@ -0,0 +1,24 @@
+{% extends "base_title.html" %}
+
+{% block homelink %}
+{% endblock %}
+
+{% block realcontent %}
+                <h2>Liens utiles du COF</h2>
+                <h3>COF</h3>
+                <ul>
+                <li><a href="{% url 'cof.views.export_members' %}">Export des membres du COF</a></li>
+                <li><a href="{% url 'cof.views.liste_diffcof' %}">Diffusion COF</a></li> 
+                </ul>
+
+                <h3>Mega</h3>
+                <ul>
+                <li><a href="{% url 'cof.views.export_mega_participants' %}">Export des non-orgas uniquement</a></li>
+		  <li><a href="{% url 'cof.views.export_mega_orgas' %}">Export des orgas uniquement</a></li>
+		  <li><a href="{% url 'cof.views.export_mega' %}">Export de tout le monde</a></li>
+                </ul>
+
+                <p>Note&nbsp;: pour ouvrir les fichiers .csv avec Excel, il faut
+                passer par <tt>Fichier &gt; Importer</tt> et sélectionner la
+                virgule comme séparateur.</p> 
+{% endblock %}

cof/templates/demande-petit-cours-raw.html

@@ -1,7 +1,7 @@
 {% if success %}
 <p class="success">Votre demande a été enregistrée avec succès !</p>
 {% else %}
-<form id="demandecours" method="post" action="{% url "gestioncof.petits_cours_views.demande_raw" %}">
+<form id="demandecours" method="post" action="{% url "cof.petits_cours_views.demande_raw" %}">
     {% csrf_token %}
     <table>
     {{ form.as_table }}

cof/templates/demande-petit-cours.html

@@ -5,7 +5,7 @@
                 {% if success %}
                 <p class="success">Votre demande a été enregistrée avec succès !</p>
                 {% else %}
-                <form id="demandecours" method="post" action="{% url "gestioncof.petits_cours_views.demande" %}">
+                <form id="demandecours" method="post" action="{% url "cof.petits_cours_views.demande" %}">
                 {% csrf_token %}
                 <table>
                 {{ form.as_table }}

cof/templates/event.html

@@ -8,7 +8,7 @@
                 {% if event.details %}
                 <p>{{ event.details }}</p>
                 {% endif %}
-                <form method="post" action="{% url 'gestioncof.views.event' event.id %}">
+                <form method="post" action="{% url 'cof.views.event' event.id %}">
                 {% csrf_token %}
                 {{ form.as_p }}
                 <input type="submit" class="btn-submit" value="Enregistrer" />

cof/templates/event_status.html

@@ -4,14 +4,14 @@
 {% block page_size %}col-sm-8{% endblock %}
 
 {% block realcontent %}
-<h2>Événement: {{ event.title }}{% if user.is_staff %} <a class="title-link" href="{% url 'admin:gestioncof_event_change' event.id %}"><span class="glyphicon glyphicon-link"></span> Administration</a>{% endif %}</h2>
+<h2>Événement: {{ event.title }}{% if user.is_staff %} <a class="title-link" href="{% url 'admin:cof_event_change' event.id %}"><span class="glyphicon glyphicon-link"></span> Administration</a>{% endif %}</h2>
                 {% if event.details %}
                 <p>{{ event.details }}</p>
                 <hr/>
                 {% endif %}
                 {% include "tristate_js.html" %}
                 <h3>Filtres</h3>
-                <form method="post" action="{% url 'gestioncof.views.event_status' event.id %}">
+                <form method="post" action="{% url 'cof.views.event_status' event.id %}">
                 {% csrf_token %}
                 {{ form.as_p }}
                 <input style="margin-top:10px;" type="submit" class="btn btn-primary" value="Filtrer" />

cof/templates/home.html

@@ -13,7 +13,7 @@
             <div class="hm-block">
                 <ul>
                 {% for event in open_events %}
-                    <li><a href="{% url "gestioncof.views.event" event.id %}">{{ event.title }}</a></li>
+                    <li><a href="{% url "cof.views.event" event.id %}">{{ event.title }}</a></li>
                 {% endfor %}
                 </ul>
             </div>
@@ -23,7 +23,7 @@
             <div class="hm-block">
                 <ul>
                 {% for survey in open_surveys %}
-                    <li><a href="{% url "gestioncof.views.survey" survey.id %}">{{ survey.title }}</a></li>
+                    <li><a href="{% url "cof.views.survey" survey.id %}">{{ survey.title }}</a></li>
                 {% endfor %}
                 </ul>
             </div>
@@ -54,10 +54,10 @@
             <h3 class="block-title">Divers<span class="pull-right glyphicon glyphicon-question-sign"></span></h3>
             <div class="hm-block">
                 <ul>
-                    <li><a href="{% url "gestioncof.views.calendar" %}">Calendrier dynamique</a></li>
+                    <li><a href="{% url "cof.views.calendar" %}">Calendrier dynamique</a></li>
                     {% if user.profile.is_cof %}<li><a href="{% url "petits-cours-inscription" %}">Inscription pour donner des petits cours</a></li>{% endif %}
                     
-                    <li><a href="{% url "gestioncof.views.profile" %}">Éditer mon profil</a></li>
+                    <li><a href="{% url "cof.views.profile" %}">Éditer mon profil</a></li>
                     {% if not user.profile.login_clipper %}<li><a href="{% url "django.contrib.auth.views.password_change" %}">Changer mon mot de passe</a></li>{% endif %}
                 </ul>
             </div>
@@ -71,16 +71,16 @@
                     <h4>Général</h4>
                     <li><a href="{% url "admin:index" %}">Administration générale</a></li>
                     <li><a href="{% url "petits-cours-demandes-list" %}">Demandes de petits cours</a></li>
-                    <li><a href="{% url "gestioncof.views.registration" %}">Inscription d'un nouveau membre</a></li>
+                    <li><a href="{% url "cof.views.registration" %}">Inscription d'un nouveau membre</a></li>
                     <li><a href="{% url "liste-clubs" %}">Gestion des clubs</a></li>
                 </ul>
                 <ul>
                     <h4>Évènements & Sondages</h4>
                     {% for event in events %}
-                        <li><a href="{% url "gestioncof.views.event_status" event.id %}">Événement : {{ event.title }}</a></li>
+                        <li><a href="{% url "cof.views.event_status" event.id %}">Événement : {{ event.title }}</a></li>
                     {% endfor %}
                     {% for survey in surveys %}
-                        <li><a href="{% url "gestioncof.views.survey_status" survey.id %}">Sondage : {{ survey.title }}</a></li>
+                        <li><a href="{% url "cof.views.survey_status" survey.id %}">Sondage : {{ survey.title }}</a></li>
                     {% endfor %}
                     </ul>
             </div>
@@ -105,8 +105,8 @@
             <h3 class="block-title">Liens utiles<span class="pull-right glyphicon glyphicon-link"></span></h3>
             <div class="hm-block">
                 <ul>
-                    <li><a href="{% url "gestioncof.views.utile_cof" %}">Liens utiles du COF</a></li>
+                    <li><a href="{% url "cof.views.utile_cof" %}">Liens utiles du COF</a></li>
-                    <li><a href="{% url "gestioncof.views.utile_bda" %}">Liens utiles BdA</a></li>
+                    <li><a href="{% url "cof.views.utile_bda" %}">Liens utiles BdA</a></li>
                 </ul>
             </div>
         </div>

cof/templates/login.html

@@ -15,7 +15,7 @@
             <p class="error">Identifiants incorrects.</p>
             {% endif %} 
             <form class="form-horizontal" method="post"
-                action="{% url 'gestioncof.views.login_ext' %}?next={{ next|urlencode }}">
+                action="{% url 'cof.views.login_ext' %}?next={{ next|urlencode }}">
             {% csrf_token %}
             <div class="form-group">
                 <input class="form-control" id="id_username" maxlength="254" name="username" type="text" placeholder="Nom d'utilisateur">

cof/templates/login_switch.html

@@ -18,7 +18,7 @@
                 </div>
             </a>
             <a  aria-label="Extérieur" 
-                    href="{% url 'gestioncof.views.login_ext' %}?next={{ next|urlencode }}">
+                    href="{% url 'cof.views.login_ext' %}?next={{ next|urlencode }}">
                 <div class="col-xs-12 col-sm-6" id="login_outsider">
                     Extérieur
                 </div>

cof/templates/profile.html

@@ -8,7 +8,7 @@
                 {% if success %}
                 <p class="success">Votre profil a été mis à jour avec succès !</p>
                 {% endif %}
-                <form id="profile form-horizontal"  method="post" action="{% url 'gestioncof.views.profile' %}">
+                <form id="profile form-horizontal"  method="post" action="{% url 'cof.views.profile' %}">
                     <div class="row" style="margin: 0 15%;">
                             {% csrf_token %}
                             <fieldset"center-block">

cof/templates/registration.html

@@ -17,7 +17,7 @@
         // On attend que la page soit prête pour executer le code
         $(document).ready(function() {
             $('input#search_autocomplete').yourlabsAutocomplete({
-                url: '{% url 'gestioncof.autocomplete.autocomplete' %}',
+                url: '{% url 'cof.autocomplete.autocomplete' %}',
                 minimumCharacters: 1,
                 id: 'search_autocomplete',
                 choiceSelector: 'li:has(a)',

cof/templates/registration/password_change_done.html

@@ -5,5 +5,5 @@
 
 {% block realcontent %}
                 <h2>Mot de passe modifié avec succès !</h2>
-		        <h3><a href="{% url "gestioncof.views.home" %}">Retour au menu principal</a></h3>
+		        <h3><a href="{% url "cof.views.home" %}">Retour au menu principal</a></h3>
 {% endblock %}

cof/templates/registration_form.html

@@ -7,7 +7,7 @@
     {% else %}
         <h3>Inscription d'un nouveau compte (extérieur ?)</h3>
     {% endif %}
-    <form role="form" id="profile" method="post" action="{% url 'gestioncof.views.registration' %}">
+    <form role="form" id="profile" method="post" action="{% url 'cof.views.registration' %}">
         {% csrf_token %}
         <table>
             {{ user_form | bootstrap }}

cof/templates/survey.html

@@ -15,7 +15,7 @@
         {% if survey.details %}
             <p>{{ survey.details }}</p>
         {% endif %}
-        <form class="form-horizontal" method="post" action="{% url 'gestioncof.views.survey' survey.id %}">
+        <form class="form-horizontal" method="post" action="{% url 'cof.views.survey' survey.id %}">
         {% csrf_token %}
         {{ form | bootstrap}}
 

cof/templates/survey_status.html

@@ -4,14 +4,14 @@
 {% block page_size %}col-sm-8{% endblock %}
 
 {% block realcontent %}
-<h2>Sondage: {{ survey.title }}{% if user.is_staff %} <a class="title-link" href="{% url 'admin:gestioncof_survey_change' survey.id %}"><span class="glyphicon glyphicon-link" aria-hidden="true"></span> Administration</a>{% endif %}</h2>
+<h2>Sondage: {{ survey.title }}{% if user.is_staff %} <a class="title-link" href="{% url 'admin:cof_survey_change' survey.id %}"><span class="glyphicon glyphicon-link" aria-hidden="true"></span> Administration</a>{% endif %}</h2>
                 {% if survey.details %}
                 <p>{{ survey.details }}</p>
                 <hr/>
                 {% endif %}
                 <h3>Filtres</h3>
                 {% include "tristate_js.html" %}
-                <form method="post" action="{% url 'gestioncof.views.survey_status' survey.id %}">
+                <form method="post" action="{% url 'cof.views.survey_status' survey.id %}">
                 {% csrf_token %}
                 {{ form.as_p }}
                 <input style="margin-top:10px;" type="submit" class="btn btn-primary" value="Filtrer" />

cof/templates/utile_bda.html

@@ -7,7 +7,7 @@
                 <h2>Liens utiles du BdA</h2>
                 <h3>Listes mail</h3>
                 <ul>
-                 <li><a href="{% url 'gestioncof.views.liste_bdadiff' %}">BdA diffusion</a></li> 
+                 <li><a href="{% url 'cof.views.liste_bdadiff' %}">BdA diffusion</a></li> 
-                 <li><a href="{% url 'gestioncof.views.liste_bdarevente' %}">BdA revente</a></li>
+                 <li><a href="{% url 'cof.views.liste_bdarevente' %}">BdA revente</a></li>
                 </ul>
 {% endblock %}