diff --git a/avisstage/sass/screen.scss b/avisstage/sass/screen.scss index a116b2e..95517b9 100644 --- a/avisstage/sass/screen.scss +++ b/avisstage/sass/screen.scss @@ -598,15 +598,15 @@ input[type="submit"], .btn { border: 1px solid $fond * 0.7; border-radius: 5px; padding: 8px 12px; - display: block; - margin-left: auto; - margin-right: 0; + display: inline-block; } -p input[type="submit"], -p .btn, -h1 .btn { - display:inline-block; +p.submits { + text-align: right; +} + +form .commentaire { + font-style: italic; } .edit-btn { diff --git a/avisstage/static/css/screen.css b/avisstage/static/css/screen.css index 2a3932e..0192537 100644 --- a/avisstage/static/css/screen.css +++ b/avisstage/static/css/screen.css @@ -669,16 +669,17 @@ input[type="submit"], .btn { border: 1px solid #648f24; border-radius: 5px; padding: 8px 12px; - display: block; - margin-left: auto; - margin-right: 0; + display: inline-block; } -/* line 606, ../../sass/screen.scss */ -p input[type="submit"], -p .btn, -h1 .btn { - display: inline-block; +/* line 604, ../../sass/screen.scss */ +p.submits { + text-align: right; +} + +/* line 608, ../../sass/screen.scss */ +form .commentaire { + font-style: italic; } /* line 612, ../../sass/screen.scss */ diff --git a/avisstage/templates/avisstage/formulaires/stage.html b/avisstage/templates/avisstage/formulaires/stage.html index 7e361f4..e395dd1 100644 --- a/avisstage/templates/avisstage/formulaires/stage.html +++ b/avisstage/templates/avisstage/formulaires/stage.html @@ -198,7 +198,10 @@ - +

+ + +

Ne répondez pas littéralement aux questions : elles n'apparaissent pas à la lecture, et ne sont là que pour vous aider à écrire ! Tous les champs n'ont pas non plus besoin d'être remplis.

@@ -219,7 +222,10 @@
{% endfor %} - +

+ + +

{{ avis_lieu_formset.management_form }}
@@ -245,7 +251,10 @@
{% endfor %} - +

+ + +

{% endfor %} @@ -270,7 +279,10 @@ {% endfor %} - +

+ + +

{% endwith %} diff --git a/avisstage/views.py b/avisstage/views.py index eaff4c7..4e0dfa5 100644 --- a/avisstage/views.py +++ b/avisstage/views.py @@ -96,7 +96,10 @@ def manage_stage(request, pk=None): avis_stage = AvisStage(stage=stage) c_del = False else: - stage = Stage.objects.filter(auteur=request.user.profil).get(pk=pk) + try: + stage = Stage.objects.filter(auteur=request.user.profil).get(pk=pk) + except Stage.DoesNotExist: + return HttpResponseForbidden() avis_stage, _ = AvisStage.objects.get_or_create(stage=stage) c_del = True @@ -120,7 +123,12 @@ def manage_stage(request, pk=None): avis_stage_form.instance.stage = stage avis_stage_form.save() avis_lieu_formset.save() - return redirect(reverse('avisstage:stage', kwargs={'pk':stage.id})) + print request.POST + if "continuer" in request.POST: + pass + else: + return redirect(reverse('avisstage:stage', + kwargs={'pk':stage.id})) else: form = StageForm(instance=stage, prefix="stage") avis_stage_form = AvisStageForm(instance=avis_stage, prefix="avis")