From 50a045b7dad0ef483fb16636074476c68fc7dff2 Mon Sep 17 00:00:00 2001
From: Ali Jetha <ali@U-AJ.(none)>
Date: Thu, 7 Oct 2010 19:06:54 -0400
Subject: [PATCH] Chercheur edit

---
 auf_savoirs_en_partage/media/img/edit.png              |  Bin 0 -> 618 bytes
 auf_savoirs_en_partage/savoirs/views.py                |    2 +-
 auf_savoirs_en_partage/templates/chercheurs/edit.html  |   16 ++++------------
 auf_savoirs_en_partage/templates/chercheurs/perso.html |    1 +
 .../templates/savoirs/evenement_index.html             |    2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100644 auf_savoirs_en_partage/media/img/edit.png

diff --git a/auf_savoirs_en_partage/media/img/edit.png b/auf_savoirs_en_partage/media/img/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b93e77600def75c9a144d3d0a5088a62c02cbb0b
GIT binary patch
literal 618
zcmV-w0+s!VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz{7FPXR5;6x
zliy2IVHn3(e?>$>5Y&axjp2O=VLu>*f>1L;s0)kkvKC!*u?s6CVL=HJ6oP~pNfZc;
zsKr=bq;7MITw8NXw{SZ<XXl*#?9=-mwz0{k9{6w$ywCS@-simMu>m%59TId2x_9BQ
zV86`NuvG<J`Fvg}l}eRzxlAj>I!>o^V!Na!=$7GJE{Cq`b+XwknM{UcGHFTTfmuS+
zm-zYC!P3+zmY;SG$?!fYkOih`QYaLxyF}A86h$GGN}<Kyu;Cg-S$PLqg3QV+p2xkL
zO#&INAq9qEpsFgHKW0d;KA^BZ&&H=m7`{2mQ8&I9*UTn?Xrtb<e3pGH>kFj)_o*0e
zjPMP%zTG7FYMAfO2Nn1D`D0Cj?Wl>5q<wd(m>%@CE10nX)KxpNmwk+!IWkzywiYD(
zqUXiYYIq3qcRyMGJ;IY`(Gz~E$J$zu2+R{)xGlE*88b3WK6V*J>}2iPY1HH|tER0W
z_+^^FdppY?o)Gt5M2`%xwRDH@R3G}^i1l4|6uchm0X0f!@&YdVLB5K&dd7Rv{)DXX
zt^&vP;}kqj3f>94j+4xd93>s|Q!Ezi>?r8(Il$P}PFxSqu{d*!Y%*#cX(R0f|Juz#
z3o0_xI14Al->1uky@W-rCI_%l&><yz80Q*t^gCqsKOt_NEc}hgZ~y=R07*qoM6N<$
Ef@@nDvH$=8

literal 0
HcmV?d00001

diff --git a/auf_savoirs_en_partage/savoirs/views.py b/auf_savoirs_en_partage/savoirs/views.py
index 9eb60a1..cf74250 100644
--- a/auf_savoirs_en_partage/savoirs/views.py
+++ b/auf_savoirs_en_partage/savoirs/views.py
@@ -153,7 +153,7 @@ def evenement_index(request):
         erreur_caldav = u"Problème de connexion à l'agenda"
         events = []
     return render_to_response ("savoirs/evenement_index.html", \
-            Context ({'evenements':evenements}), \
+            Context ({'evenements':events}), \
             context_instance = RequestContext(request))
 
 def evenement(request, id):
diff --git a/auf_savoirs_en_partage/templates/chercheurs/edit.html b/auf_savoirs_en_partage/templates/chercheurs/edit.html
index ae766e4..48b2f0d 100644
--- a/auf_savoirs_en_partage/templates/chercheurs/edit.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/edit.html
@@ -53,12 +53,10 @@
     <fieldset>
         <legend>Publications</legend>
         <div>
-            {% ifnotequal publication1_form.instance.titre None %}
             <div class="infotip">
               <strong>Renseignements préalablements enregistrés</strong>
-              <p>{{publication1_form.instance.publication_affichage}}</p>
+              <p>{{publication1_form.instance.publication_affichage|default:"-"}}</p>
             </div>
-            {% endifnotequal %}
             <div class="publication">
               {% with publication1_form as form %}
                   {% include "table_form.html" %}
@@ -69,12 +67,10 @@
         <p id="show_publications">+ Autres publications</p>
         <div class="publications_autre">
             <h6>- Publication 2</h6>
-            {% ifnotequal publication1_form.instance.titre None %}
             <div class="infotip">
               <strong>Renseignements préalablements enregistrés</strong>
-              <p>{{publication2_form.instance.publication_affichage}}</p>
+              <p>{{publication2_form.instance.publication_affichage|default:"-"}}</p>
             </div>
-            {% endifnotequal %}
             <div class="publication">
                 {% with publication2_form as form %}
                     {% include "table_form.html" %}
@@ -82,12 +78,10 @@
             </div>
             <div style="clear:both"></div>
             <h6>- Publication 3</h6>
-            {% ifnotequal publication3_form.instance.titre None %}
             <div class="infotip">
               <strong>Renseignements préalablements enregistrés</strong>
-              <p>{{publication3_form.instance.publication_affichage}}</p>
+              <p>{{publication3_form.instance.publication_affichage|default:"-"}}</p>
             </div>
-            {% endifnotequal %}
             <div class="publication">
                 {% with publication3_form as form %}
                     {% include "table_form.html" %}
@@ -95,12 +89,10 @@
             </div>
             <div style="clear:both"></div>     
             <h6>- Publication 4</h6>
-            {% ifnotequal publication4_form.instance.titre None %}
             <div class="infotip">
               <strong>Renseignements préalablements enregistrés</strong>
-              <p>{{publication4_form.instance.publication_affichage}}</p>
+              <p>{{publication4_form.instance.publication_affichage|default:"-"}}</p>
             </div>
-            {% endifnotequal %}
             <div class="publication">
                 {% with publication4_form as form %}
                     {% include "table_form.html" %}
diff --git a/auf_savoirs_en_partage/templates/chercheurs/perso.html b/auf_savoirs_en_partage/templates/chercheurs/perso.html
index 107c98c..b808bdc 100644
--- a/auf_savoirs_en_partage/templates/chercheurs/perso.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/perso.html
@@ -4,6 +4,7 @@
 <h4>{{ chercheur }}</h4>
 
 <div class="contenu-wrapper">
+    <div style="float:right; margin-right:40px;font-size:12px"><img src="/media/img/edit.png"> <a href="{% url chercheurs.views.edit %}">Éditer</a></div>
     <div id="fiche_chercheur">
         <p>{{chercheur.personne.courriel}}</p>
         <p>{% firstof chercheur.etablissement.nom chercheur.etablissement_autre_nom "-" %}, {% firstof chercheur.etablissement.pays chercheur.etablissement_autre_pays "-" %}</p>
diff --git a/auf_savoirs_en_partage/templates/savoirs/evenement_index.html b/auf_savoirs_en_partage/templates/savoirs/evenement_index.html
index d3c0550..88a5534 100644
--- a/auf_savoirs_en_partage/templates/savoirs/evenement_index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/evenement_index.html
@@ -11,7 +11,7 @@
     </tr>
 {% for e in evenements %}
     <tr class="{% cycle 'odd' 'notodd' %}">
-        <td>{{ e.summary.value|truncatewords:12 }}</td>
+        <td><a href="{% url savoirs.views.evenement e.uid.value %}" class="le-titre">{{ e.summary.value|truncatewords:20 }}</a></td>
     </tr>
 {% endfor %}
 </table>
-- 
1.7.10.4