diff --git a/bda/templates/inscription-bda.html b/bda/templates/inscription-bda.html index 8ee08dc9..f760f1b1 100644 --- a/bda/templates/inscription-bda.html +++ b/bda/templates/inscription-bda.html @@ -98,7 +98,7 @@ var django = { {% if stateerror %}

Impossible d'enregistrer vos modifications: vous avez apporté d'autres modifications entre temps

{% endif %} -
+ {% csrf_token %} {% include "inscription-formset.html" %} diff --git a/cof/urls.py b/cof/urls.py index 991fb72f..b5163952 100644 --- a/cof/urls.py +++ b/cof/urls.py @@ -42,32 +42,18 @@ urlpatterns = patterns('', url(r'^petitcours/demandes/(?P\d+)$', 'gestioncof.petits_cours_views.details', name = 'petits-cours-demande-details'), url(r'^petitcours/demandes/(?P\d+)/traitement$', 'gestioncof.petits_cours_views.traitement', name = 'petits-cours-demande-traitement'), url(r'^petitcours/demandes/(?P\d+)/retraitement$', 'gestioncof.petits_cours_views.retraitement', name = 'petits-cours-demande-retraitement'), - url(r'^bda/inscription$', 'bda.views.inscription', name = 'bda-tirage-inscription'), - url(r'^bda2/inscription$', 'bda2.views.inscription', name = 'bda2-tirage-inscription'), - url(r'^bda3/inscription$', 'bda3.views.inscription', name = 'bda3-tirage-inscription'), - url(r'^bda/places$', 'bda.views.places', name = "bda-places-attribuees"), - url(r'^bda/places/places_bda.ics$', 'bda.views.places_ics', name = "bda-places-attribuees-ics"), - url(r'^bda2/places$', 'bda2.views.places', name = "bda2-places-attribuees"), - url(r'^bda3/places$', 'bda3.views.places', name = "bda3-places-attribuees"), + + url(r'^bda/inscription/(?P\d+)$', 'bda.views.inscription', name = 'bda-tirage-inscription'), + url(r'^bda/places/(?P\d+)$', 'bda.views.places', name = "bda-places-attribuees"), + url(r'^bda/places/(?P\d+)/places_bda.ics$', 'bda.views.places_ics', name = "bda-places-attribuees-ics"), url(r'^bda/revente$', 'bda.views.revente', name = 'bda-revente'), - url(r'^bda2/revente$', 'bda2.views.revente', name = 'bda2-revente'), - url(r'^bda3/revente$', 'bda3.views.revente', name = 'bda3-revente'), - url(r'^bda/etat-places$', 'bda.views.etat_places', name = 'bda-etat-places'), - url(r'^bda2/etat-places$', 'bda2.views.etat_places', name = 'bda2-etat-places'), - url(r'^bda3/etat-places$', 'bda3.views.etat_places', name = 'bda3-etat-places'), - url(r'^bda/tirage$', 'bda.views.tirage'), - url(r'^bda2/tirage$', 'bda2.views.tirage'), - url(r'^bda3/tirage$', 'bda3.views.tirage'), + url(r'^bda/etat-places/(?P\d+)$', 'bda.views.etat_places', name = 'bda-etat-places'), + url(r'^bda/tirage/(?P\d+)$', 'bda.views.tirage'), url(r'^bda/spectacles/$', ListView.as_view(model = Spectacle), name ="bda-liste-spectacles"), url(r'^bda/spectacles/liste_spectacles.ics$', 'bda.views.liste_spectacles_ics', name ="bda-liste-spectacles-ics"), url(r'^bda/spectacles/unpaid$', "bda.views.unpaid", name = "bda-unpaid"), url(r'^bda/spectacles/(?P\d+)$', "bda.views.spectacle", name = "bda-spectacle"), - url(r'^bda/spectacles-2/$', ListView.as_view(model = Spectacle2), name ="bda2-liste-spectacles"), - url(r'^bda/spectacles-2/unpaid$', "bda2.views.unpaid", name = "bda2-unpaid"), - url(r'^bda/spectacles-2/(?P\d+)$', "bda2.views.spectacle", name = "bda2-spectacle"), - url(r'^bda/spectacles-3/$', ListView.as_view(model = Spectacle3), name ="bda3-liste-spectacles"), - url(r'^bda/spectacles-3/unpaid$', "bda3.views.unpaid", name = "bda3-unpaid"), - url(r'^bda/spectacles-3/(?P\d+)$', "bda3.views.spectacle", name = "bda3-spectacle"), + url(r'^survey/(?P\d+)$', 'gestioncof.views.survey'), url(r'^event/(?P\d+)$', 'gestioncof.views.event'), url(r'^survey/(?P\d+)/status$', 'gestioncof.views.survey_status'), diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html index c47a32e0..5d9fbecc 100644 --- a/gestioncof/templates/home.html +++ b/gestioncof/templates/home.html @@ -21,62 +21,63 @@ {% endfor %} {% endif %} - - - {% if user.profile.is_cof %} -

BdA

- - {% endif %} - + + {% if user.profile.is_cof %} +

BdA

+ + {% endif %} +

Divers

{% if user.profile.is_buro %}

Administration

{% endif %} -

Pour tout problème : cof@ens.fr.

+

Pour tout problème : cof@ens.fr.

{% endblock %}