diff --git a/bda/management/commands/loadbdadevdata.py b/bda/management/commands/loadbdadevdata.py
index a8e3f298..a8851e3d 100644
--- a/bda/management/commands/loadbdadevdata.py
+++ b/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
diff --git a/bda/templates/resume_places.html b/bda/templates/resume_places.html
index 614a1656..1449473a 100644
--- a/bda/templates/resume_places.html
+++ b/bda/templates/resume_places.html
@@ -19,7 +19,7 @@
Total à payer : {{ total|floatformat }}€
Ne manque pas un spectacle avec le
- calendrier
+ calendrier
automatique !
{% else %}
Vous n'avez aucune place :(
diff --git a/bda/urls.py b/bda/urls.py
index bbbf8e39..8088dd8a 100644
--- a/bda/urls.py
+++ b/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
diff --git a/bda/views.py b/bda/views.py
index 1a864c7f..18fdc3bc 100644
--- a/bda/views.py
+++ b/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
diff --git a/cof/locale/__init__.py b/bds/__init__.py
similarity index 100%
rename from cof/locale/__init__.py
rename to bds/__init__.py
diff --git a/bds/admin.py b/bds/admin.py
new file mode 100644
index 00000000..8c38f3f3
--- /dev/null
+++ b/bds/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/cof/locale/fr/__init__.py b/bds/migrations/__init__.py
similarity index 100%
rename from cof/locale/fr/__init__.py
rename to bds/migrations/__init__.py
diff --git a/bds/models.py b/bds/models.py
new file mode 100644
index 00000000..71a83623
--- /dev/null
+++ b/bds/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/bds/tests.py b/bds/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/bds/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/bds/views.py b/bds/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/bds/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/gestioncof/admin.py b/cof/admin.py
similarity index 98%
rename from gestioncof/admin.py
rename to cof/admin.py
index eb8ad6c0..4ef9ef66 100644
--- a/gestioncof/admin.py
+++ b/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')))
diff --git a/gestioncof/autocomplete.py b/cof/autocomplete.py
similarity index 95%
rename from gestioncof/autocomplete.py
rename to cof/autocomplete.py
index ed0a1e5a..38dea4a2 100644
--- a/gestioncof/autocomplete.py
+++ b/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 gestioncof.decorators import buro_required
+from .models import CofProfile, Clipper
+from .decorators import buro_required
@buro_required
diff --git a/gestioncof/autocomplete_light_registry.py b/cof/autocomplete_light_registry.py
similarity index 100%
rename from gestioncof/autocomplete_light_registry.py
rename to cof/autocomplete_light_registry.py
diff --git a/gestioncof/csv_views.py b/cof/csv_views.py
similarity index 100%
rename from gestioncof/csv_views.py
rename to cof/csv_views.py
diff --git a/gestioncof/decorators.py b/cof/decorators.py
similarity index 100%
rename from gestioncof/decorators.py
rename to cof/decorators.py
diff --git a/gestioncof/fixtures/gestion.json b/cof/fixtures/gestion.json
similarity index 78%
rename from gestioncof/fixtures/gestion.json
rename to cof/fixtures/gestion.json
index ae6466f8..6d1bd76f 100644
--- a/gestioncof/fixtures/gestion.json
+++ b/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
}
]
diff --git a/gestioncof/fixtures/sites.json b/cof/fixtures/sites.json
similarity index 100%
rename from gestioncof/fixtures/sites.json
rename to cof/fixtures/sites.json
diff --git a/gestioncof/forms.py b/cof/forms.py
similarity index 99%
rename from gestioncof/forms.py
rename to cof/forms.py
index 3a519a39..9c340053 100644
--- a/gestioncof/forms.py
+++ b/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 gestioncof.shared import lock_table, unlock_table
+from .widgets import TriStateCheckbox
+from .shared import lock_table, unlock_table
from bda.models import Spectacle
diff --git a/gestioncof/management/base.py b/cof/management/base.py
similarity index 100%
rename from gestioncof/management/base.py
rename to cof/management/base.py
diff --git a/gestioncof/management/commands/loaddevdata.py b/cof/management/commands/loaddevdata.py
similarity index 97%
rename from gestioncof/management/commands/loaddevdata.py
rename to cof/management/commands/loaddevdata.py
index 77bfc606..4627c2d0 100644
--- a/gestioncof/management/commands/loaddevdata.py
+++ b/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 gestioncof.petits_cours_models import (
+from cof.management.base import MyBaseCommand
+from cof.petits_cours_models import (
PetitCoursAbility, PetitCoursSubject, LEVELS_CHOICES,
PetitCoursAttributionCounter
)
diff --git a/gestioncof/management/data/gaulois.json b/cof/management/data/gaulois.json
similarity index 100%
rename from gestioncof/management/data/gaulois.json
rename to cof/management/data/gaulois.json
diff --git a/gestioncof/management/data/romains.json b/cof/management/data/romains.json
similarity index 100%
rename from gestioncof/management/data/romains.json
rename to cof/management/data/romains.json
diff --git a/gestioncof/migrations/0001_initial.py b/cof/migrations/0001_initial.py
similarity index 94%
rename from gestioncof/migrations/0001_initial.py
rename to cof/migrations/0001_initial.py
index b942645d..0540e689 100644
--- a/gestioncof/migrations/0001_initial.py
+++ b/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')),
- ('filledcomments', models.ManyToManyField(to='gestioncof.EventCommentField', through='gestioncof.EventCommentValue')),
- ('options', models.ManyToManyField(to='gestioncof.EventOptionChoice')),
+ ('event', models.ForeignKey(to='cof.Event')),
+ ('filledcomments', models.ManyToManyField(to='cof.EventCommentField', through='cof.EventCommentValue')),
+ ('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',
diff --git a/gestioncof/migrations/0002_enable_unprocessed_demandes.py b/cof/migrations/0002_enable_unprocessed_demandes.py
similarity index 91%
rename from gestioncof/migrations/0002_enable_unprocessed_demandes.py
rename to cof/migrations/0002_enable_unprocessed_demandes.py
index 18006588..43fca7ae 100644
--- a/gestioncof/migrations/0002_enable_unprocessed_demandes.py
+++ b/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 = [
diff --git a/gestioncof/migrations/0003_event_image.py b/cof/migrations/0003_event_image.py
similarity index 87%
rename from gestioncof/migrations/0003_event_image.py
rename to cof/migrations/0003_event_image.py
index 6d65b1a6..2f967f6a 100644
--- a/gestioncof/migrations/0003_event_image.py
+++ b/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 = [
diff --git a/gestioncof/migrations/0004_registration_mail.py b/cof/migrations/0004_registration_mail.py
similarity index 91%
rename from gestioncof/migrations/0004_registration_mail.py
rename to cof/migrations/0004_registration_mail.py
index d72900bf..03685f3d 100644
--- a/gestioncof/migrations/0004_registration_mail.py
+++ b/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 = [
diff --git a/gestioncof/migrations/0005_encoding.py b/cof/migrations/0005_encoding.py
similarity index 97%
rename from gestioncof/migrations/0005_encoding.py
rename to cof/migrations/0005_encoding.py
index 4f565a5d..5b25cc2e 100644
--- a/gestioncof/migrations/0005_encoding.py
+++ b/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 = [
diff --git a/gestioncof/migrations/0006_add_calendar.py b/cof/migrations/0006_add_calendar.py
similarity index 97%
rename from gestioncof/migrations/0006_add_calendar.py
rename to cof/migrations/0006_add_calendar.py
index 004d3602..3009ac4d 100644
--- a/gestioncof/migrations/0006_add_calendar.py
+++ b/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 = [
diff --git a/gestioncof/migrations/0007_alter_club.py b/cof/migrations/0007_alter_club.py
similarity index 97%
rename from gestioncof/migrations/0007_alter_club.py
rename to cof/migrations/0007_alter_club.py
index 324c59a6..ca1a6d0b 100644
--- a/gestioncof/migrations/0007_alter_club.py
+++ b/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 = [
diff --git a/gestioncof/migrations/0008_py3.py b/cof/migrations/0008_py3.py
similarity index 98%
rename from gestioncof/migrations/0008_py3.py
rename to cof/migrations/0008_py3.py
index 7d94d7ce..612d06ac 100644
--- a/gestioncof/migrations/0008_py3.py
+++ b/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 = [
diff --git a/gestioncof/__init__.py b/cof/migrations/__init__.py
similarity index 100%
rename from gestioncof/__init__.py
rename to cof/migrations/__init__.py
diff --git a/gestioncof/models.py b/cof/models.py
similarity index 99%
rename from gestioncof/models.py
rename to cof/models.py
index 01798180..7a9c3fe4 100644
--- a/gestioncof/models.py
+++ b/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
diff --git a/gestioncof/petits_cours_models.py b/cof/petits_cours_models.py
similarity index 100%
rename from gestioncof/petits_cours_models.py
rename to cof/petits_cours_models.py
diff --git a/gestioncof/petits_cours_views.py b/cof/petits_cours_views.py
similarity index 98%
rename from gestioncof/petits_cours_views.py
rename to cof/petits_cours_views.py
index ee71d1a9..9dc8a576 100644
--- a/gestioncof/petits_cours_views.py
+++ b/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 gestioncof.petits_cours_models import PetitCoursDemande, \
+from .models import CofProfile
+from .petits_cours_models import PetitCoursDemande, \
PetitCoursAttribution, PetitCoursAttributionCounter, PetitCoursAbility, \
PetitCoursSubject
-from gestioncof.decorators import buro_required
-from gestioncof.shared import lock_table, unlock_tables
+from .decorators import buro_required
+from .shared import lock_table, unlock_tables
from captcha.fields import ReCaptchaField
diff --git a/gestioncof/shared.py b/cof/shared.py
similarity index 98%
rename from gestioncof/shared.py
rename to cof/shared.py
index 8fe17d43..7c8b089b 100644
--- a/gestioncof/shared.py
+++ b/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()
diff --git a/gestioncof/static/css/bootstrap.min.css b/cof/static/css/bootstrap.min.css
similarity index 100%
rename from gestioncof/static/css/bootstrap.min.css
rename to cof/static/css/bootstrap.min.css
diff --git a/gestioncof/static/css/bootstrap.min.css.map b/cof/static/css/bootstrap.min.css.map
similarity index 100%
rename from gestioncof/static/css/bootstrap.min.css.map
rename to cof/static/css/bootstrap.min.css.map
diff --git a/gestioncof/static/css/cof.css b/cof/static/css/cof.css
similarity index 100%
rename from gestioncof/static/css/cof.css
rename to cof/static/css/cof.css
diff --git a/gestioncof/static/css/droidserif.woff b/cof/static/css/droidserif.woff
similarity index 100%
rename from gestioncof/static/css/droidserif.woff
rename to cof/static/css/droidserif.woff
diff --git a/gestioncof/static/fonts/glyphicons-halflings-regular.eot b/cof/static/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from gestioncof/static/fonts/glyphicons-halflings-regular.eot
rename to cof/static/fonts/glyphicons-halflings-regular.eot
diff --git a/gestioncof/static/fonts/glyphicons-halflings-regular.svg b/cof/static/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from gestioncof/static/fonts/glyphicons-halflings-regular.svg
rename to cof/static/fonts/glyphicons-halflings-regular.svg
diff --git a/gestioncof/static/fonts/glyphicons-halflings-regular.ttf b/cof/static/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from gestioncof/static/fonts/glyphicons-halflings-regular.ttf
rename to cof/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/gestioncof/static/fonts/glyphicons-halflings-regular.woff b/cof/static/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from gestioncof/static/fonts/glyphicons-halflings-regular.woff
rename to cof/static/fonts/glyphicons-halflings-regular.woff
diff --git a/gestioncof/static/fonts/glyphicons-halflings-regular.woff2 b/cof/static/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from gestioncof/static/fonts/glyphicons-halflings-regular.woff2
rename to cof/static/fonts/glyphicons-halflings-regular.woff2
diff --git a/gestioncof/static/images/no.png b/cof/static/images/no.png
similarity index 100%
rename from gestioncof/static/images/no.png
rename to cof/static/images/no.png
diff --git a/gestioncof/static/images/none.png b/cof/static/images/none.png
similarity index 100%
rename from gestioncof/static/images/none.png
rename to cof/static/images/none.png
diff --git a/gestioncof/static/images/yes.png b/cof/static/images/yes.png
similarity index 100%
rename from gestioncof/static/images/yes.png
rename to cof/static/images/yes.png
diff --git a/gestioncof/static/js/bootstrap.min.js b/cof/static/js/bootstrap.min.js
similarity index 100%
rename from gestioncof/static/js/bootstrap.min.js
rename to cof/static/js/bootstrap.min.js
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/LICENSE b/cof/static/js/joequery-Stupid-Table-Plugin/LICENSE
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/LICENSE
rename to cof/static/js/joequery-Stupid-Table-Plugin/LICENSE
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/README.md b/cof/static/js/joequery-Stupid-Table-Plugin/README.md
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/README.md
rename to cof/static/js/joequery-Stupid-Table-Plugin/README.md
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/basic.html b/cof/static/js/joequery-Stupid-Table-Plugin/examples/basic.html
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/basic.html
rename to cof/static/js/joequery-Stupid-Table-Plugin/examples/basic.html
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/colspan.html b/cof/static/js/joequery-Stupid-Table-Plugin/examples/colspan.html
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/colspan.html
rename to cof/static/js/joequery-Stupid-Table-Plugin/examples/colspan.html
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/complex.html b/cof/static/js/joequery-Stupid-Table-Plugin/examples/complex.html
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/complex.html
rename to cof/static/js/joequery-Stupid-Table-Plugin/examples/complex.html
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/large-table.html b/cof/static/js/joequery-Stupid-Table-Plugin/examples/large-table.html
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/examples/large-table.html
rename to cof/static/js/joequery-Stupid-Table-Plugin/examples/large-table.html
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/stupidtable.js b/cof/static/js/joequery-Stupid-Table-Plugin/stupidtable.js
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/stupidtable.js
rename to cof/static/js/joequery-Stupid-Table-Plugin/stupidtable.js
diff --git a/gestioncof/static/js/joequery-Stupid-Table-Plugin/stupidtable.min.js b/cof/static/js/joequery-Stupid-Table-Plugin/stupidtable.min.js
similarity index 100%
rename from gestioncof/static/js/joequery-Stupid-Table-Plugin/stupidtable.min.js
rename to cof/static/js/joequery-Stupid-Table-Plugin/stupidtable.min.js
diff --git a/gestioncof/static/js/jquery.min.js b/cof/static/js/jquery.min.js
similarity index 100%
rename from gestioncof/static/js/jquery.min.js
rename to cof/static/js/jquery.min.js
diff --git a/gestioncof/templates/404.html b/cof/templates/404.html
similarity index 100%
rename from gestioncof/templates/404.html
rename to cof/templates/404.html
diff --git a/gestioncof/templates/500.html b/cof/templates/500.html
similarity index 100%
rename from gestioncof/templates/500.html
rename to cof/templates/500.html
diff --git a/gestioncof/templates/admin/base_site.html b/cof/templates/admin/base_site.html
similarity index 100%
rename from gestioncof/templates/admin/base_site.html
rename to cof/templates/admin/base_site.html
diff --git a/gestioncof/templates/admin/index.html b/cof/templates/admin/index.html
similarity index 100%
rename from gestioncof/templates/admin/index.html
rename to cof/templates/admin/index.html
diff --git a/gestioncof/templates/autocomplete_user.html b/cof/templates/autocomplete_user.html
similarity index 100%
rename from gestioncof/templates/autocomplete_user.html
rename to cof/templates/autocomplete_user.html
diff --git a/gestioncof/templates/base.html b/cof/templates/base.html
similarity index 100%
rename from gestioncof/templates/base.html
rename to cof/templates/base.html
diff --git a/gestioncof/templates/base_header.html b/cof/templates/base_header.html
similarity index 78%
rename from gestioncof/templates/base_header.html
rename to cof/templates/base_header.html
index baaa24b6..801783e8 100644
--- a/gestioncof/templates/base_header.html
+++ b/cof/templates/base_header.html
@@ -3,7 +3,7 @@
{% block content %}