From 0c5f7281645f8a1158ea3c3ca6a003d5fb79aa44 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Thu, 28 Apr 2011 11:21:04 -0400
Subject: [PATCH] boutons modifier

---
 project/dae/templates/dae/embauche_consulter.html |    5 ++++-
 project/dae/templates/dae/poste_consulter.html    |    5 ++++-
 project/dae/views.py                              |    5 ++---
 project/media/css/dae.css                         |    1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index 714c22f..5e5122f 100644
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -10,7 +10,10 @@
 {% endblock %}
 
 {% block main %}
-<h1>Demandes d'autorisation d'engagement de personnel</h1>
+<h1 class="gauche">Demandes d'autorisation d'engagement de personnel</h1>
+<a class="droite bouton-modifier" href="{% url embauche dossier.poste.key dossier.id %}">Modifier<a>
+<div class="visualClear"></div>
+
 <h2 class="section">SECTION 1 - POSTE</h2>
 {% with dossier.poste as poste %}
 {% include 'dae/poste_resume.html' %}
diff --git a/project/dae/templates/dae/poste_consulter.html b/project/dae/templates/dae/poste_consulter.html
index a4be3e3..b32869d 100644
--- a/project/dae/templates/dae/poste_consulter.html
+++ b/project/dae/templates/dae/poste_consulter.html
@@ -12,6 +12,9 @@ Demande d'autorisation d'embauche
 {% endblock %}
 
 {% block main %}
-<h1>Demande d'autorisation de création de poste</h1>
+<h1 class="gauche">Demande d'autorisation de création de poste</h1>
+<a class="droite bouton-modifier" href="{% url poste poste.key %}">Modifier<a>
+<div class="visualClear"></div>
+
 {% include "dae/poste_resume.html" %}
 {% endblock %}
diff --git a/project/dae/views.py b/project/dae/views.py
index 2c5ce58..cd6371c 100644
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -70,7 +70,7 @@ def poste(request, key=None):
             financementForm.instance = poste
             financementForm.save()
             messages.add_message(request, messages.SUCCESS, "Le poste %s a été sauvegardé." % poste)
-            return redirect('poste', key='dae-%s' % poste.id)
+            return redirect('poste_consulter', key='dae-%s' % poste.id)
         else:
             messages.add_message(request, messages.ERROR, 'Il y a des erreurs dans le formulaire.')
             
@@ -211,8 +211,7 @@ def embauche(request, key=None, dossier=None):
                                         r.save()
                     
                     messages.add_message(request, messages.SUCCESS, "Le dossier %s a été sauvegardé." % dossier)
-                    return redirect('embauche', key='dae-%s' % poste.id,
-                                    dossier=dossier.id)
+                    return redirect('embauche_consulter', dossier_id=dossier.id)
                 else:
                     messages.add_message(request, messages.ERROR, 'Il y a des erreurs dans le formulaire.')
                     
diff --git a/project/media/css/dae.css b/project/media/css/dae.css
index 38c82c4..f7beb02 100644
--- a/project/media/css/dae.css
+++ b/project/media/css/dae.css
@@ -13,3 +13,4 @@ th ul.errorlist {float: right;}
 .droite { float:right; text-align:right; }
 h2.section {width:100%; background-color: #D0E8F8; text-align: center; color: #5F5F5F; margin: 50px 0px 26px 0px; border-bottom: 3px solid #BBD8EC; padding: 4px;}
 .montant {text-align: right;}
+.bouton-modifier {border:1px #BBD8EC solid; font-size: 14px; font-weight: bold; margin: 12px 0; padding: 4px 8px; color: #BBD8EC;}
-- 
1.7.10.4