From 77b0fb24f4e017049a37b7afdec3162c3b01e932 Mon Sep 17 00:00:00 2001
From: tr4ck3ur <tr4ck3ur@style-python.fr>
Date: Tue, 31 Mar 2015 18:18:36 +0200
Subject: [PATCH] Fix Vote

---
 jm2l/templates/Profil/Profil.mako |  2 +-
 jm2l/templates/Staff/list.mako    |  2 +-
 jm2l/templates/layout.mako        | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jm2l/templates/Profil/Profil.mako b/jm2l/templates/Profil/Profil.mako
index 2e31135..0eb1946 100644
--- a/jm2l/templates/Profil/Profil.mako
+++ b/jm2l/templates/Profil/Profil.mako
@@ -12,7 +12,7 @@
 <div class="row-fluid">
     <div class="span8">
     <a href="/sign/jm2l/${uprofil.my_hash}">Mon lien de connection</a> - 
-    <a href="/user/${request.user.slug}">Mon profil publique</a><br>
+    <a href="/user/${request.user.slug}">Mon profil public</a><br>
     <h3>${profil_form.prenom.data} ${profil_form.nom.data}</h3>
 <%
 DicFormA = {
diff --git a/jm2l/templates/Staff/list.mako b/jm2l/templates/Staff/list.mako
index a8cd61f..0efb6f9 100644
--- a/jm2l/templates/Staff/list.mako
+++ b/jm2l/templates/Staff/list.mako
@@ -62,7 +62,7 @@ from slugify import slugify
                         <span class="name">${task.name}</span>
                     </a>
                     <span style="float:right;">
-                    - <a href="/user/${task.assignee.slug}">${task.assignee.pseudo or ' '.join([task.assignee.nom, task.assignee.prenom]) }</a>
+                    - <a href="/user/${task.assignee.slug}">${task.assignee.pseudo or ' '.join([task.assignee.prenom, task.assignee.nom]) }</a>
                     - ${task.due_date.strftime("%d %b").decode("utf-8")}
                     </span>
                 % endif
diff --git a/jm2l/templates/layout.mako b/jm2l/templates/layout.mako
index e073524..b52168b 100644
--- a/jm2l/templates/layout.mako
+++ b/jm2l/templates/layout.mako
@@ -65,6 +65,17 @@ ${helpers.uploader_js()}
           <div style="height:215px;background: url(/img/2015/logo_2.png) no-repeat scroll center center transparent"></div>
             </a>
         </div>
+        % if request.user and request.user.vote_logo not in [1,2,3]:
+        <div class="item active">
+            <div class="align-center">
+                <H1>JM2L 2015</H1>
+                <H2> &laquo; Do It Yourself &raquo;</H2>
+                <h3>Choisissez ici votre logo préféré !</h3>
+                <p>Utilisez les flèches pour choisir et voter !<br>
+                Vous pouvez changer à tout moment, mais vous n'aurez droit qu'a un seul choix, le vôtre ;)</p>
+            </div>
+        </div>
+        % endif
       </div>
       <a class="left Tcarousel-control" href="#TitleCarousel" role="button" data-slide="prev">
         <img src="/img/chev-left.png">