diff --git a/calendrier/templates/calendrier/home.html b/calendrier/templates/calendrier/home.html index 856005c..62b5680 100644 --- a/calendrier/templates/calendrier/home.html +++ b/calendrier/templates/calendrier/home.html @@ -22,11 +22,11 @@ Fanfaron de passage, musicien intrigué, Ernestophoniste en quête de sensations - +
- << {{PreviousMonthName|frenchmonth}} {{PreviousYear}} + << {{PreviousMonthName|frenchmonth}} {{PreviousYear}} Aujourd'huiAujourd'hui - {{NextMonthName|frenchmonth}} {{NextYear}} >> + {{NextMonthName|frenchmonth}} {{NextYear}} >>
diff --git a/calendrier/templates/calendrier/view_event.html b/calendrier/templates/calendrier/view_event.html index c81d7d7..5e70149 100644 --- a/calendrier/templates/calendrier/view_event.html +++ b/calendrier/templates/calendrier/view_event.html @@ -16,9 +16,9 @@ {% if user.is_authenticated %}
{% if user.profile.is_chef %} -

Modifier l'événement

-

Supprimer l'événement

-

Renvoyer les mails

+

Modifier l'événement

+

Supprimer l'événement

+

Renvoyer les mails

{% endif %}

Changer mon nom pour le doodle

diff --git a/calendrier/urls.py b/calendrier/urls.py index 9b65a15..b1b511d 100644 --- a/calendrier/urls.py +++ b/calendrier/urls.py @@ -8,13 +8,13 @@ app_name = "calendrier" urlpatterns = [ path("", views.home, name="home"), path("new", views.create_event, name="create_event"), - path("edition/", EventUpdate.as_view()), - path("supprimer/", EventDelete.as_view()), + path("edition/", EventUpdate.as_view(), name="edit_event"), + path("supprimer/", EventDelete.as_view(), name="delete_event"), path("resend/", views.resend, name="resend"), path("changename", views.changename, name="change-doodle-name"), path("/reponse", views.reponse, name="reponse"), path("rep///", views.reponse_event, name="reponse_event"), - path("//", views.view_event), - path("/", views.calendar), - path("", views.view_eventbis, name="view-event"), + path("//", views.view_event, name="view-event"), + path("/", views.calendar, name="view-month"), + path("", views.view_eventbis, name="view-event2"), ] diff --git a/pads/templates/pads/create.html b/pads/templates/pads/create.html index 3af7c0d..b127ed7 100644 --- a/pads/templates/pads/create.html +++ b/pads/templates/pads/create.html @@ -3,7 +3,7 @@ {%block titre %}Ajout d'un pad{% endblock %} {% block content %} -

Retour à la liste

+

Retour à la liste

{% if envoi %}

Ce pad a été enregistré.{% endif %}

{% csrf_token %} diff --git a/pads/templates/pads/delete.html b/pads/templates/pads/delete.html index 7f44cfa..2637313 100644 --- a/pads/templates/pads/delete.html +++ b/pads/templates/pads/delete.html @@ -3,7 +3,7 @@ {% block titre %}Suppression d'un pad{% endblock %} {% block content %} {% csrf_token %} -

Retour aux pads

+

Retour aux pads

Voulez vous vraiment supprimer le pad {{ object }}?

diff --git a/pads/templates/pads/liste.html b/pads/templates/pads/liste.html index ef4fc9b..b76760f 100644 --- a/pads/templates/pads/liste.html +++ b/pads/templates/pads/liste.html @@ -6,14 +6,14 @@

{{ error }}

{% endif %} {% if user.profile.is_chef %} -

Ajouter un pad

+

Ajouter un pad

{% endif %}
    {% for p in pads %}
  • {{ p.nom }} {% if user.profile.is_chef %} - Modifier -Supprimer + Modifier +Supprimer {% endif %}
  • diff --git a/pads/urls.py b/pads/urls.py index 79908d0..3f56cbb 100644 --- a/pads/urls.py +++ b/pads/urls.py @@ -8,6 +8,6 @@ app_name = "pads" urlpatterns = [ path("", views.liste_pads, name="list"), path("ajouter", views.add_pad, name="add"), - path("edition/", PadUpdate.as_view()), - path("supprimer/", PadDelete.as_view()), + path("edition/", PadUpdate.as_view(), name="edit"), + path("supprimer/", PadDelete.as_view(), name="delete"), ] diff --git a/pads/views.py b/pads/views.py index 1d3f80c..29db1b3 100644 --- a/pads/views.py +++ b/pads/views.py @@ -35,6 +35,7 @@ class PadUpdate(UpdateView): model = Pad template_name = "pads/update.html" success_url = reverse_lazy(liste_pads) + form_class = PadForm @method_decorator(chef_required) def dispatch(self, *args, **kwargs):